Update to 1.3.5.

This commit is contained in:
Maxim Sobolev 2001-05-14 12:16:43 +00:00
parent d7471fc548
commit 2a1b697189
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=42585
28 changed files with 1181 additions and 123 deletions

View file

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

View file

@ -1 +1 @@
MD5 (glib-1.3.4.tar.gz) = 9d31a2283d135245e2f4c404ce662155 MD5 (glib-1.3.5.tar.gz) = c17bccaaf8fa482b4a26c4de681fa6c6

View file

@ -1,9 +1,9 @@
$FreeBSD$ $FreeBSD$
--- configure.orig Mon Apr 16 19:12:05 2001 --- configure.orig Fri May 4 19:11:43 2001
+++ configure Sun Apr 29 14:01:19 2001 +++ configure Mon May 14 13:13:57 2001
@@ -6287,6 +6287,12 @@ @@ -6339,6 +6339,12 @@
linux*) linux*)
G_MODULE_LDFLAGS='-rdynamic' G_MODULE_LDFLAGS='-rdynamic'
;; ;;
@ -16,7 +16,7 @@ $FreeBSD$
esac esac
LIBS_orig="$LIBS" LIBS_orig="$LIBS"
LDFLAGS_orig="$LDFLAGS" LDFLAGS_orig="$LDFLAGS"
@@ -6753,7 +6759,7 @@ @@ -6805,7 +6811,7 @@
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads" G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
fi fi
;; ;;
@ -25,7 +25,7 @@ $FreeBSD$
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE" G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE"
# FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support # FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
@@ -6840,8 +6846,8 @@ @@ -6891,8 +6897,8 @@
add_thread_lib="" add_thread_lib=""
IN="" IN=""
else else
@ -36,31 +36,22 @@ $FreeBSD$
fi fi
if test x"$have_threads" = xposix; then if test x"$have_threads" = xposix; then
defattr=0 defattr=0
@@ -7142,7 +7148,7 @@ @@ -7431,6 +7437,7 @@
sizeof (buffer));
; return 0; }
EOF
-if { (eval echo configure:7146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
rm -rf conftest*
ac_cv_func_nonposix_getpwuid_r=yes
else
@@ -7440,6 +7446,7 @@
if test "$cross_compiling" = yes; then if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else else
+# LIBS="-liconv $LIBS" +# LIBS="-lgiconv $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7445 "configure" #line 7436 "configure"
#include "confdefs.h" #include "confdefs.h"
@@ -7747,14 +7754,14 @@ @@ -7798,14 +7805,14 @@
# #
# Check for libiconv # Check for libiconv
# #
- echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6 - echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
-echo "configure:7752: checking for libiconv_open in -liconv" >&5 -echo "configure:7803: checking for libiconv_open in -liconv" >&5
+ echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6 + echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6
+echo "configure:7752: checking for libiconv_open in -lgiconv" >&5 +echo "configure:7803: checking for libiconv_open in -lgiconv" >&5
ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'` ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -69,9 +60,9 @@ $FreeBSD$
-LIBS="-liconv $LIBS" -LIBS="-liconv $LIBS"
+LIBS="-lgiconv $LIBS" +LIBS="-lgiconv $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7760 "configure" #line 7811 "configure"
#include "confdefs.h" #include "confdefs.h"
@@ -7794,7 +7801,7 @@ @@ -7845,7 +7852,7 @@
fi fi
if test "x$with_libiconv" = "xyes" ; then if test "x$with_libiconv" = "xyes" ; then

View file

@ -0,0 +1,494 @@
$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

View file

@ -1,7 +1,7 @@
bin/glib-config-2.0 bin/glib-config-2.0
bin/glib-genmarshal bin/glib-genmarshal
bin/glib-mkenums
bin/gobject-query bin/gobject-query
bin/testgruntime
include/glib-2.0/galloca.h include/glib-2.0/galloca.h
include/glib-2.0/garray.h include/glib-2.0/garray.h
include/glib-2.0/gasyncqueue.h include/glib-2.0/gasyncqueue.h
@ -66,16 +66,16 @@ include/glib-2.0/gutils.h
include/glib-2.0/gwin32.h include/glib-2.0/gwin32.h
lib/libglib-1.3.a lib/libglib-1.3.a
lib/libglib-1.3.so lib/libglib-1.3.so
lib/libglib-1.3.so.4 lib/libglib-1.3.so.5
lib/libgmodule-1.3.a lib/libgmodule-1.3.a
lib/libgmodule-1.3.so lib/libgmodule-1.3.so
lib/libgmodule-1.3.so.4 lib/libgmodule-1.3.so.5
lib/libgobject-1.3.a lib/libgobject-1.3.a
lib/libgobject-1.3.so lib/libgobject-1.3.so
lib/libgobject-1.3.so.4 lib/libgobject-1.3.so.5
lib/libgthread-1.3.a lib/libgthread-1.3.a
lib/libgthread-1.3.so lib/libgthread-1.3.so
lib/libgthread-1.3.so.4 lib/libgthread-1.3.so.5
libdata/pkgconfig/glib-2.0.pc libdata/pkgconfig/glib-2.0.pc
libdata/pkgconfig/gmodule-2.0.pc libdata/pkgconfig/gmodule-2.0.pc
libdata/pkgconfig/gobject-2.0.pc libdata/pkgconfig/gobject-2.0.pc

View file

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

View file

@ -1 +1 @@
MD5 (glib-1.3.4.tar.gz) = 9d31a2283d135245e2f4c404ce662155 MD5 (glib-1.3.5.tar.gz) = c17bccaaf8fa482b4a26c4de681fa6c6

View file

@ -1,9 +1,9 @@
$FreeBSD$ $FreeBSD$
--- configure.orig Mon Apr 16 19:12:05 2001 --- configure.orig Fri May 4 19:11:43 2001
+++ configure Sun Apr 29 14:01:19 2001 +++ configure Mon May 14 13:13:57 2001
@@ -6287,6 +6287,12 @@ @@ -6339,6 +6339,12 @@
linux*) linux*)
G_MODULE_LDFLAGS='-rdynamic' G_MODULE_LDFLAGS='-rdynamic'
;; ;;
@ -16,7 +16,7 @@ $FreeBSD$
esac esac
LIBS_orig="$LIBS" LIBS_orig="$LIBS"
LDFLAGS_orig="$LDFLAGS" LDFLAGS_orig="$LDFLAGS"
@@ -6753,7 +6759,7 @@ @@ -6805,7 +6811,7 @@
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads" G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
fi fi
;; ;;
@ -25,7 +25,7 @@ $FreeBSD$
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE" G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE"
# FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support # FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
@@ -6840,8 +6846,8 @@ @@ -6891,8 +6897,8 @@
add_thread_lib="" add_thread_lib=""
IN="" IN=""
else else
@ -36,31 +36,22 @@ $FreeBSD$
fi fi
if test x"$have_threads" = xposix; then if test x"$have_threads" = xposix; then
defattr=0 defattr=0
@@ -7142,7 +7148,7 @@ @@ -7431,6 +7437,7 @@
sizeof (buffer));
; return 0; }
EOF
-if { (eval echo configure:7146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
rm -rf conftest*
ac_cv_func_nonposix_getpwuid_r=yes
else
@@ -7440,6 +7446,7 @@
if test "$cross_compiling" = yes; then if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else else
+# LIBS="-liconv $LIBS" +# LIBS="-lgiconv $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7445 "configure" #line 7436 "configure"
#include "confdefs.h" #include "confdefs.h"
@@ -7747,14 +7754,14 @@ @@ -7798,14 +7805,14 @@
# #
# Check for libiconv # Check for libiconv
# #
- echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6 - echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
-echo "configure:7752: checking for libiconv_open in -liconv" >&5 -echo "configure:7803: checking for libiconv_open in -liconv" >&5
+ echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6 + echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6
+echo "configure:7752: checking for libiconv_open in -lgiconv" >&5 +echo "configure:7803: checking for libiconv_open in -lgiconv" >&5
ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'` ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -69,9 +60,9 @@ $FreeBSD$
-LIBS="-liconv $LIBS" -LIBS="-liconv $LIBS"
+LIBS="-lgiconv $LIBS" +LIBS="-lgiconv $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7760 "configure" #line 7811 "configure"
#include "confdefs.h" #include "confdefs.h"
@@ -7794,7 +7801,7 @@ @@ -7845,7 +7852,7 @@
fi fi
if test "x$with_libiconv" = "xyes" ; then if test "x$with_libiconv" = "xyes" ; then

View file

@ -0,0 +1,494 @@
$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

View file

@ -1,7 +1,7 @@
bin/glib-config-2.0 bin/glib-config-2.0
bin/glib-genmarshal bin/glib-genmarshal
bin/glib-mkenums
bin/gobject-query bin/gobject-query
bin/testgruntime
include/glib-2.0/galloca.h include/glib-2.0/galloca.h
include/glib-2.0/garray.h include/glib-2.0/garray.h
include/glib-2.0/gasyncqueue.h include/glib-2.0/gasyncqueue.h
@ -66,16 +66,16 @@ include/glib-2.0/gutils.h
include/glib-2.0/gwin32.h include/glib-2.0/gwin32.h
lib/libglib-1.3.a lib/libglib-1.3.a
lib/libglib-1.3.so lib/libglib-1.3.so
lib/libglib-1.3.so.4 lib/libglib-1.3.so.5
lib/libgmodule-1.3.a lib/libgmodule-1.3.a
lib/libgmodule-1.3.so lib/libgmodule-1.3.so
lib/libgmodule-1.3.so.4 lib/libgmodule-1.3.so.5
lib/libgobject-1.3.a lib/libgobject-1.3.a
lib/libgobject-1.3.so lib/libgobject-1.3.so
lib/libgobject-1.3.so.4 lib/libgobject-1.3.so.5
lib/libgthread-1.3.a lib/libgthread-1.3.a
lib/libgthread-1.3.so lib/libgthread-1.3.so
lib/libgthread-1.3.so.4 lib/libgthread-1.3.so.5
libdata/pkgconfig/glib-2.0.pc libdata/pkgconfig/glib-2.0.pc
libdata/pkgconfig/gmodule-2.0.pc libdata/pkgconfig/gmodule-2.0.pc
libdata/pkgconfig/gobject-2.0.pc libdata/pkgconfig/gobject-2.0.pc

View file

@ -6,7 +6,7 @@
# #
PORTNAME= gtk PORTNAME= gtk
PORTVERSION= 1.3.4 PORTVERSION= 1.3.5
CATEGORIES= x11-toolkits CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
@ -19,7 +19,8 @@ DISTNAME= gtk+-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
LIB_DEPENDS= glib-1.3.4:${PORTSDIR}/devel/glib13 \ LIB_DEPENDS= glib-1.3.5:${PORTSDIR}/devel/glib13 \
atk.0:${PORTSDIR}/devel/atk \
pango.0:${PORTSDIR}/x11-toolkits/pango \ pango.0:${PORTSDIR}/x11-toolkits/pango \
png.4:${PORTSDIR}/graphics/png \ png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \ tiff.4:${PORTSDIR}/graphics/tiff \

View file

@ -1 +1 @@
MD5 (gtk+-1.3.4.tar.gz) = 95d17ee35ce43c1109296189d2546c52 MD5 (gtk+-1.3.5.tar.gz) = 17a6f0453cfd79e5b99bcbc4ebbb45df

View file

@ -1,11 +1,23 @@
--- gtk/gtkrc.c.orig Fri Jul 14 23:18:03 2000
+++ gtk/gtkrc.c Tue Jul 18 13:41:40 2000 $FreeBSD$
@@ -392,7 +392,7 @@
--- gtk/gtkrc.c.orig Sun Apr 29 00:15:37 2001
+++ gtk/gtkrc.c Mon May 14 14:49:02 2001
@@ -333,7 +333,7 @@
result = g_strdup (im_module_file);
else
#ifndef G_OS_WIN32
- result = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtk.immodules");
+ result = g_strdup (GTK_DATA_PREFIX G_DIR_SEPARATOR_S "etc" G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtk.immodules");
#else
result = g_strdup_printf ("%s\\gtk.immodules", g_win32_get_package_installation_directory (GETTEXT_PACKAGE, get_gtk_dll_name ()));
#endif
@@ -439,7 +439,7 @@
else else
{ {
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
- str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtkrc"); - str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtkrc");
+ str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtkrc"); + str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtkrc");
#else #else
str = g_strdup_printf ("%s\\gtkrc", get_gtk_sysconf_directory ()); str = g_strdup_printf ("%s\\gtkrc", g_win32_get_package_installation_directory (GETTEXT_PACKAGE, get_gtk_dll_name ()));
#endif #endif

View file

@ -1,14 +1,14 @@
$FreeBSD$ $FreeBSD$
--- gtk/Makefile.in.orig Sun Apr 29 14:57:36 2001 --- gtk/Makefile.in.orig Mon May 14 13:48:47 2001
+++ gtk/Makefile.in Sun Apr 29 14:59:46 2001 +++ gtk/Makefile.in Mon May 14 13:50:45 2001
@@ -166,7 +166,7 @@ @@ -158,7 +158,7 @@
SUBDIRS = stock-icons SUBDIRS = stock-icons
-INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @PANGO_CFLAGS@ @GLIB_CFLAGS@ @more_cflags@ @STRIP_END@ -INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEP_CFLAGS@ @STRIP_END@
+INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @PANGO_CFLAGS@ @GLIB_CFLAGS@ @more_cflags@ @STRIP_END@ +INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEP_CFLAGS@ @STRIP_END@
gtarget = @gdktarget@ gtarget = @gdktarget@

View file

@ -1,18 +1,18 @@
$FreeBSD$ $FreeBSD$
--- docs/Makefile.in.orig Sun Apr 29 15:00:49 2001 --- docs/Makefile.in.orig Mon May 14 13:52:10 2001
+++ docs/Makefile.in Sun Apr 29 15:01:48 2001 +++ docs/Makefile.in Mon May 14 13:52:40 2001
@@ -124,7 +124,7 @@ @@ -130,7 +130,7 @@
LT_RELEASE = @LT_RELEASE@ LT_RELEASE = @LT_RELEASE@
LT_REVISION = @LT_REVISION@ LT_REVISION = @LT_REVISION@
MAINT = @MAINT@ MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@ -MAKEINFO = @MAKEINFO@
+MAKEINFO = @MAKEINFO@ --no-split +MAKEINFO = @MAKEINFO@ --no-split
MATH_LIB = @MATH_LIB@
MKINSTALLDIRS = @MKINSTALLDIRS@ MKINSTALLDIRS = @MKINSTALLDIRS@
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
@@ -164,13 +164,13 @@ PACKAGE = @PACKAGE@
@@ -156,13 +156,13 @@
SUBDIRS = tutorial faq reference SUBDIRS = tutorial faq reference
@ -28,7 +28,7 @@ $FreeBSD$
man1dir = $(mandir)/man1 man1dir = $(mandir)/man1
MANS = $(man_MANS) MANS = $(man_MANS)
@@ -193,6 +193,9 @@ @@ -185,6 +185,9 @@
gtk-config.1: $(top_builddir)/config.status gtk-config.1.in gtk-config.1: $(top_builddir)/config.status gtk-config.1.in
cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

View file

@ -8,6 +8,7 @@ include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
include/gtk-2.0/gdk/gdk.h include/gtk-2.0/gdk/gdk.h
include/gtk-2.0/gtk/gtkaccessible.h
include/gtk-2.0/gdk/gdkcolor.h include/gtk-2.0/gdk/gdkcolor.h
include/gtk-2.0/gdk/gdkcompat.h include/gtk-2.0/gdk/gdkcompat.h
include/gtk-2.0/gdk/gdkcursor.h include/gtk-2.0/gdk/gdkcursor.h
@ -204,27 +205,41 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so.1
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so
lib/libgdk-x11-1.3.a lib/libgdk-x11-1.3.a
lib/libgdk-x11-1.3.so lib/libgdk-x11-1.3.so
lib/libgdk-x11-1.3.so.4 lib/libgdk-x11-1.3.so.5
lib/libgdk_pixbuf-1.3.a lib/libgdk_pixbuf-1.3.a
lib/libgdk_pixbuf-1.3.so lib/libgdk_pixbuf-1.3.so
lib/libgdk_pixbuf-1.3.so.4 lib/libgdk_pixbuf-1.3.so.5
lib/libgdk_pixbuf_xlib-1.3.a lib/libgdk_pixbuf_xlib-1.3.a
lib/libgdk_pixbuf_xlib-1.3.so lib/libgdk_pixbuf_xlib-1.3.so
lib/libgdk_pixbuf_xlib-1.3.so.0 lib/libgdk_pixbuf_xlib-1.3.so.0
lib/libgtk-x11-1.3.a lib/libgtk-x11-1.3.a
lib/libgtk-x11-1.3.so lib/libgtk-x11-1.3.so
lib/libgtk-x11-1.3.so.4 lib/libgtk-x11-1.3.so.5
libdata/pkgconfig/gdk-2.0.pc libdata/pkgconfig/gdk-2.0.pc
libdata/pkgconfig/gdk-pixbuf-2.0.pc libdata/pkgconfig/gdk-pixbuf-2.0.pc
libdata/pkgconfig/gdk-x11-2.0.pc libdata/pkgconfig/gdk-x11-2.0.pc
libdata/pkgconfig/gtk+-2.0.pc libdata/pkgconfig/gtk+-2.0.pc
libdata/pkgconfig/gtk+-x11-2.0.pc libdata/pkgconfig/gtk+-x11-2.0.pc
share/aclocal/gtk-2.0.m4 share/aclocal/gtk-2.0.m4
share/gtk-2.0/demo/apple-red.png
share/gtk-2.0/demo/background.jpg
share/gtk-2.0/demo/button_box.c share/gtk-2.0/demo/button_box.c
share/gtk-2.0/demo/colorsel.c
share/gtk-2.0/demo/dialog.c share/gtk-2.0/demo/dialog.c
share/gtk-2.0/demo/drawingarea.c
share/gtk-2.0/demo/gnome-applets.png
share/gtk-2.0/demo/gnome-calendar.png
share/gtk-2.0/demo/gnome-foot.png
share/gtk-2.0/demo/gnome-gimp.png
share/gtk-2.0/demo/gnome-gmush.png
share/gtk-2.0/demo/gnome-gsame.png
share/gtk-2.0/demo/gnu-keys.png
share/gtk-2.0/demo/gtk-logo-rgb.gif
share/gtk-2.0/demo/images.c
share/gtk-2.0/demo/item_factory.c share/gtk-2.0/demo/item_factory.c
share/gtk-2.0/demo/menus.c share/gtk-2.0/demo/menus.c
share/gtk-2.0/demo/panes.c share/gtk-2.0/demo/panes.c
share/gtk-2.0/demo/pixbufs.c
share/gtk-2.0/demo/textview.c share/gtk-2.0/demo/textview.c
share/locale/az/LC_MESSAGES/gtk20.mo share/locale/az/LC_MESSAGES/gtk20.mo
share/locale/ca/LC_MESSAGES/gtk20.mo share/locale/ca/LC_MESSAGES/gtk20.mo

View file

@ -6,7 +6,7 @@
# #
PORTNAME= gtk PORTNAME= gtk
PORTVERSION= 1.3.4 PORTVERSION= 1.3.5
CATEGORIES= x11-toolkits CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
@ -19,7 +19,8 @@ DISTNAME= gtk+-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
LIB_DEPENDS= glib-1.3.4:${PORTSDIR}/devel/glib13 \ LIB_DEPENDS= glib-1.3.5:${PORTSDIR}/devel/glib13 \
atk.0:${PORTSDIR}/devel/atk \
pango.0:${PORTSDIR}/x11-toolkits/pango \ pango.0:${PORTSDIR}/x11-toolkits/pango \
png.4:${PORTSDIR}/graphics/png \ png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \ tiff.4:${PORTSDIR}/graphics/tiff \

View file

@ -1 +1 @@
MD5 (gtk+-1.3.4.tar.gz) = 95d17ee35ce43c1109296189d2546c52 MD5 (gtk+-1.3.5.tar.gz) = 17a6f0453cfd79e5b99bcbc4ebbb45df

View file

@ -1,11 +1,23 @@
--- gtk/gtkrc.c.orig Fri Jul 14 23:18:03 2000
+++ gtk/gtkrc.c Tue Jul 18 13:41:40 2000 $FreeBSD$
@@ -392,7 +392,7 @@
--- gtk/gtkrc.c.orig Sun Apr 29 00:15:37 2001
+++ gtk/gtkrc.c Mon May 14 14:49:02 2001
@@ -333,7 +333,7 @@
result = g_strdup (im_module_file);
else
#ifndef G_OS_WIN32
- result = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtk.immodules");
+ result = g_strdup (GTK_DATA_PREFIX G_DIR_SEPARATOR_S "etc" G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtk.immodules");
#else
result = g_strdup_printf ("%s\\gtk.immodules", g_win32_get_package_installation_directory (GETTEXT_PACKAGE, get_gtk_dll_name ()));
#endif
@@ -439,7 +439,7 @@
else else
{ {
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
- str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtkrc"); - str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtkrc");
+ str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtkrc"); + str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtkrc");
#else #else
str = g_strdup_printf ("%s\\gtkrc", get_gtk_sysconf_directory ()); str = g_strdup_printf ("%s\\gtkrc", g_win32_get_package_installation_directory (GETTEXT_PACKAGE, get_gtk_dll_name ()));
#endif #endif

View file

@ -1,14 +1,14 @@
$FreeBSD$ $FreeBSD$
--- gtk/Makefile.in.orig Sun Apr 29 14:57:36 2001 --- gtk/Makefile.in.orig Mon May 14 13:48:47 2001
+++ gtk/Makefile.in Sun Apr 29 14:59:46 2001 +++ gtk/Makefile.in Mon May 14 13:50:45 2001
@@ -166,7 +166,7 @@ @@ -158,7 +158,7 @@
SUBDIRS = stock-icons SUBDIRS = stock-icons
-INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @PANGO_CFLAGS@ @GLIB_CFLAGS@ @more_cflags@ @STRIP_END@ -INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEP_CFLAGS@ @STRIP_END@
+INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @PANGO_CFLAGS@ @GLIB_CFLAGS@ @more_cflags@ @STRIP_END@ +INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEP_CFLAGS@ @STRIP_END@
gtarget = @gdktarget@ gtarget = @gdktarget@

View file

@ -1,18 +1,18 @@
$FreeBSD$ $FreeBSD$
--- docs/Makefile.in.orig Sun Apr 29 15:00:49 2001 --- docs/Makefile.in.orig Mon May 14 13:52:10 2001
+++ docs/Makefile.in Sun Apr 29 15:01:48 2001 +++ docs/Makefile.in Mon May 14 13:52:40 2001
@@ -124,7 +124,7 @@ @@ -130,7 +130,7 @@
LT_RELEASE = @LT_RELEASE@ LT_RELEASE = @LT_RELEASE@
LT_REVISION = @LT_REVISION@ LT_REVISION = @LT_REVISION@
MAINT = @MAINT@ MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@ -MAKEINFO = @MAKEINFO@
+MAKEINFO = @MAKEINFO@ --no-split +MAKEINFO = @MAKEINFO@ --no-split
MATH_LIB = @MATH_LIB@
MKINSTALLDIRS = @MKINSTALLDIRS@ MKINSTALLDIRS = @MKINSTALLDIRS@
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
@@ -164,13 +164,13 @@ PACKAGE = @PACKAGE@
@@ -156,13 +156,13 @@
SUBDIRS = tutorial faq reference SUBDIRS = tutorial faq reference
@ -28,7 +28,7 @@ $FreeBSD$
man1dir = $(mandir)/man1 man1dir = $(mandir)/man1
MANS = $(man_MANS) MANS = $(man_MANS)
@@ -193,6 +193,9 @@ @@ -185,6 +185,9 @@
gtk-config.1: $(top_builddir)/config.status gtk-config.1.in gtk-config.1: $(top_builddir)/config.status gtk-config.1.in
cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

View file

@ -8,6 +8,7 @@ include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
include/gtk-2.0/gdk/gdk.h include/gtk-2.0/gdk/gdk.h
include/gtk-2.0/gtk/gtkaccessible.h
include/gtk-2.0/gdk/gdkcolor.h include/gtk-2.0/gdk/gdkcolor.h
include/gtk-2.0/gdk/gdkcompat.h include/gtk-2.0/gdk/gdkcompat.h
include/gtk-2.0/gdk/gdkcursor.h include/gtk-2.0/gdk/gdkcursor.h
@ -204,27 +205,41 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so.1
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so
lib/libgdk-x11-1.3.a lib/libgdk-x11-1.3.a
lib/libgdk-x11-1.3.so lib/libgdk-x11-1.3.so
lib/libgdk-x11-1.3.so.4 lib/libgdk-x11-1.3.so.5
lib/libgdk_pixbuf-1.3.a lib/libgdk_pixbuf-1.3.a
lib/libgdk_pixbuf-1.3.so lib/libgdk_pixbuf-1.3.so
lib/libgdk_pixbuf-1.3.so.4 lib/libgdk_pixbuf-1.3.so.5
lib/libgdk_pixbuf_xlib-1.3.a lib/libgdk_pixbuf_xlib-1.3.a
lib/libgdk_pixbuf_xlib-1.3.so lib/libgdk_pixbuf_xlib-1.3.so
lib/libgdk_pixbuf_xlib-1.3.so.0 lib/libgdk_pixbuf_xlib-1.3.so.0
lib/libgtk-x11-1.3.a lib/libgtk-x11-1.3.a
lib/libgtk-x11-1.3.so lib/libgtk-x11-1.3.so
lib/libgtk-x11-1.3.so.4 lib/libgtk-x11-1.3.so.5
libdata/pkgconfig/gdk-2.0.pc libdata/pkgconfig/gdk-2.0.pc
libdata/pkgconfig/gdk-pixbuf-2.0.pc libdata/pkgconfig/gdk-pixbuf-2.0.pc
libdata/pkgconfig/gdk-x11-2.0.pc libdata/pkgconfig/gdk-x11-2.0.pc
libdata/pkgconfig/gtk+-2.0.pc libdata/pkgconfig/gtk+-2.0.pc
libdata/pkgconfig/gtk+-x11-2.0.pc libdata/pkgconfig/gtk+-x11-2.0.pc
share/aclocal/gtk-2.0.m4 share/aclocal/gtk-2.0.m4
share/gtk-2.0/demo/apple-red.png
share/gtk-2.0/demo/background.jpg
share/gtk-2.0/demo/button_box.c share/gtk-2.0/demo/button_box.c
share/gtk-2.0/demo/colorsel.c
share/gtk-2.0/demo/dialog.c share/gtk-2.0/demo/dialog.c
share/gtk-2.0/demo/drawingarea.c
share/gtk-2.0/demo/gnome-applets.png
share/gtk-2.0/demo/gnome-calendar.png
share/gtk-2.0/demo/gnome-foot.png
share/gtk-2.0/demo/gnome-gimp.png
share/gtk-2.0/demo/gnome-gmush.png
share/gtk-2.0/demo/gnome-gsame.png
share/gtk-2.0/demo/gnu-keys.png
share/gtk-2.0/demo/gtk-logo-rgb.gif
share/gtk-2.0/demo/images.c
share/gtk-2.0/demo/item_factory.c share/gtk-2.0/demo/item_factory.c
share/gtk-2.0/demo/menus.c share/gtk-2.0/demo/menus.c
share/gtk-2.0/demo/panes.c share/gtk-2.0/demo/panes.c
share/gtk-2.0/demo/pixbufs.c
share/gtk-2.0/demo/textview.c share/gtk-2.0/demo/textview.c
share/locale/az/LC_MESSAGES/gtk20.mo share/locale/az/LC_MESSAGES/gtk20.mo
share/locale/ca/LC_MESSAGES/gtk20.mo share/locale/ca/LC_MESSAGES/gtk20.mo

View file

@ -6,7 +6,7 @@
# #
PORTNAME= gtk PORTNAME= gtk
PORTVERSION= 1.3.4 PORTVERSION= 1.3.5
CATEGORIES= x11-toolkits CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
@ -19,7 +19,8 @@ DISTNAME= gtk+-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
LIB_DEPENDS= glib-1.3.4:${PORTSDIR}/devel/glib13 \ LIB_DEPENDS= glib-1.3.5:${PORTSDIR}/devel/glib13 \
atk.0:${PORTSDIR}/devel/atk \
pango.0:${PORTSDIR}/x11-toolkits/pango \ pango.0:${PORTSDIR}/x11-toolkits/pango \
png.4:${PORTSDIR}/graphics/png \ png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \ tiff.4:${PORTSDIR}/graphics/tiff \

View file

@ -1 +1 @@
MD5 (gtk+-1.3.4.tar.gz) = 95d17ee35ce43c1109296189d2546c52 MD5 (gtk+-1.3.5.tar.gz) = 17a6f0453cfd79e5b99bcbc4ebbb45df

View file

@ -1,11 +1,23 @@
--- gtk/gtkrc.c.orig Fri Jul 14 23:18:03 2000
+++ gtk/gtkrc.c Tue Jul 18 13:41:40 2000 $FreeBSD$
@@ -392,7 +392,7 @@
--- gtk/gtkrc.c.orig Sun Apr 29 00:15:37 2001
+++ gtk/gtkrc.c Mon May 14 14:49:02 2001
@@ -333,7 +333,7 @@
result = g_strdup (im_module_file);
else
#ifndef G_OS_WIN32
- result = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtk.immodules");
+ result = g_strdup (GTK_DATA_PREFIX G_DIR_SEPARATOR_S "etc" G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtk.immodules");
#else
result = g_strdup_printf ("%s\\gtk.immodules", g_win32_get_package_installation_directory (GETTEXT_PACKAGE, get_gtk_dll_name ()));
#endif
@@ -439,7 +439,7 @@
else else
{ {
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
- str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtkrc"); - str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtkrc");
+ str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtkrc"); + str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtkrc");
#else #else
str = g_strdup_printf ("%s\\gtkrc", get_gtk_sysconf_directory ()); str = g_strdup_printf ("%s\\gtkrc", g_win32_get_package_installation_directory (GETTEXT_PACKAGE, get_gtk_dll_name ()));
#endif #endif

View file

@ -1,14 +1,14 @@
$FreeBSD$ $FreeBSD$
--- gtk/Makefile.in.orig Sun Apr 29 14:57:36 2001 --- gtk/Makefile.in.orig Mon May 14 13:48:47 2001
+++ gtk/Makefile.in Sun Apr 29 14:59:46 2001 +++ gtk/Makefile.in Mon May 14 13:50:45 2001
@@ -166,7 +166,7 @@ @@ -158,7 +158,7 @@
SUBDIRS = stock-icons SUBDIRS = stock-icons
-INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @PANGO_CFLAGS@ @GLIB_CFLAGS@ @more_cflags@ @STRIP_END@ -INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEP_CFLAGS@ @STRIP_END@
+INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @PANGO_CFLAGS@ @GLIB_CFLAGS@ @more_cflags@ @STRIP_END@ +INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEP_CFLAGS@ @STRIP_END@
gtarget = @gdktarget@ gtarget = @gdktarget@

View file

@ -1,18 +1,18 @@
$FreeBSD$ $FreeBSD$
--- docs/Makefile.in.orig Sun Apr 29 15:00:49 2001 --- docs/Makefile.in.orig Mon May 14 13:52:10 2001
+++ docs/Makefile.in Sun Apr 29 15:01:48 2001 +++ docs/Makefile.in Mon May 14 13:52:40 2001
@@ -124,7 +124,7 @@ @@ -130,7 +130,7 @@
LT_RELEASE = @LT_RELEASE@ LT_RELEASE = @LT_RELEASE@
LT_REVISION = @LT_REVISION@ LT_REVISION = @LT_REVISION@
MAINT = @MAINT@ MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@ -MAKEINFO = @MAKEINFO@
+MAKEINFO = @MAKEINFO@ --no-split +MAKEINFO = @MAKEINFO@ --no-split
MATH_LIB = @MATH_LIB@
MKINSTALLDIRS = @MKINSTALLDIRS@ MKINSTALLDIRS = @MKINSTALLDIRS@
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
@@ -164,13 +164,13 @@ PACKAGE = @PACKAGE@
@@ -156,13 +156,13 @@
SUBDIRS = tutorial faq reference SUBDIRS = tutorial faq reference
@ -28,7 +28,7 @@ $FreeBSD$
man1dir = $(mandir)/man1 man1dir = $(mandir)/man1
MANS = $(man_MANS) MANS = $(man_MANS)
@@ -193,6 +193,9 @@ @@ -185,6 +185,9 @@
gtk-config.1: $(top_builddir)/config.status gtk-config.1.in gtk-config.1: $(top_builddir)/config.status gtk-config.1.in
cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

View file

@ -8,6 +8,7 @@ include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
include/gtk-2.0/gdk/gdk.h include/gtk-2.0/gdk/gdk.h
include/gtk-2.0/gtk/gtkaccessible.h
include/gtk-2.0/gdk/gdkcolor.h include/gtk-2.0/gdk/gdkcolor.h
include/gtk-2.0/gdk/gdkcompat.h include/gtk-2.0/gdk/gdkcompat.h
include/gtk-2.0/gdk/gdkcursor.h include/gtk-2.0/gdk/gdkcursor.h
@ -204,27 +205,41 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so.1
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so
lib/libgdk-x11-1.3.a lib/libgdk-x11-1.3.a
lib/libgdk-x11-1.3.so lib/libgdk-x11-1.3.so
lib/libgdk-x11-1.3.so.4 lib/libgdk-x11-1.3.so.5
lib/libgdk_pixbuf-1.3.a lib/libgdk_pixbuf-1.3.a
lib/libgdk_pixbuf-1.3.so lib/libgdk_pixbuf-1.3.so
lib/libgdk_pixbuf-1.3.so.4 lib/libgdk_pixbuf-1.3.so.5
lib/libgdk_pixbuf_xlib-1.3.a lib/libgdk_pixbuf_xlib-1.3.a
lib/libgdk_pixbuf_xlib-1.3.so lib/libgdk_pixbuf_xlib-1.3.so
lib/libgdk_pixbuf_xlib-1.3.so.0 lib/libgdk_pixbuf_xlib-1.3.so.0
lib/libgtk-x11-1.3.a lib/libgtk-x11-1.3.a
lib/libgtk-x11-1.3.so lib/libgtk-x11-1.3.so
lib/libgtk-x11-1.3.so.4 lib/libgtk-x11-1.3.so.5
libdata/pkgconfig/gdk-2.0.pc libdata/pkgconfig/gdk-2.0.pc
libdata/pkgconfig/gdk-pixbuf-2.0.pc libdata/pkgconfig/gdk-pixbuf-2.0.pc
libdata/pkgconfig/gdk-x11-2.0.pc libdata/pkgconfig/gdk-x11-2.0.pc
libdata/pkgconfig/gtk+-2.0.pc libdata/pkgconfig/gtk+-2.0.pc
libdata/pkgconfig/gtk+-x11-2.0.pc libdata/pkgconfig/gtk+-x11-2.0.pc
share/aclocal/gtk-2.0.m4 share/aclocal/gtk-2.0.m4
share/gtk-2.0/demo/apple-red.png
share/gtk-2.0/demo/background.jpg
share/gtk-2.0/demo/button_box.c share/gtk-2.0/demo/button_box.c
share/gtk-2.0/demo/colorsel.c
share/gtk-2.0/demo/dialog.c share/gtk-2.0/demo/dialog.c
share/gtk-2.0/demo/drawingarea.c
share/gtk-2.0/demo/gnome-applets.png
share/gtk-2.0/demo/gnome-calendar.png
share/gtk-2.0/demo/gnome-foot.png
share/gtk-2.0/demo/gnome-gimp.png
share/gtk-2.0/demo/gnome-gmush.png
share/gtk-2.0/demo/gnome-gsame.png
share/gtk-2.0/demo/gnu-keys.png
share/gtk-2.0/demo/gtk-logo-rgb.gif
share/gtk-2.0/demo/images.c
share/gtk-2.0/demo/item_factory.c share/gtk-2.0/demo/item_factory.c
share/gtk-2.0/demo/menus.c share/gtk-2.0/demo/menus.c
share/gtk-2.0/demo/panes.c share/gtk-2.0/demo/panes.c
share/gtk-2.0/demo/pixbufs.c
share/gtk-2.0/demo/textview.c share/gtk-2.0/demo/textview.c
share/locale/az/LC_MESSAGES/gtk20.mo share/locale/az/LC_MESSAGES/gtk20.mo
share/locale/ca/LC_MESSAGES/gtk20.mo share/locale/ca/LC_MESSAGES/gtk20.mo