mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-19 19:59:43 +00:00
Add glib13 after repo-copy from glib12.
Warning: it is unstable development version, so you do not have to upgrade your gtk12 LIB_DEPENDS!
This commit is contained in:
parent
4d2a37f591
commit
0dc0df6881
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=30775
@ -1,4 +1,4 @@
|
||||
# New ports collection makefile for: glib12
|
||||
# New ports collection makefile for: glib13
|
||||
# Date Created: 28 July 1998
|
||||
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
|
||||
#
|
||||
@ -6,19 +6,17 @@
|
||||
#
|
||||
|
||||
PORTNAME= glib
|
||||
PORTVERSION= 1.2.8
|
||||
PORTVERSION= 1.3.1
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
|
||||
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
|
||||
http://www.ameth.org/gimp/gtk/v1.2/
|
||||
MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.3/ \
|
||||
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.3/ \
|
||||
http://www.ameth.org/gimp/gtk/v1.3/
|
||||
|
||||
MAINTAINER= vanilla@FreeBSD.org
|
||||
|
||||
USE_LIBTOOL= yes
|
||||
INSTALLS_SHLIB= yes
|
||||
LIBTOOLFLAGS= --disable-ltlibs --release-suffix
|
||||
CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib12
|
||||
|
||||
MAN1= glib12-config.1
|
||||
MAN1= glib-config-2.0.1
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1 +1 @@
|
||||
MD5 (glib-1.2.8.tar.gz) = 5965aeb7894f3ab3b9b7c5833418bfe9
|
||||
MD5 (glib-1.3.1.tar.gz) = be7e038afea8c92f1b01c60e1f304556
|
||||
|
@ -1,117 +1,21 @@
|
||||
--- Makefile.in.orig Thu Oct 7 12:35:19 1999
|
||||
+++ Makefile.in Tue Oct 12 15:51:59 1999
|
||||
@@ -97,11 +97,11 @@
|
||||
|
||||
AUTOMAKE_OPTIONS = 1.4
|
||||
|
||||
-SUBDIRS = . gmodule gthread docs tests
|
||||
+SUBDIRS = . gmodule gthread docs
|
||||
|
||||
-configincludedir = $(pkglibdir)/include
|
||||
+configincludedir = $(includedir)
|
||||
|
||||
-bin_SCRIPTS = glib-config
|
||||
+bin_SCRIPTS = glib@LT_RELEASE@-config
|
||||
|
||||
BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
|
||||
|
||||
@@ -136,7 +136,7 @@
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
CONFIG_HEADER = config.h
|
||||
-CONFIG_CLEAN_FILES = glib.spec glib-config
|
||||
+CONFIG_CLEAN_FILES = glib.spec glib@LT_RELEASE@-config
|
||||
LTLIBRARIES = $(lib_LTLIBRARIES)
|
||||
|
||||
|
||||
@@ -236,7 +236,7 @@
|
||||
maintainer-clean-hdr:
|
||||
glib.spec: $(top_builddir)/config.status glib.spec.in
|
||||
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||
-glib-config: $(top_builddir)/config.status glib-config.in
|
||||
+glib@LT_RELEASE@-config: $(top_builddir)/config.status glib@LT_RELEASE@-config.in
|
||||
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||
|
||||
mostlyclean-libLTLIBRARIES:
|
||||
@@ -545,7 +545,6 @@
|
||||
|| exit 1; \
|
||||
fi; \
|
||||
done
|
||||
- $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
|
||||
|
||||
info-am:
|
||||
info: info-recursive
|
||||
@@ -572,7 +571,7 @@
|
||||
uninstall-configincludeDATA uninstall-m4dataDATA \
|
||||
uninstall-includeHEADERS
|
||||
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:
|
||||
@@ -650,7 +649,9 @@
|
||||
installdirs mostlyclean-generic distclean-generic clean-generic \
|
||||
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
|
||||
|
||||
-glib-config: glib-config.in
|
||||
+glib@LT_RELEASE@-config.in: glib-config.in
|
||||
+ cp glib-config.in glib@LT_RELEASE@-config.in
|
||||
+
|
||||
glibconfig.h: stamp-gc-h
|
||||
@:
|
||||
stamp-gc-h: config.status
|
||||
--- gmodule/Makefile.in.orig Tue May 11 05:06:37 1999
|
||||
+++ gmodule/Makefile.in Mon May 17 22:28:24 1999
|
||||
@@ -333,7 +333,7 @@
|
||||
install: install-am
|
||||
uninstall-am: uninstall-libLTLIBRARIES uninstall-includeHEADERS
|
||||
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 May 11 05:06:39 1999
|
||||
+++ gthread/Makefile.in Mon May 17 22:28:24 1999
|
||||
@@ -128,7 +128,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)
|
||||
@@ -297,7 +297,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
|
||||
--- docs/Makefile.in.orig Tue May 11 05:06:40 1999
|
||||
+++ docs/Makefile.in Mon May 17 22:28:24 1999
|
||||
@@ -95,9 +95,9 @@
|
||||
|
||||
info_TEXINFOS = glib.texi
|
||||
--- docs/Makefile.in.orig Mon Jul 17 10:35:35 2000
|
||||
+++ docs/Makefile.in Mon Jul 17 10:36:42 2000
|
||||
@@ -101,7 +101,7 @@
|
||||
STRIP_END = @STRIP_END@
|
||||
VERSION = @VERSION@
|
||||
|
||||
-man_MANS = glib-config.1
|
||||
+man_MANS = glib@LT_RELEASE@-config.1
|
||||
|
||||
-EXTRA_DIST = glib-config.1.in glib.html glib_toc.html
|
||||
+EXTRA_DIST = glib@LT_RELEASE@-config.1.in glib.html glib_toc.html
|
||||
+man_MANS = glib-config-2.0.1
|
||||
|
||||
EXTRA_DIST = glib-config.1.in
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
CONFIG_HEADER = ../config.h
|
||||
@@ -133,6 +133,8 @@
|
||||
glib.info: glib.texi
|
||||
glib.dvi: glib.texi
|
||||
@@ -129,6 +129,9 @@
|
||||
|
||||
+glib@LT_RELEASE@-config.1: glib-config.1
|
||||
+ cp glib-config.1 glib@LT_RELEASE@-config.1
|
||||
|
||||
DVIPS = dvips
|
||||
glib-config.1: $(top_builddir)/config.status glib-config.1.in
|
||||
cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||
+
|
||||
+glib-config-2.0.1: glib-config.1
|
||||
+ cp glib-config.1 glib-config-2.0.1
|
||||
|
||||
install-man1:
|
||||
$(mkinstalldirs) $(DESTDIR)$(man1dir)
|
||||
|
@ -1,136 +1,35 @@
|
||||
--- configure.orig Tue May 11 04:55:02 1999
|
||||
+++ configure Mon May 17 22:30:32 1999
|
||||
@@ -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
|
||||
|
||||
|
||||
|
||||
@@ -3472,7 +3472,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:3479: checking for $ac_func" >&5
|
||||
@@ -4365,6 +4365,12 @@
|
||||
--- configure.orig Fri Jul 14 22:09:59 2000
|
||||
+++ configure Tue Jul 18 10:06:24 2000
|
||||
@@ -4580,6 +4580,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'
|
||||
+ G_MODULE_LDFLAGS='-Wl,-E'
|
||||
+ fi
|
||||
+ ;;
|
||||
esac
|
||||
LIBS_orig="$LIBS"
|
||||
LDFLAGS_orig="$LDFLAGS"
|
||||
@@ -5057,11 +5063,17 @@
|
||||
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*)
|
||||
+ if test x"$G_THREAD_LIBS" = x"-lc_r"; then
|
||||
+ G_THREAD_CFLAGS="-D_THREAD_SAFE"
|
||||
+ G_THREAD_LIBS="-pthread"
|
||||
+ case $host in
|
||||
+ *-*-freebsd4*) ;;
|
||||
+ default) have_poll=no ;;
|
||||
+ esac
|
||||
+ else
|
||||
+ G_THREAD_CFLAGS="-D_THREAD_SAFE -DLINUXTHREADS"
|
||||
+ fi
|
||||
;;
|
||||
esac
|
||||
@@ -4864,8 +4870,8 @@
|
||||
add_thread_lib=""
|
||||
IN=""
|
||||
else
|
||||
- add_thread_lib="-l$thread_lib"
|
||||
- IN=" in -l$thread_lib"
|
||||
+ add_thread_lib="-$thread_lib"
|
||||
+ IN=" in -$thread_lib"
|
||||
fi
|
||||
if test x"$have_threads" = xposix; then
|
||||
defattr=NULL
|
||||
@@ -5042,7 +5048,7 @@
|
||||
|
||||
@@ -5349,9 +5358,6 @@
|
||||
if test x"$enable_threads" = xyes; then
|
||||
|
||||
- G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_REENTRANT" # good default guess
|
||||
+ G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_REENTRANT -D_THREAD_SAFE" # good default guess
|
||||
|
||||
|
||||
-CFLAGS="$CFLAGS $G_THREAD_CFLAGS"
|
||||
-
|
||||
-
|
||||
case "$mutex_has_default" in
|
||||
"yes")
|
||||
echo $ac_n "checking size of $mutex_default_type""... $ac_c" 1>&6
|
||||
@@ -5448,6 +5454,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
|
||||
case $host in
|
||||
*-aix*)
|
||||
|
11
devel/glib13/files/patch-ag
Normal file
11
devel/glib13/files/patch-ag
Normal file
@ -0,0 +1,11 @@
|
||||
--- Makefile.in.orig Mon Jul 17 10:37:18 2000
|
||||
+++ Makefile.in Mon Jul 17 10:38:06 2000
|
||||
@@ -103,7 +103,7 @@
|
||||
|
||||
AUTOMAKE_OPTIONS = 1.4
|
||||
|
||||
-SUBDIRS = . gobject gmodule gthread docs tests
|
||||
+SUBDIRS = . gobject gmodule gthread docs
|
||||
|
||||
bin_SCRIPTS = glib-config-2.0
|
||||
|
@ -1 +1 @@
|
||||
Some useful routines of C programming
|
||||
Some useful routines of C programming (unstable development version)
|
||||
|
@ -1,4 +1,4 @@
|
||||
This is GLib version 1.2. GLib, is a library which includes support
|
||||
This is GLib version 1.3. GLib, is a library which includes support
|
||||
routines for C such as lists, trees, hashes, memory allocation, and
|
||||
many other things.
|
||||
|
||||
@ -7,5 +7,8 @@ ftp://ftp.gtk.org/pub/gtk
|
||||
|
||||
A mailing list is located at gtk-list@redhat.com for discussion.
|
||||
|
||||
Warning: this library is unstable development version, incompatible with
|
||||
version 1.2, so it could not be used as a replacement for the older one.
|
||||
|
||||
- Vanilla
|
||||
vanilla@FreeBSD.ORG
|
||||
|
@ -1,18 +1,33 @@
|
||||
bin/glib12-config
|
||||
include/glib12/glib.h
|
||||
include/glib12/glibconfig.h
|
||||
include/glib12/gmodule.h
|
||||
@unexec install-info --delete %D/info/glib.info %D/info/dir
|
||||
info/glib.info
|
||||
@exec install-info %D/info/glib.info %D/info/dir
|
||||
lib/libglib12.a
|
||||
lib/libglib12.so
|
||||
lib/libglib12.so.3
|
||||
lib/libgmodule12.a
|
||||
lib/libgmodule12.so
|
||||
lib/libgmodule12.so.3
|
||||
lib/libgthread12.a
|
||||
lib/libgthread12.so
|
||||
lib/libgthread12.so.3
|
||||
share/aclocal/glib.m4
|
||||
@dirrm include/glib12
|
||||
bin/glib-config-2.0
|
||||
bin/gobject-query
|
||||
include/glib-2.0/gerror.h
|
||||
include/glib-2.0/glib-object.h
|
||||
include/glib-2.0/glib.h
|
||||
include/glib-2.0/gmodule.h
|
||||
include/glib-2.0/gobject/genums.h
|
||||
include/glib-2.0/gobject/gobject.h
|
||||
include/glib-2.0/gobject/gparam.h
|
||||
include/glib-2.0/gobject/gparamspecs.h
|
||||
include/glib-2.0/gobject/gtype.h
|
||||
include/glib-2.0/gobject/gvalue.h
|
||||
include/glib-2.0/gobject/gvaluecollector.h
|
||||
include/glib-2.0/gobject/gvaluetypes.h
|
||||
include/glib-2.0/gunicode.h
|
||||
lib/glib-2.0/include/glibconfig.h
|
||||
lib/libglib-1.3.a
|
||||
lib/libglib-1.3.so
|
||||
lib/libglib-1.3.so.1
|
||||
lib/libgmodule-1.3.a
|
||||
lib/libgmodule-1.3.so
|
||||
lib/libgmodule-1.3.so.1
|
||||
lib/libgobject-1.3.a
|
||||
lib/libgobject-1.3.so
|
||||
lib/libgobject-1.3.so.1
|
||||
lib/libgthread-1.3.a
|
||||
lib/libgthread-1.3.so
|
||||
lib/libgthread-1.3.so.1
|
||||
share/aclocal/glib-2.0.m4
|
||||
@dirrm lib/glib-2.0/include
|
||||
@dirrm lib/glib-2.0
|
||||
@dirrm include/glib-2.0/gobject
|
||||
@dirrm include/glib-2.0
|
||||
|
@ -1,4 +1,4 @@
|
||||
# New ports collection makefile for: glib12
|
||||
# New ports collection makefile for: glib13
|
||||
# Date Created: 28 July 1998
|
||||
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
|
||||
#
|
||||
@ -6,19 +6,17 @@
|
||||
#
|
||||
|
||||
PORTNAME= glib
|
||||
PORTVERSION= 1.2.8
|
||||
PORTVERSION= 1.3.1
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
|
||||
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
|
||||
http://www.ameth.org/gimp/gtk/v1.2/
|
||||
MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.3/ \
|
||||
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.3/ \
|
||||
http://www.ameth.org/gimp/gtk/v1.3/
|
||||
|
||||
MAINTAINER= vanilla@FreeBSD.org
|
||||
|
||||
USE_LIBTOOL= yes
|
||||
INSTALLS_SHLIB= yes
|
||||
LIBTOOLFLAGS= --disable-ltlibs --release-suffix
|
||||
CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib12
|
||||
|
||||
MAN1= glib12-config.1
|
||||
MAN1= glib-config-2.0.1
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1 +1 @@
|
||||
MD5 (glib-1.2.8.tar.gz) = 5965aeb7894f3ab3b9b7c5833418bfe9
|
||||
MD5 (glib-1.3.1.tar.gz) = be7e038afea8c92f1b01c60e1f304556
|
||||
|
@ -1,117 +1,21 @@
|
||||
--- Makefile.in.orig Thu Oct 7 12:35:19 1999
|
||||
+++ Makefile.in Tue Oct 12 15:51:59 1999
|
||||
@@ -97,11 +97,11 @@
|
||||
|
||||
AUTOMAKE_OPTIONS = 1.4
|
||||
|
||||
-SUBDIRS = . gmodule gthread docs tests
|
||||
+SUBDIRS = . gmodule gthread docs
|
||||
|
||||
-configincludedir = $(pkglibdir)/include
|
||||
+configincludedir = $(includedir)
|
||||
|
||||
-bin_SCRIPTS = glib-config
|
||||
+bin_SCRIPTS = glib@LT_RELEASE@-config
|
||||
|
||||
BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
|
||||
|
||||
@@ -136,7 +136,7 @@
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
CONFIG_HEADER = config.h
|
||||
-CONFIG_CLEAN_FILES = glib.spec glib-config
|
||||
+CONFIG_CLEAN_FILES = glib.spec glib@LT_RELEASE@-config
|
||||
LTLIBRARIES = $(lib_LTLIBRARIES)
|
||||
|
||||
|
||||
@@ -236,7 +236,7 @@
|
||||
maintainer-clean-hdr:
|
||||
glib.spec: $(top_builddir)/config.status glib.spec.in
|
||||
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||
-glib-config: $(top_builddir)/config.status glib-config.in
|
||||
+glib@LT_RELEASE@-config: $(top_builddir)/config.status glib@LT_RELEASE@-config.in
|
||||
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||
|
||||
mostlyclean-libLTLIBRARIES:
|
||||
@@ -545,7 +545,6 @@
|
||||
|| exit 1; \
|
||||
fi; \
|
||||
done
|
||||
- $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
|
||||
|
||||
info-am:
|
||||
info: info-recursive
|
||||
@@ -572,7 +571,7 @@
|
||||
uninstall-configincludeDATA uninstall-m4dataDATA \
|
||||
uninstall-includeHEADERS
|
||||
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:
|
||||
@@ -650,7 +649,9 @@
|
||||
installdirs mostlyclean-generic distclean-generic clean-generic \
|
||||
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
|
||||
|
||||
-glib-config: glib-config.in
|
||||
+glib@LT_RELEASE@-config.in: glib-config.in
|
||||
+ cp glib-config.in glib@LT_RELEASE@-config.in
|
||||
+
|
||||
glibconfig.h: stamp-gc-h
|
||||
@:
|
||||
stamp-gc-h: config.status
|
||||
--- gmodule/Makefile.in.orig Tue May 11 05:06:37 1999
|
||||
+++ gmodule/Makefile.in Mon May 17 22:28:24 1999
|
||||
@@ -333,7 +333,7 @@
|
||||
install: install-am
|
||||
uninstall-am: uninstall-libLTLIBRARIES uninstall-includeHEADERS
|
||||
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 May 11 05:06:39 1999
|
||||
+++ gthread/Makefile.in Mon May 17 22:28:24 1999
|
||||
@@ -128,7 +128,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)
|
||||
@@ -297,7 +297,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
|
||||
--- docs/Makefile.in.orig Tue May 11 05:06:40 1999
|
||||
+++ docs/Makefile.in Mon May 17 22:28:24 1999
|
||||
@@ -95,9 +95,9 @@
|
||||
|
||||
info_TEXINFOS = glib.texi
|
||||
--- docs/Makefile.in.orig Mon Jul 17 10:35:35 2000
|
||||
+++ docs/Makefile.in Mon Jul 17 10:36:42 2000
|
||||
@@ -101,7 +101,7 @@
|
||||
STRIP_END = @STRIP_END@
|
||||
VERSION = @VERSION@
|
||||
|
||||
-man_MANS = glib-config.1
|
||||
+man_MANS = glib@LT_RELEASE@-config.1
|
||||
|
||||
-EXTRA_DIST = glib-config.1.in glib.html glib_toc.html
|
||||
+EXTRA_DIST = glib@LT_RELEASE@-config.1.in glib.html glib_toc.html
|
||||
+man_MANS = glib-config-2.0.1
|
||||
|
||||
EXTRA_DIST = glib-config.1.in
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
CONFIG_HEADER = ../config.h
|
||||
@@ -133,6 +133,8 @@
|
||||
glib.info: glib.texi
|
||||
glib.dvi: glib.texi
|
||||
@@ -129,6 +129,9 @@
|
||||
|
||||
+glib@LT_RELEASE@-config.1: glib-config.1
|
||||
+ cp glib-config.1 glib@LT_RELEASE@-config.1
|
||||
|
||||
DVIPS = dvips
|
||||
glib-config.1: $(top_builddir)/config.status glib-config.1.in
|
||||
cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||
+
|
||||
+glib-config-2.0.1: glib-config.1
|
||||
+ cp glib-config.1 glib-config-2.0.1
|
||||
|
||||
install-man1:
|
||||
$(mkinstalldirs) $(DESTDIR)$(man1dir)
|
||||
|
@ -1,136 +1,35 @@
|
||||
--- configure.orig Tue May 11 04:55:02 1999
|
||||
+++ configure Mon May 17 22:30:32 1999
|
||||
@@ -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
|
||||
|
||||
|
||||
|
||||
@@ -3472,7 +3472,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:3479: checking for $ac_func" >&5
|
||||
@@ -4365,6 +4365,12 @@
|
||||
--- configure.orig Fri Jul 14 22:09:59 2000
|
||||
+++ configure Tue Jul 18 10:06:24 2000
|
||||
@@ -4580,6 +4580,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'
|
||||
+ G_MODULE_LDFLAGS='-Wl,-E'
|
||||
+ fi
|
||||
+ ;;
|
||||
esac
|
||||
LIBS_orig="$LIBS"
|
||||
LDFLAGS_orig="$LDFLAGS"
|
||||
@@ -5057,11 +5063,17 @@
|
||||
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*)
|
||||
+ if test x"$G_THREAD_LIBS" = x"-lc_r"; then
|
||||
+ G_THREAD_CFLAGS="-D_THREAD_SAFE"
|
||||
+ G_THREAD_LIBS="-pthread"
|
||||
+ case $host in
|
||||
+ *-*-freebsd4*) ;;
|
||||
+ default) have_poll=no ;;
|
||||
+ esac
|
||||
+ else
|
||||
+ G_THREAD_CFLAGS="-D_THREAD_SAFE -DLINUXTHREADS"
|
||||
+ fi
|
||||
;;
|
||||
esac
|
||||
@@ -4864,8 +4870,8 @@
|
||||
add_thread_lib=""
|
||||
IN=""
|
||||
else
|
||||
- add_thread_lib="-l$thread_lib"
|
||||
- IN=" in -l$thread_lib"
|
||||
+ add_thread_lib="-$thread_lib"
|
||||
+ IN=" in -$thread_lib"
|
||||
fi
|
||||
if test x"$have_threads" = xposix; then
|
||||
defattr=NULL
|
||||
@@ -5042,7 +5048,7 @@
|
||||
|
||||
@@ -5349,9 +5358,6 @@
|
||||
if test x"$enable_threads" = xyes; then
|
||||
|
||||
- G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_REENTRANT" # good default guess
|
||||
+ G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_REENTRANT -D_THREAD_SAFE" # good default guess
|
||||
|
||||
|
||||
-CFLAGS="$CFLAGS $G_THREAD_CFLAGS"
|
||||
-
|
||||
-
|
||||
case "$mutex_has_default" in
|
||||
"yes")
|
||||
echo $ac_n "checking size of $mutex_default_type""... $ac_c" 1>&6
|
||||
@@ -5448,6 +5454,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
|
||||
case $host in
|
||||
*-aix*)
|
||||
|
11
devel/glib20/files/patch-ag
Normal file
11
devel/glib20/files/patch-ag
Normal file
@ -0,0 +1,11 @@
|
||||
--- Makefile.in.orig Mon Jul 17 10:37:18 2000
|
||||
+++ Makefile.in Mon Jul 17 10:38:06 2000
|
||||
@@ -103,7 +103,7 @@
|
||||
|
||||
AUTOMAKE_OPTIONS = 1.4
|
||||
|
||||
-SUBDIRS = . gobject gmodule gthread docs tests
|
||||
+SUBDIRS = . gobject gmodule gthread docs
|
||||
|
||||
bin_SCRIPTS = glib-config-2.0
|
||||
|
@ -1 +1 @@
|
||||
Some useful routines of C programming
|
||||
Some useful routines of C programming (unstable development version)
|
||||
|
@ -1,4 +1,4 @@
|
||||
This is GLib version 1.2. GLib, is a library which includes support
|
||||
This is GLib version 1.3. GLib, is a library which includes support
|
||||
routines for C such as lists, trees, hashes, memory allocation, and
|
||||
many other things.
|
||||
|
||||
@ -7,5 +7,8 @@ ftp://ftp.gtk.org/pub/gtk
|
||||
|
||||
A mailing list is located at gtk-list@redhat.com for discussion.
|
||||
|
||||
Warning: this library is unstable development version, incompatible with
|
||||
version 1.2, so it could not be used as a replacement for the older one.
|
||||
|
||||
- Vanilla
|
||||
vanilla@FreeBSD.ORG
|
||||
|
@ -1,18 +1,33 @@
|
||||
bin/glib12-config
|
||||
include/glib12/glib.h
|
||||
include/glib12/glibconfig.h
|
||||
include/glib12/gmodule.h
|
||||
@unexec install-info --delete %D/info/glib.info %D/info/dir
|
||||
info/glib.info
|
||||
@exec install-info %D/info/glib.info %D/info/dir
|
||||
lib/libglib12.a
|
||||
lib/libglib12.so
|
||||
lib/libglib12.so.3
|
||||
lib/libgmodule12.a
|
||||
lib/libgmodule12.so
|
||||
lib/libgmodule12.so.3
|
||||
lib/libgthread12.a
|
||||
lib/libgthread12.so
|
||||
lib/libgthread12.so.3
|
||||
share/aclocal/glib.m4
|
||||
@dirrm include/glib12
|
||||
bin/glib-config-2.0
|
||||
bin/gobject-query
|
||||
include/glib-2.0/gerror.h
|
||||
include/glib-2.0/glib-object.h
|
||||
include/glib-2.0/glib.h
|
||||
include/glib-2.0/gmodule.h
|
||||
include/glib-2.0/gobject/genums.h
|
||||
include/glib-2.0/gobject/gobject.h
|
||||
include/glib-2.0/gobject/gparam.h
|
||||
include/glib-2.0/gobject/gparamspecs.h
|
||||
include/glib-2.0/gobject/gtype.h
|
||||
include/glib-2.0/gobject/gvalue.h
|
||||
include/glib-2.0/gobject/gvaluecollector.h
|
||||
include/glib-2.0/gobject/gvaluetypes.h
|
||||
include/glib-2.0/gunicode.h
|
||||
lib/glib-2.0/include/glibconfig.h
|
||||
lib/libglib-1.3.a
|
||||
lib/libglib-1.3.so
|
||||
lib/libglib-1.3.so.1
|
||||
lib/libgmodule-1.3.a
|
||||
lib/libgmodule-1.3.so
|
||||
lib/libgmodule-1.3.so.1
|
||||
lib/libgobject-1.3.a
|
||||
lib/libgobject-1.3.so
|
||||
lib/libgobject-1.3.so.1
|
||||
lib/libgthread-1.3.a
|
||||
lib/libgthread-1.3.so
|
||||
lib/libgthread-1.3.so.1
|
||||
share/aclocal/glib-2.0.m4
|
||||
@dirrm lib/glib-2.0/include
|
||||
@dirrm lib/glib-2.0
|
||||
@dirrm include/glib-2.0/gobject
|
||||
@dirrm include/glib-2.0
|
||||
|
Loading…
Reference in New Issue
Block a user