cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.3.6.

Browse Source
This commit is contained in:
Maxim Sobolev 2001-08-01 17:50:36 +00:00
parent 26e64ae7f8
commit 6274ea7ad8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=45710
16 changed files with 118 additions and 1092 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
devel/glib13/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= glib
PORTVERSION= 1.3.5
PORTVERSION= 1.3.6
CATEGORIES= devel
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
@ -22,14 +22,15 @@ RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
NO_LATEST_LINK= "Unstable, development version."
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
LDFLAGS="-L${LOCALBASE}/lib" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
MAN1= glib-config-2.0.1 glib-genmarshal.1 \
glib-mkenums.1
MAN1= glib-genmarshal.1 glib-mkenums.1
pre-patch:
@find ${WRKSRC} -type f | xargs ${GREP} -l iconv.h | \

2
devel/glib13/distinfo
View File

@ -1 +1 @@
MD5 (glib-1.3.5.tar.gz) = c17bccaaf8fa482b4a26c4de681fa6c6
MD5 (glib-1.3.6.tar.gz) = fe116d632b3b628d8114ac5a56855722

21
devel/glib13/files/patch-ab
View File

@ -1,21 +0,0 @@
--- 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-config-2.0.1
EXTRA_DIST = glib-config.1.in
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -129,6 +129,9 @@
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)

38
devel/glib13/files/patch-ae
View File

@ -1,9 +1,9 @@
$FreeBSD$
--- configure.orig Fri May 4 19:11:43 2001
+++ configure Mon May 14 13:13:57 2001
@@ -6339,6 +6339,12 @@
--- configure.orig Wed Jun 13 19:39:30 2001
+++ configure Wed Aug 1 19:33:18 2001
@@ -10018,6 +10018,12 @@
linux*)
G_MODULE_LDFLAGS='-rdynamic'
;;
@ -16,42 +16,50 @@ $FreeBSD$
esac
LIBS_orig="$LIBS"
LDFLAGS_orig="$LDFLAGS"
@@ -6805,7 +6811,7 @@
@@ -10488,8 +10494,8 @@
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
fi
;;
- *-freebsd2.2*)
- G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE"
+ *-freebsd*)
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE"
+ G_THREAD_CFLAGS="$G_THREAD_CFLAGS $PTHREAD_CFLAGS"
# FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
@@ -6891,8 +6897,8 @@
# -mthreads flag.
@@ -10569,13 +10575,13 @@
fi
;;
*)
- for thread_lib in "" pthread pthread32 pthreads c_r thread dce; do
+ for thread_lib in "$PTHREAD_LIBS" "" pthread pthread32 pthreads c_r thread dce; do
if test x"$thread_lib" = x; then
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"
+ add_thread_lib="$thread_lib"
+ IN=" in $thread_lib"
fi
if test x"$have_threads" = xposix; then
defattr=0
@@ -7431,6 +7437,7 @@
@@ -11114,6 +11120,7 @@
if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
+# LIBS="-lgiconv $LIBS"
cat > conftest.$ac_ext <<EOF
#line 7436 "configure"
#line 11119 "configure"
#include "confdefs.h"
@@ -7798,14 +7805,14 @@
@@ -11481,14 +11488,14 @@
#
# Check for libiconv
#
- echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
-echo "configure:7803: checking for libiconv_open in -liconv" >&5
-echo "configure:11486: checking for libiconv_open in -liconv" >&5
+ echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6
+echo "configure:7803: checking for libiconv_open in -lgiconv" >&5
+echo "configure:11486: checking for libiconv_open in -lgiconv" >&5
ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -60,9 +68,9 @@ $FreeBSD$
-LIBS="-liconv $LIBS"
+LIBS="-lgiconv $LIBS"
cat > conftest.$ac_ext <<EOF
#line 7811 "configure"
#line 11494 "configure"
#include "confdefs.h"
@@ -7845,7 +7852,7 @@
@@ -11528,7 +11535,7 @@
fi
if test "x$with_libiconv" = "xyes" ; then

12
devel/glib13/files/patch-ag
View File

@ -1,18 +1,18 @@
$FreeBSD$
--- Makefile.in.orig Tue Apr 17 22:49:12 2001
+++ Makefile.in Sun Apr 29 14:07:07 2001
@@ -133,7 +133,7 @@
--- Makefile.in.orig Wed Jul 18 15:45:33 2001
+++ Makefile.in Wed Jul 18 15:47:24 2001
@@ -136,7 +136,7 @@
AUTOMAKE_OPTIONS = 1.4
-SUBDIRS = . gobject gmodule gthread docs tests build
+SUBDIRS = . gobject gmodule gthread docs build
-SUBDIRS = . m4macros gobject gmodule gthread docs tests build
+SUBDIRS = . m4macros gobject gmodule gthread docs build
INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
@@ -157,7 +157,7 @@
@@ -160,7 +160,7 @@
glibinclude_HEADERS = galloca.h garray.h gasyncqueue.h gbacktrace.h gcache.h gcompletion.h gconvert.h gdataset.h gdate.h gerror.h gfileutils.h ghash.h ghook.h giochannel.h glib.h glib-object.h glist.h gmacros.h gmain.h gmarkup.h gmem.h gmessages.h gnode.h gpattern.h gprimes.h gqsort.h gquark.h gqueue.h grand.h grel.h gscanner.h gshell.h gslist.h gspawn.h gstrfuncs.h gstring.h gthread.h gthreadpool.h gtimer.h gtree.h gtypes.h gunicode.h gutils.h gwin32.h

494
devel/glib13/files/patch-gobject::Makefile.in
View File

