[Midnightbsd-cvs] mports [17907] trunk/devel/glib12/pkg-plist: fix build of glib 1.2
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Dec 21 12:16:26 EST 2014
Revision: 17907
http://svnweb.midnightbsd.org/mports/?rev=17907
Author: laffer1
Date: 2014-12-21 12:16:26 -0500 (Sun, 21 Dec 2014)
Log Message:
-----------
fix build of glib 1.2
Modified Paths:
--------------
trunk/devel/glib12/Makefile
trunk/devel/glib12/files/patch-gstrfuncs.c
trunk/devel/glib12/pkg-plist
Added Paths:
-----------
trunk/devel/glib12/files/patch-Makefile.ins
trunk/devel/glib12/files/patch-configure
trunk/devel/glib12/files/patch-glib.h
Removed Paths:
-------------
trunk/devel/glib12/files/patch-ab
trunk/devel/glib12/files/patch-ac
trunk/devel/glib12/files/patch-ae
trunk/devel/glib12/files/patch-af
trunk/devel/glib12/files/patch-glib.pc.in
trunk/devel/glib12/files/patch-gmodule.pc.in
trunk/devel/glib12/files/patch-gmodule::gmodule-dl.c
trunk/devel/glib12/files/patch-gthread.pc.in
Property Changed:
----------------
trunk/devel/glib12/files/patch-glib.m4
trunk/devel/glib12/files/patch-gstrfuncs.c
trunk/devel/glib12/files/patch-gutils.c
Modified: trunk/devel/glib12/Makefile
===================================================================
--- trunk/devel/glib12/Makefile 2014-12-21 16:40:27 UTC (rev 17906)
+++ trunk/devel/glib12/Makefile 2014-12-21 17:16:26 UTC (rev 17907)
@@ -1,36 +1,29 @@
-# New ports collection makefile for: glib12
-# Date Created: 28 July 1998
-# Whom: Vanilla I. Shu <vanilla at FreeBSD.org>
-#
# $MidnightBSD$
-# $FreeBSD: ports/devel/glib12/Makefile,v 1.61 2006/05/04 21:40:40 edwin Exp $
-#
PORTNAME= glib
-PKGNAMESUFFIX= 12
PORTVERSION= 1.2.10
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= devel
MASTER_SITES= GNOME
+PKGNAMESUFFIX= 12
MAINTAINER= ports at MidnightBSD.org
COMMENT= Some useful routines of C programming (previous stable version)
+
LICENSE= lgpl
+GNU_CONFIGURE= yes
+INSTALL_TARGET= install-strip
+USES= libtool pathfix
USE_CSTD= gnu89
-USE_AUTOTOOLS= libtool
-GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib12
-MAN1= glib-config.1
INFO= glib
post-install:
cd ${PREFIX}/bin && ${LN} -sf glib-config glib12-config
-.for lib in glib gmodule gthread
- @${RM} ${PREFIX}/lib/lib${lib}.la ${PREFIX}/lib/lib${lib}.so
- @${MV} ${PREFIX}/lib/lib${lib}.a ${PREFIX}/lib/lib${lib}-12.a
-.endfor
+ cd ${PREFIX}/lib && ${LN} -sf libglib.so.0.10 libglib.so
+ cd ${PREFIX}/lib && ${LN} -sf libgmodule.so.0.10 libgmodule.so
+ cd ${PREFIX}/lib && ${LN} -sf libgthread.so.0.10 libgthread.so
.include <bsd.port.mk>
Copied: trunk/devel/glib12/files/patch-Makefile.ins (from rev 17861, trunk/devel/glib12/files/patch-ab)
===================================================================
--- trunk/devel/glib12/files/patch-Makefile.ins (rev 0)
+++ trunk/devel/glib12/files/patch-Makefile.ins 2014-12-21 17:16:26 UTC (rev 17907)
@@ -0,0 +1,53 @@
+--- Makefile.in.orig Thu Mar 15 10:48:50 2001
++++ Makefile.in Wed Nov 20 14:39:44 2002
+@@ -96,9 +96,9 @@
+
+ AUTOMAKE_OPTIONS = 1.4
+
+-SUBDIRS = . gmodule gthread docs tests
++SUBDIRS = . gmodule gthread docs
+
+-configincludedir = $(pkglibdir)/include
++configincludedir = $(includedir)/glib-1.2
+
+ bin_SCRIPTS = glib-config
+
+@@ -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 +628,7 @@
+ uninstall-configincludeDATA uninstall-m4dataDATA \
+ uninstall-pkgconfigDATA uninstall-glibincludeHEADERS
+ uninstall: uninstall-recursive
+-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
++all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) \
+ $(HEADERS) config.h
+ all-redirect: all-recursive-am
+ install-strip:
+--- gmodule/Makefile.in.orig Fri Mar 2 17:37:21 2001
++++ gmodule/Makefile.in Tue Mar 6 09:24:01 2001
+@@ -341,7 +341,7 @@
+ install: install-am
+ uninstall-am: uninstall-libLTLIBRARIES uninstall-glibincludeHEADERS
+ uninstall: uninstall-am
+-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
++all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ all-redirect: all-am
+ install-strip:
+ $(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
+@@ -300,7 +300,7 @@
+ install: install-am
+ uninstall-am: uninstall-libLTLIBRARIES
+ uninstall: uninstall-am
+-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
++all-am: Makefile $(LTLIBRARIES)
+ all-redirect: all-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
Deleted: trunk/devel/glib12/files/patch-ab
===================================================================
--- trunk/devel/glib12/files/patch-ab 2014-12-21 16:40:27 UTC (rev 17906)
+++ trunk/devel/glib12/files/patch-ab 2014-12-21 17:16:26 UTC (rev 17907)
@@ -1,99 +0,0 @@
---- 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
-
--SUBDIRS = . gmodule gthread docs tests
-+SUBDIRS = . gmodule gthread docs
-
--configincludedir = $(pkglibdir)/include
-+configincludedir = $(includedir)
-
- 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 @@
- || 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 @@
- uninstall-configincludeDATA uninstall-m4dataDATA \
- uninstall-pkgconfigDATA uninstall-glibincludeHEADERS
- uninstall: uninstall-recursive
--all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
-+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) \
- $(HEADERS) config.h
- all-redirect: all-recursive-am
- 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
- uninstall: uninstall-am
--all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
-+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
- all-redirect: all-am
- install-strip:
- $(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
- uninstall: uninstall-am
--all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
-+all-am: Makefile $(LTLIBRARIES)
- all-redirect: all-am
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
Deleted: trunk/devel/glib12/files/patch-ac
===================================================================
--- trunk/devel/glib12/files/patch-ac 2014-12-21 16:40:27 UTC (rev 17906)
+++ trunk/devel/glib12/files/patch-ac 2014-12-21 17:16:26 UTC (rev 17907)
@@ -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 at includedir@/glib-1.2 -I at libdir@/glib/include $includes $cflags
-+ echo -I at includedir@ $includes $cflags
- fi
- if test "$echo_libs" = "yes"; then
- libsp=""
- libsa=""
- if test "$lib_glib" = "yes"; then
-- libsp="$libsp -lglib"
-+ libsp="$libsp -lglib- at LT_RELEASE@"
- fi
- if test "$lib_gthread" = "yes"; then
-- libsp="-lgthread $libsp"
-+ libsp="-lgthread- at 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- at LT_RELEASE@ $libsp"
- libsa="$libsa @G_MODULE_LIBS@"
- fi
- echo -L at libdir@ $libsp $libsa
Deleted: trunk/devel/glib12/files/patch-ae
===================================================================
--- trunk/devel/glib12/files/patch-ae 2014-12-21 16:40:27 UTC (rev 17906)
+++ trunk/devel/glib12/files/patch-ae 2014-12-21 17:16:26 UTC (rev 17907)
@@ -1,127 +0,0 @@
---- 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 @@
-
-
- # Check for some functions
--for ac_func in lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp poll
-+for ac_func in lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp
- 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 @@
-
-
-
-+if test x"$have_poll" != xno; then
-+ for ac_func in poll
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:5636: checking for $ac_func" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ cat > conftest.$ac_ext <<EOF
-+#line 5641 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char $ac_func(); below. */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char $ac_func();
-+
-+int main() {
-+
-+/* The GNU C library defines this for functions which it implements
-+ to always fail with ENOSYS. Some functions are actually named
-+ something starting with __ and the normal name is an alias. */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:5664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+ rm -rf conftest*
-+ eval "ac_cv_func_$ac_func=yes"
-+else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+fi
-+
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+ echo "$ac_t""yes" 1>&6
-+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+ cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+done
-+
-+fi
- glib_sysdefso="glibconfig-sysdefs.h"
- glib_sysdef_msg=`echo POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32 | sed 's/:[^ ]*//g'`
- if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then
Deleted: trunk/devel/glib12/files/patch-af
===================================================================
--- trunk/devel/glib12/files/patch-af 2014-12-21 16:40:27 UTC (rev 17906)
+++ trunk/devel/glib12/files/patch-af 2014-12-21 17:16:26 UTC (rev 17907)
@@ -1,14 +0,0 @@
---- glib.h.orig Sun Sep 5 23:34:07 1999
-+++ glib.h Thu Sep 16 01:32:54 1999
-@@ -108,7 +108,11 @@
- * defined then the current definition is correct.
- */
- #ifndef NULL
-+#ifdef __cplusplus
-+#define NULL (0)
-+#else
- #define NULL ((void*) 0)
-+#endif
- #endif
-
- #ifndef FALSE
Copied: trunk/devel/glib12/files/patch-configure (from rev 17861, trunk/devel/glib12/files/patch-ae)
===================================================================
--- trunk/devel/glib12/files/patch-configure (rev 0)
+++ trunk/devel/glib12/files/patch-configure 2014-12-21 17:16:26 UTC (rev 17907)
@@ -0,0 +1,75 @@
+--- configure.orig 2001-03-15 16:44:01.000000000 +0100
++++ configure 2012-12-12 11:10:38.000000000 +0100
+@@ -3496,7 +3496,7 @@
+
+
+ # Check for some functions
+-for ac_func in lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp poll
++for ac_func in lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+ echo "configure:3503: checking for $ac_func" >&5
+@@ -5568,6 +5568,63 @@
+
+
+
++if test x"$have_poll" != xno; then
++ for ac_func in poll
++do
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:5636: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++ echo $ac_n "(cached) $ac_c" 1>&6
++else
++ cat > conftest.$ac_ext <<EOF
++#line 5641 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++ which can conflict with char $ac_func(); below. */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error. */
++/* We use char because int might match the return type of a gcc2
++ builtin and then its argument prototype would still apply. */
++char $ac_func();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++ to always fail with ENOSYS. Some functions are actually named
++ something starting with __ and the normal name is an alias. */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++$ac_func();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:5664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++ rm -rf conftest*
++ eval "ac_cv_func_$ac_func=yes"
++else
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
++ rm -rf conftest*
++ eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++ echo "$ac_t""yes" 1>&6
++ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++ cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++
++else
++ echo "$ac_t""no" 1>&6
++fi
++done
++
++fi
+ glib_sysdefso="glibconfig-sysdefs.h"
+ glib_sysdef_msg=`echo POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32 | sed 's/:[^ ]*//g'`
+ if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then
Copied: trunk/devel/glib12/files/patch-glib.h (from rev 17861, trunk/devel/glib12/files/patch-af)
===================================================================
--- trunk/devel/glib12/files/patch-glib.h (rev 0)
+++ trunk/devel/glib12/files/patch-glib.h 2014-12-21 17:16:26 UTC (rev 17907)
@@ -0,0 +1,14 @@
+--- glib.h.orig Sun Sep 5 23:34:07 1999
++++ glib.h Thu Sep 16 01:32:54 1999
+@@ -108,7 +108,11 @@
+ * defined then the current definition is correct.
+ */
+ #ifndef NULL
++#ifdef __cplusplus
++#define NULL (0)
++#else
+ #define NULL ((void*) 0)
++#endif
+ #endif
+
+ #ifndef FALSE
Index: trunk/devel/glib12/files/patch-glib.m4
===================================================================
--- trunk/devel/glib12/files/patch-glib.m4 2014-12-21 16:40:27 UTC (rev 17906)
+++ trunk/devel/glib12/files/patch-glib.m4 2014-12-21 17:16:26 UTC (rev 17907)
Property changes on: trunk/devel/glib12/files/patch-glib.m4
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/devel/glib12/files/patch-glib.pc.in
===================================================================
--- trunk/devel/glib12/files/patch-glib.pc.in 2014-12-21 16:40:27 UTC (rev 17906)
+++ trunk/devel/glib12/files/patch-glib.pc.in 2014-12-21 17:16:26 UTC (rev 17907)
@@ -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}
-
Deleted: trunk/devel/glib12/files/patch-gmodule.pc.in
===================================================================
--- trunk/devel/glib12/files/patch-gmodule.pc.in 2014-12-21 16:40:27 UTC (rev 17906)
+++ trunk/devel/glib12/files/patch-gmodule.pc.in 2014-12-21 17:16:26 UTC (rev 17907)
@@ -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:
Deleted: trunk/devel/glib12/files/patch-gmodule::gmodule-dl.c
===================================================================
--- trunk/devel/glib12/files/patch-gmodule::gmodule-dl.c 2014-12-21 16:40:27 UTC (rev 17906)
+++ trunk/devel/glib12/files/patch-gmodule::gmodule-dl.c 2014-12-21 17:16:26 UTC (rev 17907)
@@ -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
Modified: trunk/devel/glib12/files/patch-gstrfuncs.c
===================================================================
--- trunk/devel/glib12/files/patch-gstrfuncs.c 2014-12-21 16:40:27 UTC (rev 17906)
+++ trunk/devel/glib12/files/patch-gstrfuncs.c 2014-12-21 17:16:26 UTC (rev 17907)
@@ -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;
Property changes on: trunk/devel/glib12/files/patch-gstrfuncs.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/devel/glib12/files/patch-gthread.pc.in
===================================================================
--- trunk/devel/glib12/files/patch-gthread.pc.in 2014-12-21 16:40:27 UTC (rev 17906)
+++ trunk/devel/glib12/files/patch-gthread.pc.in 2014-12-21 17:16:26 UTC (rev 17907)
@@ -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@
Index: trunk/devel/glib12/files/patch-gutils.c
===================================================================
--- trunk/devel/glib12/files/patch-gutils.c 2014-12-21 16:40:27 UTC (rev 17906)
+++ trunk/devel/glib12/files/patch-gutils.c 2014-12-21 17:16:26 UTC (rev 17907)
Property changes on: trunk/devel/glib12/files/patch-gutils.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/devel/glib12/pkg-plist
===================================================================
--- trunk/devel/glib12/pkg-plist 2014-12-21 16:40:27 UTC (rev 17906)
+++ trunk/devel/glib12/pkg-plist 2014-12-21 17:16:26 UTC (rev 17907)
@@ -1,19 +1,19 @@
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.10
+lib/libglib.a
+lib/libglib.so
+lib/libgmodule-1.2.so.0.10
+lib/libgmodule.a
+lib/libgmodule.so
+lib/libgthread-1.2.so.0.10
+lib/libgthread.a
+lib/libgthread.so
libdata/pkgconfig/glib.pc
libdata/pkgconfig/gmodule.pc
libdata/pkgconfig/gthread.pc
share/aclocal/glib.m4
- at dirrm include/glib12
+man/man1/glib-config.1.gz
More information about the Midnightbsd-cvs
mailing list