[Midnightbsd-cvs] mports [18094] trunk/devel/glib20: fix build of glib20 after png bump.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Mar 8 20:30:58 EDT 2015 

Revision: 18094
          http://svnweb.midnightbsd.org/mports/?rev=18094
Author:   laffer1
Date:     2015-03-08 20:30:57 -0400 (Sun, 08 Mar 2015)
Log Message:
-----------
fix build of glib20 after png bump. Note you must have a VERY recent current to build (libc)

Modified Paths:
--------------
    trunk/devel/glib20/Makefile
    trunk/devel/glib20/pkg-plist

Added Paths:
-----------
    trunk/devel/glib20/files/extra-glib_gdbscripts
    trunk/devel/glib20/files/extra-gobject_gdbscripts

Modified: trunk/devel/glib20/Makefile
===================================================================
--- trunk/devel/glib20/Makefile	2015-03-08 23:33:54 UTC (rev 18093)
+++ trunk/devel/glib20/Makefile	2015-03-09 00:30:57 UTC (rev 18094)
@@ -20,10 +20,9 @@
 		libffi.so:${PORTSDIR}/devel/libffi
 
 GNU_CONFIGURE=	yes
-USES+=		gettext gmake iconv:wchar_t libtool pathfix pkgconfig shebangfix
+USES+=		gettext gmake iconv:wchar_t libtool pathfix python pkgconfig shebangfix
+USE_PYTHON=	py3kplist
 USE_LDCONFIG=	yes
-USE_PYTHON=	yes
-PYTHON_PY3K_PLIST_HACK=	yes
 USE_PERL5=	yes
 CONFIGURE_ARGS= --disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
 		--disable-man --without-xml-catalog \