@ -1,494 +0,0 @@
$FreeBSD$
Note: Don't be fooled by the size of this patch - basically it is
a result of changing 2 lines in gobject/Makefile.am. glib-mkenums
is a script, but it has been erroneously added into bin_PROGRAMS
which was breaking the make install.
--- gobject/Makefile.in 2001/05/14 10:30:17 1.1
+++ gobject/Makefile.in 2001/05/14 10:31:02
@@ -211,12 +211,13 @@
#
# programs to compile and install
#
-bin_PROGRAMS = gobject-query glib-genmarshal glib-mkenums
+bin_PROGRAMS = gobject-query glib-genmarshal
+bin_SCRIPTS = glib-mkenums
noinst_PROGRAMS = testgruntime
# source files
gobject_query_SOURCES = gobject-query.c
glib_genmarshal_SOURCES = glib-genmarshal.c
-glib_mkenums_SOURCES = glib-mkenums
+#glib_mkenums_SOURCES = glib-mkenums
testgruntime_SOURCES = testgruntime.c
# link programs against libgobject
progs_LDADD = libgobject-1.3.la $(libglib)
@@ -247,8 +248,7 @@
genums.lo gobject.lo gparam.lo gparamspecs.lo gsignal.lo gtype.lo \
gtypemodule.lo gtypeplugin.lo gvalue.lo gvaluearray.lo \
gvaluetransform.lo gvaluetypes.lo
-bin_PROGRAMS = gobject-query$(EXEEXT) glib-genmarshal$(EXEEXT) \
-glib-mkenums$(EXEEXT)
+bin_PROGRAMS = gobject-query$(EXEEXT) glib-genmarshal$(EXEEXT)
noinst_PROGRAMS = testgruntime$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
@@ -259,14 +259,12 @@
glib_genmarshal_OBJECTS = glib-genmarshal.o
glib_genmarshal_DEPENDENCIES = $(top_builddir)/libglib-1.3.la
glib_genmarshal_LDFLAGS =
-glib_mkenums_OBJECTS =
-glib_mkenums_LDADD = $(LDADD)
-glib_mkenums_DEPENDENCIES =
-glib_mkenums_LDFLAGS =
testgruntime_OBJECTS = testgruntime.o
testgruntime_DEPENDENCIES = libgobject-1.3.la \
$(top_builddir)/libglib-1.3.la
testgruntime_LDFLAGS =
+SCRIPTS = $(bin_SCRIPTS)
+
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -283,18 +281,24 @@
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-TAR = gtar
+TAR = tar
GZIP_ENV = --best
-SOURCES = $(libgobject_1_3_la_SOURCES) $(gobject_query_SOURCES) $(glib_genmarshal_SOURCES) $(glib_mkenums_SOURCES) $(testgruntime_SOURCES)
-OBJECTS = $(libgobject_1_3_la_OBJECTS) $(gobject_query_OBJECTS) $(glib_genmarshal_OBJECTS) $(glib_mkenums_OBJECTS) $(testgruntime_OBJECTS)
+DEP_FILES = .deps/gboxed.P .deps/gbsearcharray.P .deps/gclosure.P \
+.deps/genums.P .deps/glib-genmarshal.P .deps/gobject-query.P \
+.deps/gobject.P .deps/gparam.P .deps/gparamspecs.P .deps/gsignal.P \
+.deps/gtype.P .deps/gtypemodule.P .deps/gtypeplugin.P .deps/gvalue.P \
+.deps/gvaluearray.P .deps/gvaluetransform.P .deps/gvaluetypes.P \
+.deps/testgruntime.P
+SOURCES = $(libgobject_1_3_la_SOURCES) $(gobject_query_SOURCES) $(glib_genmarshal_SOURCES) $(testgruntime_SOURCES)
+OBJECTS = $(libgobject_1_3_la_OBJECTS) $(gobject_query_OBJECTS) $(glib_genmarshal_OBJECTS) $(testgruntime_OBJECTS)
all: all-redirect
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .s
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps gobject/Makefile
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu gobject/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -324,9 +328,6 @@
$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
done
-.c.o:
- $(COMPILE) -c $<
-
.s.o:
$(COMPILE) -c $<
@@ -343,9 +344,6 @@
maintainer-clean-compile:
-.c.lo:
- $(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
.s.lo:
$(LIBTOOL) --mode=compile $(COMPILE) -c $<
@@ -407,14 +405,29 @@
@rm -f glib-genmarshal$(EXEEXT)
$(LINK) $(glib_genmarshal_LDFLAGS) $(glib_genmarshal_OBJECTS) $(glib_genmarshal_LDADD) $(LIBS)
-glib-mkenums$(EXEEXT): $(glib_mkenums_OBJECTS) $(glib_mkenums_DEPENDENCIES)
- @rm -f glib-mkenums$(EXEEXT)
- $(LINK) $(glib_mkenums_LDFLAGS) $(glib_mkenums_OBJECTS) $(glib_mkenums_LDADD) $(LIBS)
-
testgruntime$(EXEEXT): $(testgruntime_OBJECTS) $(testgruntime_DEPENDENCIES)
@rm -f testgruntime$(EXEEXT)
$(LINK) $(testgruntime_LDFLAGS) $(testgruntime_OBJECTS) $(testgruntime_LDADD) $(LIBS)
+install-binSCRIPTS: $(bin_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
+ @list='$(bin_SCRIPTS)'; for p in $$list; do \
+ if test -f $$p; then \
+ echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
+ $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+ else if test -f $(srcdir)/$$p; then \
+ echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
+ $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+ else :; fi; fi; \
+ done
+
+uninstall-binSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ list='$(bin_SCRIPTS)'; for p in $$list; do \
+ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+ done
+
install-man1:
$(mkinstalldirs) $(DESTDIR)$(man1dir)
@list='$(man1_MANS)'; \
@@ -503,6 +516,11 @@
subdir = gobject
distdir: $(DISTFILES)
+ here=`cd $(top_builddir) && pwd`; \
+ top_distdir=`cd $(top_distdir) && pwd`; \
+ distdir=`cd $(distdir) && pwd`; \
+ cd $(top_srcdir) \
+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu gobject/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
@@ -514,223 +532,38 @@
fi; \
done
$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
-gboxed.lo gboxed.o : gboxed.c gboxed.h gtype.h ../glib.h ../galloca.h \
- ../gtypes.h ../glibconfig.h ../gmacros.h ../garray.h \
- ../gasyncqueue.h ../gthread.h ../gerror.h ../gquark.h \
- ../gbacktrace.h ../gcache.h ../glist.h ../gmem.h \
- ../gcompletion.h ../gconvert.h ../gdataset.h ../gdate.h \
- ../gfileutils.h ../ghash.h ../ghook.h ../giochannel.h \
- ../gmain.h ../gslist.h ../gmarkup.h ../gmessages.h ../gnode.h \
- ../gpattern.h ../gprimes.h ../gqsort.h ../gqueue.h ../grand.h \
- ../grel.h ../gscanner.h ../gshell.h ../gspawn.h ../gstrfuncs.h \
- ../gstring.h ../gthreadpool.h ../gtimer.h ../gtree.h \
- ../gunicode.h ../gutils.h gbsearcharray.h gvalue.h \
- gvaluearray.h gvalue.h gclosure.h gvaluecollector.h
-gbsearcharray.lo gbsearcharray.o : gbsearcharray.c gbsearcharray.h \
- gtype.h ../glib.h ../galloca.h ../gtypes.h ../glibconfig.h \
- ../gmacros.h ../garray.h ../gasyncqueue.h ../gthread.h \
- ../gerror.h ../gquark.h ../gbacktrace.h ../gcache.h ../glist.h \
- ../gmem.h ../gcompletion.h ../gconvert.h ../gdataset.h \
- ../gdate.h ../gfileutils.h ../ghash.h ../ghook.h \
- ../giochannel.h ../gmain.h ../gslist.h ../gmarkup.h \
- ../gmessages.h ../gnode.h ../gpattern.h ../gprimes.h \
- ../gqsort.h ../gqueue.h ../grand.h ../grel.h ../gscanner.h \
- ../gshell.h ../gspawn.h ../gstrfuncs.h ../gstring.h \
- ../gthreadpool.h ../gtimer.h ../gtree.h ../gunicode.h \
- ../gutils.h
-gclosure.lo gclosure.o : gclosure.c gclosure.h gtype.h ../glib.h \
- ../galloca.h ../gtypes.h ../glibconfig.h ../gmacros.h \
- ../garray.h ../gasyncqueue.h ../gthread.h ../gerror.h \
- ../gquark.h ../gbacktrace.h ../gcache.h ../glist.h ../gmem.h \
- ../gcompletion.h ../gconvert.h ../gdataset.h ../gdate.h \
- ../gfileutils.h ../ghash.h ../ghook.h ../giochannel.h \
- ../gmain.h ../gslist.h ../gmarkup.h ../gmessages.h ../gnode.h \
- ../gpattern.h ../gprimes.h ../gqsort.h ../gqueue.h ../grand.h \
- ../grel.h ../gscanner.h ../gshell.h ../gspawn.h ../gstrfuncs.h \
- ../gstring.h ../gthreadpool.h ../gtimer.h ../gtree.h \
- ../gunicode.h ../gutils.h gvalue.h
-genums.lo genums.o : genums.c genums.h gtype.h ../glib.h ../galloca.h \
- ../gtypes.h ../glibconfig.h ../gmacros.h ../garray.h \
- ../gasyncqueue.h ../gthread.h ../gerror.h ../gquark.h \
- ../gbacktrace.h ../gcache.h ../glist.h ../gmem.h \
- ../gcompletion.h ../gconvert.h ../gdataset.h ../gdate.h \
- ../gfileutils.h ../ghash.h ../ghook.h ../giochannel.h \
- ../gmain.h ../gslist.h ../gmarkup.h ../gmessages.h ../gnode.h \
- ../gpattern.h ../gprimes.h ../gqsort.h ../gqueue.h ../grand.h \
- ../grel.h ../gscanner.h ../gshell.h ../gspawn.h ../gstrfuncs.h \
- ../gstring.h ../gthreadpool.h ../gtimer.h ../gtree.h \
- ../gunicode.h ../gutils.h gvalue.h gvaluecollector.h
-glib-genmarshal.o: glib-genmarshal.c ../config.h ../glib.h ../galloca.h \
- ../gtypes.h ../glibconfig.h ../gmacros.h ../garray.h \
- ../gasyncqueue.h ../gthread.h ../gerror.h ../gquark.h \
- ../gbacktrace.h ../gcache.h ../glist.h ../gmem.h \
- ../gcompletion.h ../gconvert.h ../gdataset.h ../gdate.h \
- ../gfileutils.h ../ghash.h ../ghook.h ../giochannel.h \
- ../gmain.h ../gslist.h ../gmarkup.h ../gmessages.h ../gnode.h \
- ../gpattern.h ../gprimes.h ../gqsort.h ../gqueue.h ../grand.h \
- ../grel.h ../gscanner.h ../gshell.h ../gspawn.h ../gstrfuncs.h \
- ../gstring.h ../gthreadpool.h ../gtimer.h ../gtree.h \
- ../gunicode.h ../gutils.h gmarshal.strings
-gobject-query.o: gobject-query.c ../config.h ../glib-object.h gboxed.h \
- gtype.h ../glib.h ../galloca.h ../gtypes.h ../glibconfig.h \
- ../gmacros.h ../garray.h ../gasyncqueue.h ../gthread.h \
- ../gerror.h ../gquark.h ../gbacktrace.h ../gcache.h ../glist.h \
- ../gmem.h ../gcompletion.h ../gconvert.h ../gdataset.h \
- ../gdate.h ../gfileutils.h ../ghash.h ../ghook.h \
- ../giochannel.h ../gmain.h ../gslist.h ../gmarkup.h \
- ../gmessages.h ../gnode.h ../gpattern.h ../gprimes.h \
- ../gqsort.h ../gqueue.h ../grand.h ../grel.h ../gscanner.h \
- ../gshell.h ../gspawn.h ../gstrfuncs.h ../gstring.h \
- ../gthreadpool.h ../gtimer.h ../gtree.h ../gunicode.h \
- ../gutils.h gbsearcharray.h genums.h gobject.h gvalue.h \
- gparam.h gclosure.h gparamspecs.h gsignal.h gmarshal.h \
- gtypemodule.h gtypeplugin.h gvaluearray.h gvaluetypes.h
-gobject.lo gobject.o : gobject.c gobject.h gtype.h ../glib.h \
- ../galloca.h ../gtypes.h ../glibconfig.h ../gmacros.h \
- ../garray.h ../gasyncqueue.h ../gthread.h ../gerror.h \
- ../gquark.h ../gbacktrace.h ../gcache.h ../glist.h ../gmem.h \
- ../gcompletion.h ../gconvert.h ../gdataset.h ../gdate.h \
- ../gfileutils.h ../ghash.h ../ghook.h ../giochannel.h \
- ../gmain.h ../gslist.h ../gmarkup.h ../gmessages.h ../gnode.h \
- ../gpattern.h ../gprimes.h ../gqsort.h ../gqueue.h ../grand.h \
- ../grel.h ../gscanner.h ../gshell.h ../gspawn.h ../gstrfuncs.h \
- ../gstring.h ../gthreadpool.h ../gtimer.h ../gtree.h \
- ../gunicode.h ../gutils.h gvalue.h gparam.h gclosure.h \
- gvaluecollector.h gsignal.h gmarshal.h gparamspecs.h genums.h \
- gboxed.h gobject.h gvaluetypes.h
-gparam.lo gparam.o : gparam.c gparam.h gvalue.h gtype.h ../glib.h \
- ../galloca.h ../gtypes.h ../glibconfig.h ../gmacros.h \
- ../garray.h ../gasyncqueue.h ../gthread.h ../gerror.h \
- ../gquark.h ../gbacktrace.h ../gcache.h ../glist.h ../gmem.h \
- ../gcompletion.h ../gconvert.h ../gdataset.h ../gdate.h \
- ../gfileutils.h ../ghash.h ../ghook.h ../giochannel.h \
- ../gmain.h ../gslist.h ../gmarkup.h ../gmessages.h ../gnode.h \
- ../gpattern.h ../gprimes.h ../gqsort.h ../gqueue.h ../grand.h \
- ../grel.h ../gscanner.h ../gshell.h ../gspawn.h ../gstrfuncs.h \
- ../gstring.h ../gthreadpool.h ../gtimer.h ../gtree.h \
- ../gunicode.h ../gutils.h gvaluecollector.h
-gparamspecs.lo gparamspecs.o : gparamspecs.c gparamspecs.h gvalue.h \
- gtype.h ../glib.h ../galloca.h ../gtypes.h ../glibconfig.h \
- ../gmacros.h ../garray.h ../gasyncqueue.h ../gthread.h \
- ../gerror.h ../gquark.h ../gbacktrace.h ../gcache.h ../glist.h \
- ../gmem.h ../gcompletion.h ../gconvert.h ../gdataset.h \
- ../gdate.h ../gfileutils.h ../ghash.h ../ghook.h \
- ../giochannel.h ../gmain.h ../gslist.h ../gmarkup.h \
- ../gmessages.h ../gnode.h ../gpattern.h ../gprimes.h \
- ../gqsort.h ../gqueue.h ../grand.h ../grel.h ../gscanner.h \
- ../gshell.h ../gspawn.h ../gstrfuncs.h ../gstring.h \
- ../gthreadpool.h ../gtimer.h ../gtree.h ../gunicode.h \
- ../gutils.h genums.h gboxed.h gobject.h gparam.h gclosure.h \
- gvaluecollector.h gvaluearray.h ../config.h
-gsignal.lo gsignal.o : gsignal.c gsignal.h gclosure.h gtype.h ../glib.h \
- ../galloca.h ../gtypes.h ../glibconfig.h ../gmacros.h \
- ../garray.h ../gasyncqueue.h ../gthread.h ../gerror.h \
- ../gquark.h ../gbacktrace.h ../gcache.h ../glist.h ../gmem.h \
- ../gcompletion.h ../gconvert.h ../gdataset.h ../gdate.h \
- ../gfileutils.h ../ghash.h ../ghook.h ../giochannel.h \
- ../gmain.h ../gslist.h ../gmarkup.h ../gmessages.h ../gnode.h \
- ../gpattern.h ../gprimes.h ../gqsort.h ../gqueue.h ../grand.h \
- ../grel.h ../gscanner.h ../gshell.h ../gspawn.h ../gstrfuncs.h \
- ../gstring.h ../gthreadpool.h ../gtimer.h ../gtree.h \
- ../gunicode.h ../gutils.h gvalue.h gparam.h gmarshal.h \
- gbsearcharray.h gvaluecollector.h gvaluetypes.h gboxed.h \
- gobject.h genums.h gmarshal.c
-gtype.lo gtype.o : gtype.c gtype.h ../glib.h ../galloca.h ../gtypes.h \
- ../glibconfig.h ../gmacros.h ../garray.h ../gasyncqueue.h \
- ../gthread.h ../gerror.h ../gquark.h ../gbacktrace.h \
- ../gcache.h ../glist.h ../gmem.h ../gcompletion.h ../gconvert.h \
- ../gdataset.h ../gdate.h ../gfileutils.h ../ghash.h ../ghook.h \
- ../giochannel.h ../gmain.h ../gslist.h ../gmarkup.h \
- ../gmessages.h ../gnode.h ../gpattern.h ../gprimes.h \
- ../gqsort.h ../gqueue.h ../grand.h ../grel.h ../gscanner.h \
- ../gshell.h ../gspawn.h ../gstrfuncs.h ../gstring.h \
- ../gthreadpool.h ../gtimer.h ../gtree.h ../gunicode.h \
- ../gutils.h gtypeplugin.h gtype.h gvaluecollector.h
-gtypemodule.lo gtypemodule.o : gtypemodule.c gtypeplugin.h gtype.h \
- ../glib.h ../galloca.h ../gtypes.h ../glibconfig.h ../gmacros.h \
- ../garray.h ../gasyncqueue.h ../gthread.h ../gerror.h \
- ../gquark.h ../gbacktrace.h ../gcache.h ../glist.h ../gmem.h \
- ../gcompletion.h ../gconvert.h ../gdataset.h ../gdate.h \
- ../gfileutils.h ../ghash.h ../ghook.h ../giochannel.h \
- ../gmain.h ../gslist.h ../gmarkup.h ../gmessages.h ../gnode.h \
- ../gpattern.h ../gprimes.h ../gqsort.h ../gqueue.h ../grand.h \
- ../grel.h ../gscanner.h ../gshell.h ../gspawn.h ../gstrfuncs.h \
- ../gstring.h ../gthreadpool.h ../gtimer.h ../gtree.h \
- ../gunicode.h ../gutils.h gtypemodule.h gobject.h gvalue.h \
- gparam.h gclosure.h
-gtypeplugin.lo gtypeplugin.o : gtypeplugin.c gtypeplugin.h gtype.h \
- ../glib.h ../galloca.h ../gtypes.h ../glibconfig.h ../gmacros.h \
- ../garray.h ../gasyncqueue.h ../gthread.h ../gerror.h \
- ../gquark.h ../gbacktrace.h ../gcache.h ../glist.h ../gmem.h \
- ../gcompletion.h ../gconvert.h ../gdataset.h ../gdate.h \
- ../gfileutils.h ../ghash.h ../ghook.h ../giochannel.h \
- ../gmain.h ../gslist.h ../gmarkup.h ../gmessages.h ../gnode.h \
- ../gpattern.h ../gprimes.h ../gqsort.h ../gqueue.h ../grand.h \
- ../grel.h ../gscanner.h ../gshell.h ../gspawn.h ../gstrfuncs.h \
- ../gstring.h ../gthreadpool.h ../gtimer.h ../gtree.h \
- ../gunicode.h ../gutils.h
-gvalue.lo gvalue.o : gvalue.c gvalue.h gtype.h ../glib.h ../galloca.h \
- ../gtypes.h ../glibconfig.h ../gmacros.h ../garray.h \
- ../gasyncqueue.h ../gthread.h ../gerror.h ../gquark.h \
- ../gbacktrace.h ../gcache.h ../glist.h ../gmem.h \
- ../gcompletion.h ../gconvert.h ../gdataset.h ../gdate.h \
- ../gfileutils.h ../ghash.h ../ghook.h ../giochannel.h \
- ../gmain.h ../gslist.h ../gmarkup.h ../gmessages.h ../gnode.h \
- ../gpattern.h ../gprimes.h ../gqsort.h ../gqueue.h ../grand.h \
- ../grel.h ../gscanner.h ../gshell.h ../gspawn.h ../gstrfuncs.h \
- ../gstring.h ../gthreadpool.h ../gtimer.h ../gtree.h \
- ../gunicode.h ../gutils.h gvaluecollector.h gbsearcharray.h
-gvaluearray.lo gvaluearray.o : gvaluearray.c gvaluearray.h gvalue.h \
- gtype.h ../glib.h ../galloca.h ../gtypes.h ../glibconfig.h \
- ../gmacros.h ../garray.h ../gasyncqueue.h ../gthread.h \
- ../gerror.h ../gquark.h ../gbacktrace.h ../gcache.h ../glist.h \
- ../gmem.h ../gcompletion.h ../gconvert.h ../gdataset.h \
- ../gdate.h ../gfileutils.h ../ghash.h ../ghook.h \
- ../giochannel.h ../gmain.h ../gslist.h ../gmarkup.h \
- ../gmessages.h ../gnode.h ../gpattern.h ../gprimes.h \
- ../gqsort.h ../gqueue.h ../grand.h ../grel.h ../gscanner.h \
- ../gshell.h ../gspawn.h ../gstrfuncs.h ../gstring.h \
- ../gthreadpool.h ../gtimer.h ../gtree.h ../gunicode.h \
- ../gutils.h
-gvaluetransform.lo gvaluetransform.o : gvaluetransform.c gvalue.h \
- gtype.h ../glib.h ../galloca.h ../gtypes.h ../glibconfig.h \
- ../gmacros.h ../garray.h ../gasyncqueue.h ../gthread.h \
- ../gerror.h ../gquark.h ../gbacktrace.h ../gcache.h ../glist.h \
- ../gmem.h ../gcompletion.h ../gconvert.h ../gdataset.h \
- ../gdate.h ../gfileutils.h ../ghash.h ../ghook.h \
- ../giochannel.h ../gmain.h ../gslist.h ../gmarkup.h \
- ../gmessages.h ../gnode.h ../gpattern.h ../gprimes.h \
- ../gqsort.h ../gqueue.h ../grand.h ../grel.h ../gscanner.h \
- ../gshell.h ../gspawn.h ../gstrfuncs.h ../gstring.h \
- ../gthreadpool.h ../gtimer.h ../gtree.h ../gunicode.h \
- ../gutils.h genums.h
-gvaluetypes.lo gvaluetypes.o : gvaluetypes.c gvaluetypes.h gvalue.h \
- gtype.h ../glib.h ../galloca.h ../gtypes.h ../glibconfig.h \
- ../gmacros.h ../garray.h ../gasyncqueue.h ../gthread.h \
- ../gerror.h ../gquark.h ../gbacktrace.h ../gcache.h ../glist.h \
- ../gmem.h ../gcompletion.h ../gconvert.h ../gdataset.h \
- ../gdate.h ../gfileutils.h ../ghash.h ../ghook.h \
- ../giochannel.h ../gmain.h ../gslist.h ../gmarkup.h \
- ../gmessages.h ../gnode.h ../gpattern.h ../gprimes.h \
- ../gqsort.h ../gqueue.h ../grand.h ../grel.h ../gscanner.h \
- ../gshell.h ../gspawn.h ../gstrfuncs.h ../gstring.h \
- ../gthreadpool.h ../gtimer.h ../gtree.h ../gunicode.h \
- ../gutils.h gvaluecollector.h gobject.h gparam.h gclosure.h \
- gparam.h gboxed.h genums.h
-testgruntime.o: testgruntime.c ../glib-object.h gboxed.h gtype.h \
- ../glib.h ../galloca.h ../gtypes.h ../glibconfig.h ../gmacros.h \
- ../garray.h ../gasyncqueue.h ../gthread.h ../gerror.h \
- ../gquark.h ../gbacktrace.h ../gcache.h ../glist.h ../gmem.h \
- ../gcompletion.h ../gconvert.h ../gdataset.h ../gdate.h \
- ../gfileutils.h ../ghash.h ../ghook.h ../giochannel.h \
- ../gmain.h ../gslist.h ../gmarkup.h ../gmessages.h ../gnode.h \
- ../gpattern.h ../gprimes.h ../gqsort.h ../gqueue.h ../grand.h \
- ../grel.h ../gscanner.h ../gshell.h ../gspawn.h ../gstrfuncs.h \
- ../gstring.h ../gthreadpool.h ../gtimer.h ../gtree.h \
- ../gunicode.h ../gutils.h gbsearcharray.h genums.h gobject.h \
- gvalue.h gparam.h gclosure.h gparamspecs.h gsignal.h gmarshal.h \
- gtypemodule.h gtypeplugin.h gvaluearray.h gvaluetypes.h
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+ -rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+ @echo '$(COMPILE) -c $<'; \
+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
+ tr ' ' '\012' < .deps/$(*F).pp \
+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+ >> .deps/$(*F).P; \
+ rm .deps/$(*F).pp
+
+%.lo: %.c
+ @echo '$(LTCOMPILE) -c $<'; \
+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
+ < .deps/$(*F).pp > .deps/$(*F).P; \
+ tr ' ' '\012' < .deps/$(*F).pp \
+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+ >> .deps/$(*F).P; \
+ rm -f .deps/$(*F).pp
info-am:
info: info-am
dvi-am:
@@ -739,7 +572,8 @@
check: check-am
installcheck-am:
installcheck: installcheck-am
-install-exec-am: install-libLTLIBRARIES install-binPROGRAMS
+install-exec-am: install-libLTLIBRARIES install-binPROGRAMS \
+ install-binSCRIPTS
install-exec: install-exec-am
install-data-am: install-man install-libgobjectincludeHEADERS
@@ -749,15 +583,17 @@
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-am
uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \
- uninstall-man uninstall-libgobjectincludeHEADERS
+ uninstall-binSCRIPTS uninstall-man \
+ uninstall-libgobjectincludeHEADERS
uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) \
+ $(HEADERS)
all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
- $(DESTDIR)$(mandir)/man1 \
+ $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 \
$(DESTDIR)$(libgobjectincludedir)
@@ -775,20 +611,20 @@
mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \
mostlyclean-libtool mostlyclean-binPROGRAMS \
mostlyclean-noinstPROGRAMS mostlyclean-tags \
- mostlyclean-generic
+ mostlyclean-depend mostlyclean-generic
mostlyclean: mostlyclean-am
clean-am: clean-libLTLIBRARIES clean-compile clean-libtool \
clean-binPROGRAMS clean-noinstPROGRAMS clean-tags \
- clean-generic mostlyclean-am
+ clean-depend clean-generic mostlyclean-am
clean: clean-am
distclean-am: distclean-libLTLIBRARIES distclean-compile \
distclean-libtool distclean-binPROGRAMS \
distclean-noinstPROGRAMS distclean-tags \
- distclean-generic clean-am
+ distclean-depend distclean-generic clean-am
-rm -f libtool
distclean: distclean-am
@@ -797,7 +633,8 @@
maintainer-clean-compile maintainer-clean-libtool \
maintainer-clean-binPROGRAMS \
maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
- maintainer-clean-generic distclean-am
+ maintainer-clean-depend maintainer-clean-generic \
+ distclean-am
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
@@ -811,14 +648,16 @@
maintainer-clean-libtool mostlyclean-binPROGRAMS distclean-binPROGRAMS \
clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
install-binPROGRAMS mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
-clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS install-man1 \
-uninstall-man1 install-man uninstall-man \
-uninstall-libgobjectincludeHEADERS install-libgobjectincludeHEADERS \
-tags mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
-distdir info-am info dvi-am dvi check check-am installcheck-am \
-installcheck install-exec-am install-exec install-data-am install-data \
-install-am install uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
+clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
+uninstall-binSCRIPTS install-binSCRIPTS install-man1 uninstall-man1 \
+install-man uninstall-man uninstall-libgobjectincludeHEADERS \
+install-libgobjectincludeHEADERS tags mostlyclean-tags distclean-tags \
+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
+distclean-depend clean-depend maintainer-clean-depend info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean

18
devel/glib13/files/patch-ltmain.sh Normal file
View File

@ -0,0 +1,18 @@
$FreeBSD$
--- ltmain.sh 2001/07/18 13:00:49 1.1
+++ ltmain.sh 2001/07/18 13:01:07
@@ -4175,10 +4175,12 @@
fi
# Install the pseudo-library for information purposes.
+ if false; then
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
instname="$dir/$name"i
$show "$install_prog $instname $destdir/$name"
$run eval "$install_prog $instname $destdir/$name" || exit $?
+ fi
# Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

9
devel/glib13/pkg-plist
View File

@ -66,20 +66,21 @@ include/glib-2.0/gutils.h
include/glib-2.0/gwin32.h
lib/libglib-1.3.a
lib/libglib-1.3.so
lib/libglib-1.3.so.5
lib/libglib-1.3.so.6
lib/libgmodule-1.3.a
lib/libgmodule-1.3.so
lib/libgmodule-1.3.so.5
lib/libgmodule-1.3.so.6
lib/libgobject-1.3.a
lib/libgobject-1.3.so
lib/libgobject-1.3.so.5
lib/libgobject-1.3.so.6
lib/libgthread-1.3.a
lib/libgthread-1.3.so
lib/libgthread-1.3.so.5
lib/libgthread-1.3.so.6
libdata/pkgconfig/glib-2.0.pc
libdata/pkgconfig/gmodule-2.0.pc
libdata/pkgconfig/gobject-2.0.pc
libdata/pkgconfig/gthread-2.0.pc
share/aclocal/glib-2.0.m4
share/aclocal/glib-gettext.m4
@dirrm include/glib-2.0/gobject
@dirrm include/glib-2.0

11
devel/glib20/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= glib
PORTVERSION= 1.3.5
PORTVERSION= 1.3.6
CATEGORIES= devel
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
@ -22,14 +22,15 @@ RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
NO_LATEST_LINK= "Unstable, development version."
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
USE_GMAKE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
LDFLAGS="-L${LOCALBASE}/lib" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
MAN1= glib-config-2.0.1 glib-genmarshal.1 \
glib-mkenums.1
MAN1= glib-genmarshal.1 glib-mkenums.1
pre-patch:
@find ${WRKSRC} -type f | xargs ${GREP} -l iconv.h | \

2
devel/glib20/distinfo
View File

@ -1 +1 @@
MD5 (glib-1.3.5.tar.gz) = c17bccaaf8fa482b4a26c4de681fa6c6
MD5 (glib-1.3.6.tar.gz) = fe116d632b3b628d8114ac5a56855722

21
devel/glib20/files/patch-ab
View File

@ -1,21 +0,0 @@
--- 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-config-2.0.1
EXTRA_DIST = glib-config.1.in
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -129,6 +129,9 @@
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)

