diff options
author | tijl <tijl@FreeBSD.org> | 2014-09-13 23:11:27 +0800 |
---|---|---|
committer | tijl <tijl@FreeBSD.org> | 2014-09-13 23:11:27 +0800 |
commit | 2c7a212b0850c2071e5f660fda2ecb995131ff43 (patch) | |
tree | 20e1ada1d8086dd795eda0a0236243d21c6aaeba /devel | |
parent | 94f0dd10e249d803f7a63a254cefbae635e6e4ff (diff) | |
download | freebsd-ports-gnome-2c7a212b0850c2071e5f660fda2ecb995131ff43.tar.gz freebsd-ports-gnome-2c7a212b0850c2071e5f660fda2ecb995131ff43.tar.zst freebsd-ports-gnome-2c7a212b0850c2071e5f660fda2ecb995131ff43.zip |
devel/glib12 x11-toolkits/gtk12:
- Convert to USES=libtool and bump dependent ports
- Add INSTALL_TARGET=install-strip
- Remove patches that renamed include directories and libraries so they
didn't conflict with early development versions of glib/gtk 2.0
Diffstat (limited to 'devel')
-rw-r--r-- | devel/gcvs/Makefile | 2 | ||||
-rw-r--r-- | devel/glib12/Makefile | 14 | ||||
-rw-r--r-- | devel/glib12/files/patch-Makefile.ins | 52 | ||||
-rw-r--r-- | devel/glib12/files/patch-configure | 52 | ||||
-rw-r--r-- | devel/glib12/files/patch-glib-config.in | 27 | ||||
-rw-r--r-- | devel/glib12/files/patch-glib.pc.in | 11 | ||||
-rw-r--r-- | devel/glib12/files/patch-gmodule.pc.in | 9 | ||||
-rw-r--r-- | devel/glib12/files/patch-gmodule__gmodule-dl.c | 23 | ||||
-rw-r--r-- | devel/glib12/files/patch-gstrfuncs.c | 33 | ||||
-rw-r--r-- | devel/glib12/files/patch-gthread.pc.in | 9 | ||||
-rw-r--r-- | devel/glib12/pkg-plist | 29 | ||||
-rw-r--r-- | devel/libole2/Makefile | 2 | ||||
-rw-r--r-- | devel/liboop/Makefile | 2 | ||||
-rw-r--r-- | devel/p5-Devel-LeakTrace/Makefile | 2 |
14 files changed, 47 insertions, 220 deletions
diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile index 984a32b9cdc8..0a5bcbec6090 100644 --- a/devel/gcvs/Makefile +++ b/devel/gcvs/Makefile @@ -2,7 +2,7 @@ PORTNAME= gcvs PORTVERSION= 1.0 -PORTREVISION= 14 +PORTREVISION= 15 PORTEPOCH= 1 CATEGORIES= devel tk MASTER_SITES= SF/cvsgui/gCvs/${PORTNAME}-${PORTVERSION} diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile index 3584fab0b657..55d47df48e9a 100644 --- a/devel/glib12/Makefile +++ b/devel/glib12/Makefile @@ -3,7 +3,7 @@ PORTNAME= glib PORTVERSION= 1.2.10 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= devel MASTER_SITES= GNOME PKGNAMESUFFIX= 12 @@ -11,19 +11,15 @@ PKGNAMESUFFIX= 12 MAINTAINER= gnome@FreeBSD.org COMMENT= Some useful routines of C programming (previous stable version) -USE_CSTD= gnu89 -USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip +USES= libtool pathfix +USE_CSTD= gnu89 USE_LDCONFIG= yes -CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib12 INFO= glib post-install: - ${LN} -sf ${PREFIX}/bin/glib-config ${STAGEDIR}${PREFIX}/bin/glib12-config -.for lib in glib gmodule gthread - @${RM} ${STAGEDIR}${PREFIX}/lib/lib${lib}.la ${STAGEDIR}${PREFIX}/lib/lib${lib}.so - @${MV} ${STAGEDIR}${PREFIX}/lib/lib${lib}.a ${STAGEDIR}${PREFIX}/lib/lib${lib}-12.a -.endfor + ${LN} -sf glib-config ${STAGEDIR}${PREFIX}/bin/glib12-config .include <bsd.port.mk> diff --git a/devel/glib12/files/patch-Makefile.ins b/devel/glib12/files/patch-Makefile.ins index 4d8702c68a86..6338ae863d22 100644 --- a/devel/glib12/files/patch-Makefile.ins +++ b/devel/glib12/files/patch-Makefile.ins @@ -1,14 +1,5 @@ --- Makefile.in.orig Thu Mar 15 10:48:50 2001 +++ Makefile.in Wed Nov 20 14:39:44 2002 -@@ -37,7 +37,7 @@ - DESTDIR = - - pkgdatadir = $(datadir)/@PACKAGE@ --pkglibdir = $(libdir)/@PACKAGE@ -+pkglibdir = $(prefix)/libdata/pkgconfig - pkgincludedir = $(includedir)/@PACKAGE@ - - top_builddir = . @@ -96,9 +96,9 @@ AUTOMAKE_OPTIONS = 1.4 @@ -17,38 +8,19 @@ +SUBDIRS = . gmodule gthread docs -configincludedir = $(pkglibdir)/include -+configincludedir = $(includedir) ++configincludedir = $(includedir)/glib-1.2 bin_SCRIPTS = glib-config -@@ -114,7 +114,7 @@ - libglib_la_SOURCES = garray.c gcache.c gcompletion.c gdataset.c gdate.c gerror.c ghash.c ghook.c giochannel.c giounix.c glist.c gmain.c gmem.c gmessages.c gmutex.c gnode.c gprimes.c grel.c gscanner.c gslist.c gstrfuncs.c gstring.c gtimer.c gtree.c gutils.c - - --glibincludedir = $(includedir)/glib-1.2 -+glibincludedir = $(includedir) - glibinclude_HEADERS = glib.h - - -@@ -134,7 +134,7 @@ - m4datadir = $(datadir)/aclocal - m4data_DATA = glib.m4 - --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = $(pkglibdir) - pkgconfig_DATA = glib.pc gmodule.pc gthread.pc - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -574,7 +574,7 @@ +@@ -574,7 +574,6 @@ || exit 1; \ fi; \ done - $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook -+ garray.lo garray.o : garray.c glib.h glibconfig.h gcache.lo gcache.o : gcache.c glib.h glibconfig.h gcompletion.lo gcompletion.o : gcompletion.c glib.h glibconfig.h -@@ -629,7 +629,7 @@ +@@ -629,7 +628,7 @@ uninstall-configincludeDATA uninstall-m4dataDATA \ uninstall-pkgconfigDATA uninstall-glibincludeHEADERS uninstall: uninstall-recursive @@ -59,15 +31,6 @@ install-strip: --- gmodule/Makefile.in.orig Fri Mar 2 17:37:21 2001 +++ gmodule/Makefile.in Tue Mar 6 09:24:01 2001 -@@ -100,7 +100,7 @@ - - BUILT_SOURCES = gmoduleconf.h - --glibincludedir = $(includedir)/glib-1.2 -+glibincludedir = $(includedir) - glibinclude_HEADERS = gmodule.h - - @@ -341,7 +341,7 @@ install: install-am uninstall-am: uninstall-libLTLIBRARIES uninstall-glibincludeHEADERS @@ -79,15 +42,6 @@ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install --- gthread/Makefile.in.orig Tue Mar 6 09:12:20 2001 +++ gthread/Makefile.in Tue Mar 6 09:12:59 2001 -@@ -127,7 +127,7 @@ - testgthread_OBJECTS = testgthread.o - testgthread_DEPENDENCIES = ../libglib.la libgthread.la - testgthread_LDFLAGS = --CFLAGS = @CFLAGS@ -+CFLAGS = @CFLAGS@ @G_THREAD_CFLAGS@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) @@ -300,7 +300,7 @@ install: install-am uninstall-am: uninstall-libLTLIBRARIES diff --git a/devel/glib12/files/patch-configure b/devel/glib12/files/patch-configure index 25f89584cd38..07a28339f25d 100644 --- a/devel/glib12/files/patch-configure +++ b/devel/glib12/files/patch-configure @@ -1,20 +1,5 @@ --- configure.orig 2001-03-15 16:44:01.000000000 +0100 +++ configure 2012-12-12 11:10:38.000000000 +0100 -@@ -587,10 +587,10 @@ - - - # libtool versioning --LT_RELEASE=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION --LT_CURRENT=`expr $GLIB_MICRO_VERSION - $GLIB_INTERFACE_AGE` --LT_REVISION=$GLIB_INTERFACE_AGE --LT_AGE=`expr $GLIB_BINARY_AGE - $GLIB_INTERFACE_AGE` -+LT_RELEASE=12 -+LT_CURRENT=3 -+LT_REVISION=0 -+LT_AGE=0 - - - @@ -3496,7 +3496,7 @@ @@ -24,43 +9,6 @@ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo "configure:3503: checking for $ac_func" >&5 -@@ -4390,6 +4390,12 @@ - linux*) - G_MODULE_LDFLAGS='-rdynamic' - ;; -+ freebsd*) -+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ if test $objformat = "elf"; then -+ G_MODULE_LDFLAGS='-Wl,-E' -+ fi -+ ;; - esac - LIBS_orig="$LIBS" - LDFLAGS_orig="$LDFLAGS" -@@ -5177,11 +5183,8 @@ - G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads" - fi - ;; -- *-freebsd2.2*) -- G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE" -- -- # FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support -- # -mthreads flag. -+ *-*-freebsd*) -+ G_THREAD_LIBS="-pthread" - ;; - esac - -@@ -5469,9 +5472,6 @@ - - - --CFLAGS="$CFLAGS $G_THREAD_CFLAGS" -- -- - case "$mutex_has_default" in - "yes") - echo $ac_n "checking size of $mutex_default_type""... $ac_c" 1>&6 @@ -5568,6 +5568,63 @@ diff --git a/devel/glib12/files/patch-glib-config.in b/devel/glib12/files/patch-glib-config.in deleted file mode 100644 index 8ced7ad51c72..000000000000 --- a/devel/glib12/files/patch-glib-config.in +++ /dev/null @@ -1,27 +0,0 @@ ---- glib-config.in.orig Tue Mar 6 09:49:34 2001 -+++ glib-config.in Tue Mar 6 09:51:05 2001 -@@ -88,20 +88,20 @@ - if test "$lib_gthread" = "yes"; then - cflags="$cflags @G_THREAD_CFLAGS@" - fi -- echo -I@includedir@/glib-1.2 -I@libdir@/glib/include $includes $cflags -+ echo -I@includedir@ $includes $cflags - fi - if test "$echo_libs" = "yes"; then - libsp="" - libsa="" - if test "$lib_glib" = "yes"; then -- libsp="$libsp -lglib" -+ libsp="$libsp -lglib-@LT_RELEASE@" - fi - if test "$lib_gthread" = "yes"; then -- libsp="-lgthread $libsp" -+ libsp="-lgthread-@LT_RELEASE@ $libsp" - libsa="$libsa @G_THREAD_LIBS@" - fi - if test "$lib_gmodule" = "yes"; then -- libsp="@G_MODULE_LDFLAGS@ -lgmodule $libsp" -+ libsp="@G_MODULE_LDFLAGS@ -lgmodule-@LT_RELEASE@ $libsp" - libsa="$libsa @G_MODULE_LIBS@" - fi - echo -L@libdir@ $libsp $libsa diff --git a/devel/glib12/files/patch-glib.pc.in b/devel/glib12/files/patch-glib.pc.in deleted file mode 100644 index 0e38edab69c5..000000000000 --- a/devel/glib12/files/patch-glib.pc.in +++ /dev/null @@ -1,11 +0,0 @@ ---- glib.pc.in.orig Wed Nov 29 20:15:33 2000 -+++ glib.pc.in Fri Jun 14 00:07:23 2002 -@@ -6,6 +6,6 @@ - Name: GLib - Description: C Utility Library - Version: @VERSION@ --Libs: -L${libdir} -lglib --Cflags: -I${includedir}/glib-1.2 -I${libdir}/glib/include -+Libs: -L${libdir} -lglib-12 -+Cflags: -I${includedir} - diff --git a/devel/glib12/files/patch-gmodule.pc.in b/devel/glib12/files/patch-gmodule.pc.in deleted file mode 100644 index f9816891293c..000000000000 --- a/devel/glib12/files/patch-gmodule.pc.in +++ /dev/null @@ -1,9 +0,0 @@ ---- gmodule.pc.in.orig Wed Aug 20 22:07:40 2003 -+++ gmodule.pc.in Wed Aug 20 22:08:12 2003 -@@ -7,5 +7,5 @@ - Description: Dynamic module loader for GLib - Requires: glib - Version: @VERSION@ --Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule @G_MODULE_LIBS@ -+Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-12 @G_MODULE_LIBS@ - Cflags: diff --git a/devel/glib12/files/patch-gmodule__gmodule-dl.c b/devel/glib12/files/patch-gmodule__gmodule-dl.c deleted file mode 100644 index 5460f6300bc1..000000000000 --- a/devel/glib12/files/patch-gmodule__gmodule-dl.c +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- gmodule/gmodule-dl.c 2001/12/12 04:39:42 1.1 -+++ gmodule/gmodule-dl.c 2001/12/12 04:41:05 -@@ -100,6 +100,7 @@ - static gpointer - _g_module_self (void) - { -+#ifndef __FreeBSD__ - gpointer handle; - - /* to query symbols from the program itself, special link options -@@ -111,6 +112,9 @@ - g_module_set_error (fetch_dlerror ()); - - return handle; -+#else -+ return RTLD_DEFAULT; -+#endif - } - - static void diff --git a/devel/glib12/files/patch-gstrfuncs.c b/devel/glib12/files/patch-gstrfuncs.c index eb5957f900fa..9f18f738f56d 100644 --- a/devel/glib12/files/patch-gstrfuncs.c +++ b/devel/glib12/files/patch-gstrfuncs.c @@ -1,41 +1,46 @@ --- gstrfuncs.c.orig 2001-02-27 07:00:22.000000000 +0100 +++ gstrfuncs.c 2004-03-01 13:19:49.531603760 +0100 -@@ -867,7 +867,7 @@ +@@ -867,8 +867,8 @@ g_printf_string_upper_bound (const gchar /* beware of positional parameters */ case '$': - g_warning (G_GNUC_PRETTY_FUNCTION -+ g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION, - "(): unable to handle positional parameters (%%n$)"); +- "(): unable to handle positional parameters (%%n$)"); ++ g_warning ("%s: unable to handle positional parameters (%%n$)", ++ G_GNUC_PRETTY_FUNCTION); len += 1024; /* try adding some safety padding */ break; -@@ -1034,7 +1034,7 @@ + +@@ -1034,8 +1034,8 @@ g_printf_string_upper_bound (const gchar /* n . dddddddddddddddddddddddd E +- eeee */ conv_len += 1 + 1 + MAX (24, spec.precision) + 1 + 1 + 4; if (spec.mod_extra_long) - g_warning (G_GNUC_PRETTY_FUNCTION -+ g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION, - "(): unable to handle long double, collecting double only"); +- "(): unable to handle long double, collecting double only"); ++ g_warning ("%s: unable to handle long double, collecting double only", ++ G_GNUC_PRETTY_FUNCTION); #ifdef HAVE_LONG_DOUBLE #error need to implement special handling for long double -@@ -1077,7 +1077,7 @@ + #endif +@@ -1077,8 +1077,8 @@ g_printf_string_upper_bound (const gchar conv_done = TRUE; if (spec.mod_long) { - g_warning (G_GNUC_PRETTY_FUNCTION -+ g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION, - "(): unable to handle wide char strings"); +- "(): unable to handle wide char strings"); ++ g_warning ("%s: unable to handle wide char strings", ++ G_GNUC_PRETTY_FUNCTION); len += 1024; /* try adding some safety padding */ } -@@ -1108,9 +1108,8 @@ + break; +@@ -1108,8 +1108,8 @@ g_printf_string_upper_bound (const gchar conv_len += format - spec_start; break; default: - g_warning (G_GNUC_PRETTY_FUNCTION - "(): unable to handle `%c' while parsing format", -- c); -+ g_warning ("%s(): unable to handle `%c' while parsing format", -+ G_GNUC_PRETTY_FUNCTION, c); ++ g_warning ("%s: unable to handle `%c' while parsing format", ++ G_GNUC_PRETTY_FUNCTION, + c); break; } - conv_done |= conv_len > 0; diff --git a/devel/glib12/files/patch-gthread.pc.in b/devel/glib12/files/patch-gthread.pc.in deleted file mode 100644 index 4086046cc5c2..000000000000 --- a/devel/glib12/files/patch-gthread.pc.in +++ /dev/null @@ -1,9 +0,0 @@ ---- gthread.pc.in.orig Wed Aug 20 22:07:53 2003 -+++ gthread.pc.in Wed Aug 20 22:08:33 2003 -@@ -7,5 +7,5 @@ - Description: Thread support for GLib - Requires: glib - Version: @VERSION@ --Libs: -L${libdir} -lgthread @G_THREAD_LIBS@ -+Libs: -L${libdir} -lgthread-12 @G_THREAD_LIBS@ - Cflags: @G_THREAD_CFLAGS@ diff --git a/devel/glib12/pkg-plist b/devel/glib12/pkg-plist index 46ed1710cdad..e332ccba69da 100644 --- a/devel/glib12/pkg-plist +++ b/devel/glib12/pkg-plist @@ -1,20 +1,23 @@ bin/glib-config bin/glib12-config -include/glib12/glib.h -include/glib12/glibconfig.h -include/glib12/gmodule.h -lib/libglib-12.a -lib/libglib-12.so -lib/libglib-12.so.3 -lib/libgmodule-12.a -lib/libgmodule-12.so -lib/libgmodule-12.so.3 -lib/libgthread-12.a -lib/libgthread-12.so -lib/libgthread-12.so.3 +include/glib-1.2/glib.h +include/glib-1.2/glibconfig.h +include/glib-1.2/gmodule.h +lib/libglib-1.2.so.0 +lib/libglib-1.2.so.0.0.10 +lib/libglib.a +lib/libglib.so +lib/libgmodule-1.2.so.0 +lib/libgmodule-1.2.so.0.0.10 +lib/libgmodule.a +lib/libgmodule.so +lib/libgthread-1.2.so.0 +lib/libgthread-1.2.so.0.0.10 +lib/libgthread.a +lib/libgthread.so libdata/pkgconfig/glib.pc libdata/pkgconfig/gmodule.pc libdata/pkgconfig/gthread.pc share/aclocal/glib.m4 man/man1/glib-config.1.gz -@dirrm include/glib12 +@dirrm include/glib-1.2 diff --git a/devel/libole2/Makefile b/devel/libole2/Makefile index 072d9646025b..91f1c755c39a 100644 --- a/devel/libole2/Makefile +++ b/devel/libole2/Makefile @@ -3,7 +3,7 @@ PORTNAME= libole2 PORTVERSION= 0.2.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel gnome MASTER_SITES= GNOME diff --git a/devel/liboop/Makefile b/devel/liboop/Makefile index 4ba1ba08924f..acf8dd0aaeaf 100644 --- a/devel/liboop/Makefile +++ b/devel/liboop/Makefile @@ -3,7 +3,7 @@ PORTNAME= liboop PORTVERSION= 1.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= devel MASTER_SITES= GENTOO/distfiles \ http://download.ofb.net/liboop/ diff --git a/devel/p5-Devel-LeakTrace/Makefile b/devel/p5-Devel-LeakTrace/Makefile index cf27c38f8131..48f8743fa353 100644 --- a/devel/p5-Devel-LeakTrace/Makefile +++ b/devel/p5-Devel-LeakTrace/Makefile @@ -3,7 +3,7 @@ PORTNAME= Devel-LeakTrace PORTVERSION= 0.05 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- |