@@ -38,7 +37,7 @@
 
 SHEBANG_FILES=	*/*.pl
 
-LIBVERSION=	4200
+LIBVERSION=	0.4200.1
 PLIST_SUB+=	LIBVERSION=${LIBVERSION}
 
 glib_MAN=	gtester.1 gtester-report.1 glib-gettextize.1
@@ -47,8 +46,9 @@
 		glib-compile-resources.1 gresource.1 gdbus-codegen.1
 gobject_MAN=	glib-genmarshal.1 glib-mkenums.1 gobject-query.1
 
-OPTIONS_DEFINE=	COLLATION_FIX DEBUG
+OPTIONS_DEFINE=	COLLATION_FIX DEBUG GDB
 COLLATION_FIX_DESC=	fix string collation
+GDB_DESC=	Install python gdb scripts
 
 .include <bsd.port.pre.mk>
 
@@ -78,6 +78,14 @@
 #CONFIGURE_ENV+=	CFLAGS="-D__STDC_ISO_10646__"
 .endif
 
+.if ${PORT_OPTIONS:MGDB}
+PLIST_SUB+=	GDB=""
+.else
+EXTRA_PATCHES+=	${FILESDIR}/extra-glib_gdbscripts \
+		${FILESDIR}/extra-gobject_gdbscripts
+PLIST_SUB+=	GDB="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-debug=yes \
 			--disable-silent-rules

Added: trunk/devel/glib20/files/extra-glib_gdbscripts
===================================================================
--- trunk/devel/glib20/files/extra-glib_gdbscripts	                        (rev 0)
+++ trunk/devel/glib20/files/extra-glib_gdbscripts	2015-03-09 00:30:57 UTC (rev 18094)
@@ -0,0 +1,20 @@
+--- glib/Makefile.in.orig	2014-03-09 10:06:29.765325337 +0000
++++ glib/Makefile.in	2014-03-09 10:06:46.935323979 +0000
+@@ -2834,7 +2834,7 @@
+ info-am:
+ 
+ install-data-am: install-data-local install-deprecatedincludeHEADERS \
+-	install-dist_gdbSCRIPTS install-glibincludeHEADERS \
++	install-glibincludeHEADERS \
+ 	install-glibsubincludeHEADERS \
+ 	install-installed_testLTLIBRARIES \
+ 	install-installed_testPROGRAMS install-installed_testSCRIPTS \
+@@ -3084,8 +3084,6 @@
+ 	$(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > $(builddir)/libglib-gdb.py
+ 
+ install-data-hook: libglib-gdb.py
+-	mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)
+-	$(INSTALL) $(builddir)/libglib-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@	mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@	mv $(DESTDIR)$(libdir)/libglib-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@	mv $(DESTDIR)$(libdir)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)


Property changes on: trunk/devel/glib20/files/extra-glib_gdbscripts
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/devel/glib20/files/extra-gobject_gdbscripts
===================================================================
--- trunk/devel/glib20/files/extra-gobject_gdbscripts	                        (rev 0)
+++ trunk/devel/glib20/files/extra-gobject_gdbscripts	2015-03-09 00:30:57 UTC (rev 18094)
@@ -0,0 +1,22 @@
+--- gobject/Makefile.in.orig	2014-03-09 10:09:41.628312066 +0000
++++ gobject/Makefile.in	2014-03-09 10:09:48.181311433 +0000
+@@ -2003,7 +2003,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-data-local install-dist_gdbSCRIPTS \
++install-data-am: install-data-local \
+ 	install-installed_testLTLIBRARIES \
+ 	install-installed_testPROGRAMS install-installed_testSCRIPTS \
+ 	install-installed_test_metaDATA \
+@@ -2230,9 +2230,7 @@
+ uninstall-gdb:
+ 	-rm -r $(DESTDIR)$(datadir)/gdb
+ 
+-install-data-hook: libgobject-gdb.py
+-	mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)
+-	$(INSTALL) $(builddir)/libgobject-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)/libgobject-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
++install-data-hook:
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@	mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@	mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@	mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)


Property changes on: trunk/devel/glib20/files/extra-gobject_gdbscripts
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/devel/glib20/pkg-plist
===================================================================
--- trunk/devel/glib20/pkg-plist	2015-03-08 23:33:54 UTC (rev 18093)
+++ trunk/devel/glib20/pkg-plist	2015-03-09 00:30:57 UTC (rev 18094)
@@ -269,18 +269,23 @@
 lib/glib-2.0/include/glibconfig.h
 lib/libgio-2.0.a
 lib/libgio-2.0.so
+lib/libgio-2.0.so.0
 lib/libgio-2.0.so.%%LIBVERSION%%
 lib/libglib-2.0.a
 lib/libglib-2.0.so
+lib/libglib-2.0.so.0
 lib/libglib-2.0.so.%%LIBVERSION%%
 lib/libgmodule-2.0.a
 lib/libgmodule-2.0.so
+lib/libgmodule-2.0.so.0
 lib/libgmodule-2.0.so.%%LIBVERSION%%
 lib/libgobject-2.0.a
 lib/libgobject-2.0.so
+lib/libgobject-2.0.so.0
 lib/libgobject-2.0.so.%%LIBVERSION%%
 lib/libgthread-2.0.a
 lib/libgthread-2.0.so
+lib/libgthread-2.0.so.0
 lib/libgthread-2.0.so.%%LIBVERSION%%
 libdata/pkgconfig/gio-2.0.pc
 libdata/pkgconfig/gio-unix-2.0.pc
@@ -308,6 +313,8 @@
 share/aclocal/glib-gettext.m4
 share/aclocal/gsettings.m4
 share/bash-completion/completions/gapplication
+%%GDB%%share/gdb/auto-load/libglib-2.0.so.%%LIBVERSION%%-gdb.py
+%%GDB%%share/gdb/auto-load/libgobject-2.0.so.%%LIBVERSION%%-gdb.py
 share/glib-2.0/codegen/__init__.py
 share/glib-2.0/codegen/__init__.pyc
 share/glib-2.0/codegen/__init__.pyo
@@ -332,6 +339,8 @@
 share/glib-2.0/codegen/utils.py
 share/glib-2.0/codegen/utils.pyc
 share/glib-2.0/codegen/utils.pyo
+%%GDB%%share/glib-2.0/gdb/glib.py
+%%GDB%%share/glib-2.0/gdb/gobject.py
 share/glib-2.0/gettext/po/Makefile.in.in
 share/glib-2.0/schemas/gschema.dtd
 share/locale/af/LC_MESSAGES/glib20.mo

More information about the Midnightbsd-cvs mailing list