38
devel/glib20/files/patch-ae
View File

@ -1,9 +1,9 @@
$FreeBSD$
--- configure.orig Fri May 4 19:11:43 2001
+++ configure Mon May 14 13:13:57 2001
@@ -6339,6 +6339,12 @@
--- configure.orig Wed Jun 13 19:39:30 2001
+++ configure Wed Aug 1 19:33:18 2001
@@ -10018,6 +10018,12 @@
linux*)
G_MODULE_LDFLAGS='-rdynamic'
;;
@ -16,42 +16,50 @@ $FreeBSD$
esac
LIBS_orig="$LIBS"
LDFLAGS_orig="$LDFLAGS"
@@ -6805,7 +6811,7 @@
@@ -10488,8 +10494,8 @@
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
fi
;;
- *-freebsd2.2*)
- G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE"
+ *-freebsd*)
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE"
+ G_THREAD_CFLAGS="$G_THREAD_CFLAGS $PTHREAD_CFLAGS"
# FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
@@ -6891,8 +6897,8 @@
# -mthreads flag.
@@ -10569,13 +10575,13 @@
fi
;;
*)
- for thread_lib in "" pthread pthread32 pthreads c_r thread dce; do
+ for thread_lib in "$PTHREAD_LIBS" "" pthread pthread32 pthreads c_r thread dce; do
if test x"$thread_lib" = x; then
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"
+ add_thread_lib="$thread_lib"
+ IN=" in $thread_lib"
fi
if test x"$have_threads" = xposix; then
defattr=0
@@ -7431,6 +7437,7 @@
@@ -11114,6 +11120,7 @@
if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
+# LIBS="-lgiconv $LIBS"
cat > conftest.$ac_ext <<EOF
#line 7436 "configure"
#line 11119 "configure"
#include "confdefs.h"
@@ -7798,14 +7805,14 @@
@@ -11481,14 +11488,14 @@
#
# Check for libiconv
#
- echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
-echo "configure:7803: checking for libiconv_open in -liconv" >&5
-echo "configure:11486: checking for libiconv_open in -liconv" >&5
+ echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6
+echo "configure:7803: checking for libiconv_open in -lgiconv" >&5
+echo "configure:11486: checking for libiconv_open in -lgiconv" >&5
ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -60,9 +68,9 @@ $FreeBSD$
-LIBS="-liconv $LIBS"
+LIBS="-lgiconv $LIBS"
cat > conftest.$ac_ext <<EOF
#line 7811 "configure"
#line 11494 "configure"
#include "confdefs.h"
@@ -7845,7 +7852,7 @@
@@ -11528,7 +11535,7 @@
fi
if test "x$with_libiconv" = "xyes" ; then

12
devel/glib20/files/patch-ag
View File

@ -1,18 +1,18 @@
$FreeBSD$
--- Makefile.in.orig Tue Apr 17 22:49:12 2001
+++ Makefile.in Sun Apr 29 14:07:07 2001
@@ -133,7 +133,7 @@
--- Makefile.in.orig Wed Jul 18 15:45:33 2001
+++ Makefile.in Wed Jul 18 15:47:24 2001
@@ -136,7 +136,7 @@
AUTOMAKE_OPTIONS = 1.4
-SUBDIRS = . gobject gmodule gthread docs tests build
+SUBDIRS = . gobject gmodule gthread docs build
-SUBDIRS = . m4macros gobject gmodule gthread docs tests build
+SUBDIRS = . m4macros gobject gmodule gthread docs build
INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
@@ -157,7 +157,7 @@
@@ -160,7 +160,7 @@
glibinclude_HEADERS = galloca.h garray.h gasyncqueue.h gbacktrace.h gcache.h gcompletion.h gconvert.h gdataset.h gdate.h gerror.h gfileutils.h ghash.h ghook.h giochannel.h glib.h glib-object.h glist.h gmacros.h gmain.h gmarkup.h gmem.h gmessages.h gnode.h gpattern.h gprimes.h gqsort.h gquark.h gqueue.h grand.h grel.h gscanner.h gshell.h gslist.h gspawn.h gstrfuncs.h gstring.h gthread.h gthreadpool.h gtimer.h gtree.h gtypes.h gunicode.h gutils.h gwin32.h

494
devel/glib20/files/patch-gobject::Makefile.in
View File

@ -1,494 +0,0 @@
$FreeBSD$
Note: Don't be fooled by the size of this patch - basically it is
a result of changing 2 lines in gobject/Makefile.am. glib-mkenums
is a script, but it has been erroneously added into bin_PROGRAMS
which was breaking the make install.
--- gobject/Makefile.in 2001/05/14 10:30:17 1.1
+++ gobject/Makefile.in 2001/05/14 10:31:02
@@ -211,12 +211,13 @@
#
# programs to compile and install
#
-bin_PROGRAMS = gobject-query glib-genmarshal glib-mkenums
+bin_PROGRAMS = gobject-query glib-genmarshal
+bin_SCRIPTS = glib-mkenums
noinst_PROGRAMS = testgruntime
# source files
gobject_query_SOURCES = gobject-query.c
glib_genmarshal_SOURCES = glib-genmarshal.c
-glib_mkenums_SOURCES = glib-mkenums
+#glib_mkenums_SOURCES = glib-mkenums
testgruntime_SOURCES = testgruntime.c
# link programs against libgobject
progs_LDADD = libgobject-1.3.la $(libglib)
@@ -247,8 +248,7 @@
genums.lo gobject.lo gparam.lo gparamspecs.lo gsignal.lo gtype.lo \
gtypemodule.lo gtypeplugin.lo gvalue.lo gvaluearray.lo \
gvaluetransform.lo gvaluetypes.lo
-bin_PROGRAMS = gobject-query$(EXEEXT) glib-genmarshal$(EXEEXT) \
-glib-mkenums$(EXEEXT)
+bin_PROGRAMS = gobject-query$(EXEEXT) glib-genmarshal$(EXEEXT)
noinst_PROGRAMS = testgruntime$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
@@ -259,14 +259,12 @@
glib_genmarshal_OBJECTS = glib-genmarshal.o
glib_genmarshal_DEPENDENCIES = $(top_builddir)/libglib-1.3.la
glib_genmarshal_LDFLAGS =
-glib_mkenums_OBJECTS =
-glib_mkenums_LDADD = $(LDADD)
-glib_mkenums_DEPENDENCIES =
-glib_mkenums_LDFLAGS =
testgruntime_OBJECTS = testgruntime.o
testgruntime_DEPENDENCIES = libgobject-1.3.la \
$(top_builddir)/libglib-1.3.la
testgruntime_LDFLAGS =
+SCRIPTS = $(bin_SCRIPTS)
+
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -283,18 +281,24 @@
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-TAR = gtar
+TAR = tar
GZIP_ENV = --best
-SOURCES = $(libgobject_1_3_la_SOURCES) $(gobject_query_SOURCES) $(glib_genmarshal_SOURCES) $(glib_mkenums_SOURCES) $(testgruntime_SOURCES)
-OBJECTS = $(libgobject_1_3_la_OBJECTS) $(gobject_query_OBJECTS) $(glib_genmarshal_OBJECTS) $(glib_mkenums_OBJECTS) $(testgruntime_OBJECTS)
+DEP_FILES = .deps/gboxed.P .deps/gbsearcharray.P .deps/gclosure.P \
+.deps/genums.P .deps/glib-genmarshal.P .deps/gobject-query.P \
+.deps/gobject.P .deps/gparam.P .deps/gparamspecs.P .deps/gsignal.P \
+.deps/gtype.P .deps/gtypemodule.P .deps/gtypeplugin.P .deps/gvalue.P \
+.deps/gvaluearray.P .deps/gvaluetransform.P .deps/gvaluetypes.P \
+.deps/testgruntime.P
+SOURCES = $(libgobject_1_3_la_SOURCES) $(gobject_query_SOURCES) $(glib_genmarshal_SOURCES) $(testgruntime_SOURCES)
+OBJECTS = $(libgobject_1_3_la_OBJECTS) $(gobject_query_OBJECTS) $(glib_genmarshal_OBJECTS) $(testgruntime_OBJECTS)
all: all-redirect
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .s
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps gobject/Makefile
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu gobject/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -324,9 +328,6 @@
$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
done
-.c.o:
- $(COMPILE) -c $<
-
.s.o:
$(COMPILE) -c $<
@@ -343,9 +344,6 @@
maintainer-clean-compile:
-.c.lo:
- $(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
.s.lo:
$(LIBTOOL) --mode=compile $(COMPILE) -c $<
@@ -407,14 +405,29 @@
@rm -f glib-genmarshal$(EXEEXT)
$(LINK) $(glib_genmarshal_LDFLAGS) $(glib_genmarshal_OBJECTS) $(glib_genmarshal_LDADD) $(LIBS)
-glib-mkenums$(EXEEXT): $(glib_mkenums_OBJECTS) $(glib_mkenums_DEPENDENCIES)
- @rm -f glib-mkenums$(EXEEXT)
- $(LINK) $(glib_mkenums_LDFLAGS) $(glib_mkenums_OBJECTS) $(glib_mkenums_LDADD) $(LIBS)
-
testgruntime$(EXEEXT): $(testgruntime_OBJECTS) $(testgruntime_DEPENDENCIES)
@rm -f testgruntime$(EXEEXT)
$(LINK) $(testgruntime_LDFLAGS) $(testgruntime_OBJECTS) $(testgruntime_LDADD) $(LIBS)
+install-binSCRIPTS: $(bin_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
+ @list='$(bin_SCRIPTS)'; for p in $$list; do \
+ if test -f $$p; then \
+ echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
+ $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+ else if test -f $(srcdir)/$$p; then \
+ echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
+ $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+ else :; fi; fi; \
+ done
+
+uninstall-binSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ list='$(bin_SCRIPTS)'; for p in $$list; do \
+ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+ done
+
install-man1:
$(mkinstalldirs) $(DESTDIR)$(man1dir)
@list='$(man1_MANS)'; \
@@ -503,6 +516,11 @@
subdir = gobject
distdir: $(DISTFILES)
+ here=`cd $(top_builddir) && pwd`; \
+ top_distdir=`cd $(top_distdir) && pwd`; \
+ distdir=`cd $(distdir) && pwd`; \
+ cd $(top_srcdir) \
+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu gobject/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
@@ -514,223 +532,38 @@
fi; \
done
$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
-gboxed.lo gboxed.o : gboxed.c gboxed.h gtype.h ../glib.h ../galloca.h \
- ../gtypes.h ../glibconfig.h ../gmacros.h ../garray.h \
- ../gasyncqueue.h ../gthread.h ../gerror.h ../gquark.h \
- ../gbacktrace.h ../gcache.h ../glist.h ../gmem.h \
- ../gcompletion.h ../gconvert.h ../gdataset.h ../gdate.h \
- ../gfileutils.h ../ghash.h ../ghook.h ../giochannel.h \
- ../gmain.h ../gslist.h ../gmarkup.h ../gmessages.h ../gnode.h \
- ../gpattern.h ../gprimes.h ../gqsort.h ../gqueue.h ../grand.h \
- ../grel.h ../gscanner.h ../gshell.h ../gspawn.h ../gstrfuncs.h \
- ../gstring.h ../gthreadpool.h ../gtimer.h ../gtree.h \
- ../gunicode.h ../gutils.h gbsearcharray.h gvalue.h \
- gvaluearray.h gvalue.h gclosure.h gvaluecollector.h
-gbsearcharray.lo gbsearcharray.o : gbsearcharray.c gbsearcharray.h \
- gtype.h ../glib.h ../galloca.h ../gtypes.h ../glibconfig.h \
- ../gmacros.h ../garray.h ../gasyncqueue.h ../gthread.h \
- ../gerror.h ../gquark.h ../gbacktrace.h ../gcache.h ../glist.h \
- ../gmem.h ../gcompletion.h ../gconvert.h ../gdataset.h \
- ../gdate.h ../gfileutils.h ../ghash.h ../ghook.h \
- ../giochannel.h ../gmain.h ../gslist.h ../gmarkup.h \
- ../gmessages.h ../gnode.h ../gpattern.h ../gprimes.h \
- ../gqsort.h ../gqueue.h ../grand.h ../grel.h ../gscanner.h \
- ../gshell.h ../gspawn.h ../gstrfuncs.h ../gstring.h \
- ../gthreadpool.h ../gtimer.h ../gtree.h ../gunicode.h \
- ../gutils.h
-gclosure.lo gclosure.o : gclosure.c gclosure.h gtype.h ../glib.h \
- ../galloca.h ../gtypes.h ../glibconfig.h ../gmacros.h \
- ../garray.h ../gasyncqueue.h ../gthread.h ../gerror.h \
- ../gquark.h ../gbacktrace.h ../gcache.h ../glist.h ../gmem.h \
- ../gcompletion.h ../gconvert.h ../gdataset.h ../gdate.h \
- ../gfileutils.h ../ghash.h ../ghook.h ../giochannel.h \
- ../gmain.h ../gslist.h ../gmarkup.h ../gmessages.h ../gnode.h \
- ../gpattern.h ../gprimes.h ../gqsort.h ../gqueue.h ../grand.h \
- ../grel.h ../gscanner.h ../gshell.h ../gspawn.h ../gstrfuncs.h \
- ../gstring.h ../gthreadpool.h ../gtimer.h ../gtree.h \
- ../gunicode.h ../gutils.h gvalue.h
-genums.lo genums.o : genums.c genums.h gtype.h ../glib.h ../galloca.h \
- ../gtypes.h ../glibconfig.h ../gmacros.h ../garray.h \
- ../gasyncqueue.h ../gthread.h ../gerror.h ../gquark.h \
- ../gbacktrace.h ../gcache.h ../glist.h ../gmem.h \
- ../gcompletion.h ../gconvert.h ../gdataset.h ../gdate.h \
- ../gfileutils.h ../ghash.h ../ghook.h ../giochannel.h \
- ../gmain.h ../gslist.h ../gmarkup.h ../gmessages.h ../gnode.h \
- ../gpattern.h ../gprimes.h ../gqsort.h ../gqueue.h ../grand.h \
- ../grel.h ../gscanner.h ../gshell.h ../gspawn.h ../gstrfuncs.h \
- ../gstring.h ../gthreadpool.h ../gtimer.h ../gtree.h \
- ../gunicode.h ../gutils.h gvalue.h gvaluecollector.h
-glib-genmarshal.o: glib-genmarshal.c ../config.h ../glib.h ../galloca.h \
- ../gtypes.h ../glibconfig.h ../gmacros.h ../garray.h \
- ../gasyncqueue.h ../gthread.h ../gerror.h ../gquark.h \
- ../gbacktrace.h ../gcache.h ../glist.h ../gmem.h \
- ../gcompletion.h ../gconvert.h ../gdataset.h ../gdate.h \
- ../gfileutils.h ../ghash.h ../ghook.h ../giochannel.h \
- ../gmain.h ../gslist.h ../gmarkup.h ../gmessages.h ../gnode.h \
- ../gpattern.h ../gprimes.h ../gqsort.h ../gqueue.h ../grand.h \
- ../grel.h ../gscanner.h ../gshell.h ../gspawn.h ../gstrfuncs.h \
- ../gstring.h ../gthreadpool.h ../gtimer.h ../gtree.h \
- ../gunicode.h ../gutils.h gmarshal.strings
-gobject-query.o: gobject-query.c ../config.h ../glib-object.h gboxed.h \
- gtype.h ../glib.h ../galloca.h ../gtypes.h ../glibconfig.h \
- ../gmacros.h ../garray.h ../gasyncqueue.h ../gthread.h \
- ../gerror.h ../gquark.h ../gbacktrace.h ../gcache.h ../glist.h \
- ../gmem.h ../gcompletion.h ../gconvert.h ../gdataset.h \
- ../gdate.h ../gfileutils.h ../ghash.h ../ghook.h \
- ../giochannel.h ../gmain.h ../gslist.h ../gmarkup.h \
- ../gmessages.h ../gnode.h ../gpattern.h ../gprimes.h \
- ../gqsort.h ../gqueue.h ../grand.h ../grel.h ../gscanner.h \
- ../gshell.h ../gspawn.h ../gstrfuncs.h ../gstring.h \
- ../gthreadpool.h ../gtimer.h ../gtree.h ../gunicode.h \
- ../gutils.h gbsearcharray.h genums.h gobject.h gvalue.h \
- gparam.h gclosure.h gparamspecs.h gsignal.h gmarshal.h \
- gtypemodule.h gtypeplugin.h gvaluearray.h gvaluetypes.h
-gobject.lo gobject.o : gobject.c gobject.h gtype.h ../glib.h \
- ../galloca.h ../gtypes.h ../glibconfig.h ../gmacros.h \
- ../garray.h ../gasyncqueue.h ../gthread.h ../gerror.h \
- ../gquark.h ../gbacktrace.h ../gcache.h ../glist.h ../gmem.h \
- ../gcompletion.h ../gconvert.h ../gdataset.h ../gdate.h \
- ../gfileutils.h ../ghash.h ../ghook.h ../giochannel.h \
- ../gmain.h ../gslist.h ../gmarkup.h ../gmessages.h ../gnode.h \
- ../gpattern.h ../gprimes.h ../gqsort.h ../gqueue.h ../grand.h \
- ../grel.h ../gscanner.h ../gshell.h ../gspawn.h ../gstrfuncs.h \
- ../gstring.h ../gthreadpool.h ../gtimer.h ../gtree.h \
- ../gunicode.h ../gutils.h gvalue.h gparam.h gclosure.h \
- gvaluecollector.h gsignal.h gmarshal.h gparamspecs.h genums.h \
- gboxed.h gobject.h gvaluetypes.h
-gparam.lo gparam.o : gparam.c gparam.h gvalue.h gtype.h ../glib.h \
- ../galloca.h ../gtypes.h ../glibconfig.h ../gmacros.h \
- ../garray.h ../gasyncqueue.h ../gthread.h ../gerror.h \
- ../gquark.h ../gbacktrace.h ../gcache.h ../glist.h ../gmem.h \
- ../gcompletion.h ../gconvert.h ../gdataset.h ../gdate.h \
- ../gfileutils.h ../ghash.h ../ghook.h ../giochannel.h \
- ../gmain.h ../gslist.h ../gmarkup.h ../gmessages.h ../gnode.h \
- ../gpattern.h ../gprimes.h ../gqsort.h ../gqueue.h ../grand.h \
- ../grel.h ../gscanner.h ../gshell.h ../gspawn.h ../gstrfuncs.h \
- ../gstring.h ../gthreadpool.h ../gtimer.h ../gtree.h \
- ../gunicode.h ../gutils.h gvaluecollector.h
-gparamspecs.lo gparamspecs.o : gparamspecs.c gparamspecs.h gvalue.h \
- gtype.h ../glib.h ../galloca.h ../gtypes.h ../glibconfig.h \
- ../gmacros.h ../garray.h ../gasyncqueue.h ../gthread.h \
- ../gerror.h ../gquark.h ../gbacktrace.h ../gcache.h ../glist.h \
- ../gmem.h ../gcompletion.h ../gconvert.h ../gdataset.h \
- ../gdate.h ../gfileutils.h ../ghash.h ../ghook.h \
- ../giochannel.h ../gmain.h ../gslist.h ../gmarkup.h \
- ../gmessages.h ../gnode.h ../gpattern.h ../gprimes.h \
- ../gqsort.h ../gqueue.h ../grand.h ../grel.h ../gscanner.h \
- ../gshell.h ../gspawn.h ../gstrfuncs.h ../gstring.h \
- ../gthreadpool.h ../gtimer.h ../gtree.h ../gunicode.h \
- ../gutils.h genums.h gboxed.h gobject.h gparam.h gclosure.h \
- gvaluecollector.h gvaluearray.h ../config.h
-gsignal.lo gsignal.o : gsignal.c gsignal.h gclosure.h gtype.h ../glib.h \
- ../galloca.h ../gtypes.h ../glibconfig.h ../gmacros.h \
- ../garray.h ../gasyncqueue.h ../gthread.h ../gerror.h \
- ../gquark.h ../gbacktrace.h ../gcache.h ../glist.h ../gmem.h \
- ../gcompletion.h ../gconvert.h ../gdataset.h ../gdate.h \
- ../gfileutils.h ../ghash.h ../ghook.h ../giochannel.h \
- ../gmain.h ../gslist.h ../gmarkup.h ../gmessages.h ../gnode.h \
- ../gpattern.h ../gprimes.h ../gqsort.h ../gqueue.h ../grand.h \
- ../grel.h ../gscanner.h ../gshell.h ../gspawn.h ../gstrfuncs.h \
- ../gstring.h ../gthreadpool.h ../gtimer.h ../gtree.h \
- ../gunicode.h ../gutils.h gvalue.h gparam.h gmarshal.h \
- gbsearcharray.h gvaluecollector.h gvaluetypes.h gboxed.h \
- gobject.h genums.h gmarshal.c
-gtype.lo gtype.o : gtype.c gtype.h ../glib.h ../galloca.h ../gtypes.h \
- ../glibconfig.h ../gmacros.h ../garray.h ../gasyncqueue.h \
- ../gthread.h ../gerror.h ../gquark.h ../gbacktrace.h \
- ../gcache.h ../glist.h ../gmem.h ../gcompletion.h ../gconvert.h \
- ../gdataset.h ../gdate.h ../gfileutils.h ../ghash.h ../ghook.h \
- ../giochannel.h ../gmain.h ../gslist.h ../gmarkup.h \
- ../gmessages.h ../gnode.h ../gpattern.h ../gprimes.h \
- ../gqsort.h ../gqueue.h ../grand.h ../grel.h ../gscanner.h \
- ../gshell.h ../gspawn.h ../gstrfuncs.h ../gstring.h \
- ../gthreadpool.h ../gtimer.h ../gtree.h ../gunicode.h \
- ../gutils.h gtypeplugin.h gtype.h gvaluecollector.h
-gtypemodule.lo gtypemodule.o : gtypemodule.c gtypeplugin.h gtype.h \
- ../glib.h ../galloca.h ../gtypes.h ../glibconfig.h ../gmacros.h \
- ../garray.h ../gasyncqueue.h ../gthread.h ../gerror.h \
- ../gquark.h ../gbacktrace.h ../gcache.h ../glist.h ../gmem.h \
- ../gcompletion.h ../gconvert.h ../gdataset.h ../gdate.h \
- ../gfileutils.h ../ghash.h ../ghook.h ../giochannel.h \
- ../gmain.h ../gslist.h ../gmarkup.h ../gmessages.h ../gnode.h \
- ../gpattern.h ../gprimes.h ../gqsort.h ../gqueue.h ../grand.h \
- ../grel.h ../gscanner.h ../gshell.h ../gspawn.h ../gstrfuncs.h \
- ../gstring.h ../gthreadpool.h ../gtimer.h ../gtree.h \
- ../gunicode.h ../gutils.h gtypemodule.h gobject.h gvalue.h \
- gparam.h gclosure.h
-gtypeplugin.lo gtypeplugin.o : gtypeplugin.c gtypeplugin.h gtype.h \
- ../glib.h ../galloca.h ../gtypes.h ../glibconfig.h ../gmacros.h \
- ../garray.h ../gasyncqueue.h ../gthread.h ../gerror.h \
- ../gquark.h ../gbacktrace.h ../gcache.h ../glist.h ../gmem.h \
- ../gcompletion.h ../gconvert.h ../gdataset.h ../gdate.h \
- ../gfileutils.h ../ghash.h ../ghook.h ../giochannel.h \
- ../gmain.h ../gslist.h ../gmarkup.h ../gmessages.h ../gnode.h \
- ../gpattern.h ../gprimes.h ../gqsort.h ../gqueue.h ../grand.h \
- ../grel.h ../gscanner.h ../gshell.h ../gspawn.h ../gstrfuncs.h \
- ../gstring.h ../gthreadpool.h ../gtimer.h ../gtree.h \
- ../gunicode.h ../gutils.h
-gvalue.lo gvalue.o : gvalue.c gvalue.h gtype.h ../glib.h ../galloca.h \
- ../gtypes.h ../glibconfig.h ../gmacros.h ../garray.h \
- ../gasyncqueue.h ../gthread.h ../gerror.h ../gquark.h \
- ../gbacktrace.h ../gcache.h ../glist.h ../gmem.h \
- ../gcompletion.h ../gconvert.h ../gdataset.h ../gdate.h \
- ../gfileutils.h ../ghash.h ../ghook.h ../giochannel.h \
- ../gmain.h ../gslist.h ../gmarkup.h ../gmessages.h ../gnode.h \
- ../gpattern.h ../gprimes.h ../gqsort.h ../gqueue.h ../grand.h \
- ../grel.h ../gscanner.h ../gshell.h ../gspawn.h ../gstrfuncs.h \
- ../gstring.h ../gthreadpool.h ../gtimer.h ../gtree.h \
- ../gunicode.h ../gutils.h gvaluecollector.h gbsearcharray.h
-gvaluearray.lo gvaluearray.o : gvaluearray.c gvaluearray.h gvalue.h \
- gtype.h ../glib.h ../galloca.h ../gtypes.h ../glibconfig.h \
- ../gmacros.h ../garray.h ../gasyncqueue.h ../gthread.h \
- ../gerror.h ../gquark.h ../gbacktrace.h ../gcache.h ../glist.h \
- ../gmem.h ../gcompletion.h ../gconvert.h ../gdataset.h \
- ../gdate.h ../gfileutils.h ../ghash.h ../ghook.h \
- ../giochannel.h ../gmain.h ../gslist.h ../gmarkup.h \
- ../gmessages.h ../gnode.h ../gpattern.h ../gprimes.h \
- ../gqsort.h ../gqueue.h ../grand.h ../grel.h ../gscanner.h \
- ../gshell.h ../gspawn.h ../gstrfuncs.h ../gstring.h \
- ../gthreadpool.h ../gtimer.h ../gtree.h ../gunicode.h \
- ../gutils.h
-gvaluetransform.lo gvaluetransform.o : gvaluetransform.c gvalue.h \
- gtype.h ../glib.h ../galloca.h ../gtypes.h ../glibconfig.h \
- ../gmacros.h ../garray.h ../gasyncqueue.h ../gthread.h \
- ../gerror.h ../gquark.h ../gbacktrace.h ../gcache.h ../glist.h \
- ../gmem.h ../gcompletion.h ../gconvert.h ../gdataset.h \
- ../gdate.h ../gfileutils.h ../ghash.h ../ghook.h \
- ../giochannel.h ../gmain.h ../gslist.h ../gmarkup.h \
- ../gmessages.h ../gnode.h ../gpattern.h ../gprimes.h \
- ../gqsort.h ../gqueue.h ../grand.h ../grel.h ../gscanner.h \
- ../gshell.h ../gspawn.h ../gstrfuncs.h ../gstring.h \
- ../gthreadpool.h ../gtimer.h ../gtree.h ../gunicode.h \
- ../gutils.h genums.h
-gvaluetypes.lo gvaluetypes.o : gvaluetypes.c gvaluetypes.h gvalue.h \
- gtype.h ../glib.h ../galloca.h ../gtypes.h ../glibconfig.h \
- ../gmacros.h ../garray.h ../gasyncqueue.h ../gthread.h \
- ../gerror.h ../gquark.h ../gbacktrace.h ../gcache.h ../glist.h \
- ../gmem.h ../gcompletion.h ../gconvert.h ../gdataset.h \
- ../gdate.h ../gfileutils.h ../ghash.h ../ghook.h \
- ../giochannel.h ../gmain.h ../gslist.h ../gmarkup.h \
- ../gmessages.h ../gnode.h ../gpattern.h ../gprimes.h \
- ../gqsort.h ../gqueue.h ../grand.h ../grel.h ../gscanner.h \
- ../gshell.h ../gspawn.h ../gstrfuncs.h ../gstring.h \
- ../gthreadpool.h ../gtimer.h ../gtree.h ../gunicode.h \
- ../gutils.h gvaluecollector.h gobject.h gparam.h gclosure.h \
- gparam.h gboxed.h genums.h
-testgruntime.o: testgruntime.c ../glib-object.h gboxed.h gtype.h \
- ../glib.h ../galloca.h ../gtypes.h ../glibconfig.h ../gmacros.h \
- ../garray.h ../gasyncqueue.h ../gthread.h ../gerror.h \
- ../gquark.h ../gbacktrace.h ../gcache.h ../glist.h ../gmem.h \
- ../gcompletion.h ../gconvert.h ../gdataset.h ../gdate.h \
- ../gfileutils.h ../ghash.h ../ghook.h ../giochannel.h \
- ../gmain.h ../gslist.h ../gmarkup.h ../gmessages.h ../gnode.h \
- ../gpattern.h ../gprimes.h ../gqsort.h ../gqueue.h ../grand.h \
- ../grel.h ../gscanner.h ../gshell.h ../gspawn.h ../gstrfuncs.h \
- ../gstring.h ../gthreadpool.h ../gtimer.h ../gtree.h \
- ../gunicode.h ../gutils.h gbsearcharray.h genums.h gobject.h \
- gvalue.h gparam.h gclosure.h gparamspecs.h gsignal.h gmarshal.h \
- gtypemodule.h gtypeplugin.h gvaluearray.h gvaluetypes.h
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+ -rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+ @echo '$(COMPILE) -c $<'; \
+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
+ tr ' ' '\012' < .deps/$(*F).pp \
+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+ >> .deps/$(*F).P; \
+ rm .deps/$(*F).pp
+
+%.lo: %.c
+ @echo '$(LTCOMPILE) -c $<'; \
+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
+ < .deps/$(*F).pp > .deps/$(*F).P; \
+ tr ' ' '\012' < .deps/$(*F).pp \
+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+ >> .deps/$(*F).P; \
+ rm -f .deps/$(*F).pp
info-am:
info: info-am
dvi-am:
@@ -739,7 +572,8 @@
check: check-am
installcheck-am:
installcheck: installcheck-am
-install-exec-am: install-libLTLIBRARIES install-binPROGRAMS
+install-exec-am: install-libLTLIBRARIES install-binPROGRAMS \
+ install-binSCRIPTS
install-exec: install-exec-am
install-data-am: install-man install-libgobjectincludeHEADERS
@@ -749,15 +583,17 @@
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-am
uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \
- uninstall-man uninstall-libgobjectincludeHEADERS
+ uninstall-binSCRIPTS uninstall-man \
+ uninstall-libgobjectincludeHEADERS
uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) \
+ $(HEADERS)
all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
- $(DESTDIR)$(mandir)/man1 \
+ $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 \
$(DESTDIR)$(libgobjectincludedir)
@@ -775,20 +611,20 @@
mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \
mostlyclean-libtool mostlyclean-binPROGRAMS \
mostlyclean-noinstPROGRAMS mostlyclean-tags \
- mostlyclean-generic
+ mostlyclean-depend mostlyclean-generic
mostlyclean: mostlyclean-am
clean-am: clean-libLTLIBRARIES clean-compile clean-libtool \
clean-binPROGRAMS clean-noinstPROGRAMS clean-tags \
- clean-generic mostlyclean-am
+ clean-depend clean-generic mostlyclean-am
clean: clean-am
distclean-am: distclean-libLTLIBRARIES distclean-compile \
distclean-libtool distclean-binPROGRAMS \
distclean-noinstPROGRAMS distclean-tags \
- distclean-generic clean-am
+ distclean-depend distclean-generic clean-am
-rm -f libtool
distclean: distclean-am
@@ -797,7 +633,8 @@
maintainer-clean-compile maintainer-clean-libtool \
maintainer-clean-binPROGRAMS \
maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
- maintainer-clean-generic distclean-am
+ maintainer-clean-depend maintainer-clean-generic \
+ distclean-am
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
@@ -811,14 +648,16 @@
maintainer-clean-libtool mostlyclean-binPROGRAMS distclean-binPROGRAMS \
clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
install-binPROGRAMS mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
-clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS install-man1 \
-uninstall-man1 install-man uninstall-man \
-uninstall-libgobjectincludeHEADERS install-libgobjectincludeHEADERS \
-tags mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
-distdir info-am info dvi-am dvi check check-am installcheck-am \
-installcheck install-exec-am install-exec install-data-am install-data \
-install-am install uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
+clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
+uninstall-binSCRIPTS install-binSCRIPTS install-man1 uninstall-man1 \
+install-man uninstall-man uninstall-libgobjectincludeHEADERS \
+install-libgobjectincludeHEADERS tags mostlyclean-tags distclean-tags \
+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
+distclean-depend clean-depend maintainer-clean-depend info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean

18
devel/glib20/files/patch-ltmain.sh Normal file
View File

@ -0,0 +1,18 @@
$FreeBSD$
--- ltmain.sh 2001/07/18 13:00:49 1.1
+++ ltmain.sh 2001/07/18 13:01:07
@@ -4175,10 +4175,12 @@
fi
# Install the pseudo-library for information purposes.
+ if false; then
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
instname="$dir/$name"i
$show "$install_prog $instname $destdir/$name"
$run eval "$install_prog $instname $destdir/$name" || exit $?
+ fi
# Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

9
devel/glib20/pkg-plist
View File

@ -66,20 +66,21 @@ include/glib-2.0/gutils.h
include/glib-2.0/gwin32.h
lib/libglib-1.3.a
lib/libglib-1.3.so
lib/libglib-1.3.so.5
lib/libglib-1.3.so.6
lib/libgmodule-1.3.a
lib/libgmodule-1.3.so
lib/libgmodule-1.3.so.5
lib/libgmodule-1.3.so.6
lib/libgobject-1.3.a
lib/libgobject-1.3.so
lib/libgobject-1.3.so.5
lib/libgobject-1.3.so.6
lib/libgthread-1.3.a
lib/libgthread-1.3.so
lib/libgthread-1.3.so.5
lib/libgthread-1.3.so.6
libdata/pkgconfig/glib-2.0.pc
libdata/pkgconfig/gmodule-2.0.pc
libdata/pkgconfig/gobject-2.0.pc
libdata/pkgconfig/gthread-2.0.pc
share/aclocal/glib-2.0.m4
share/aclocal/glib-gettext.m4
@dirrm include/glib-2.0/gobject
@dirrm include/glib-2.0