diff options
31 files changed, 709 insertions, 202 deletions
diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile index 56cd952..c995358 100644 --- a/devel/glib12/Makefile +++ b/devel/glib12/Makefile @@ -1,12 +1,12 @@ # New ports collection makefile for: glib11-devel -# Version required: 1.1.7 +# Version required: 1.1.9 # Date Created: 28 July 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.8 1998/12/11 08:39:47 asami Exp $ +# $Id: Makefile,v 1.9 1998/12/12 03:42:59 vanilla Exp $ # -DISTNAME= glib-1.1.7 +DISTNAME= glib-1.1.9 CATEGORIES= devel MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \ diff --git a/devel/glib12/distinfo b/devel/glib12/distinfo index 3cf1588..16b3bfd 100644 --- a/devel/glib12/distinfo +++ b/devel/glib12/distinfo @@ -1 +1 @@ -MD5 (glib-1.1.7.tar.gz) = 4ca0324332260bd9a06d1888854f5d27 +MD5 (glib-1.1.9.tar.gz) = a645722c4c32d091876851269da4bea1 diff --git a/devel/glib12/files/patch-ab b/devel/glib12/files/patch-ab index 021ca0a..0acb09a 100644 --- a/devel/glib12/files/patch-ab +++ b/devel/glib12/files/patch-ab @@ -1,11 +1,11 @@ ---- Makefile.in.orig Wed Dec 9 09:02:44 1998 -+++ Makefile.in Fri Dec 11 21:25:10 1998 -@@ -85,14 +85,12 @@ +--- Makefile.in.orig Thu Dec 17 13:11:36 1998 ++++ Makefile.in Sat Dec 26 22:58:19 1998 +@@ -87,14 +87,12 @@ RANLIB = @RANLIB@ VERSION = @VERSION@ --SUBDIRS = gmodule docs -+SUBDIRS = gmodule +-SUBDIRS = gmodule gthread docs ++SUBDIRS = gmodule gthread # alpha `automake' supports this better #SUBDIRS = . gmodule docs @@ -18,7 +18,7 @@ INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ -@@ -106,9 +104,9 @@ +@@ -108,9 +106,9 @@ makefile.msc \ glibconfig.h.win32 @@ -30,8 +30,8 @@ garray.c \ gcache.c \ gcompletion.c \ -@@ -135,27 +133,25 @@ - gutils.c +@@ -138,27 +136,25 @@ + gmutex.c include_HEADERS = \ - glib.h @@ -45,7 +45,7 @@ -libglib_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) +libglib11d_la_LDFLAGS = \ -+ -version-info 1:0:0 ++ -version-info 1:1:0 noinst_PROGRAMS = testglib testgdate testgdateparser -testglib_LDADD = libglib.la @@ -65,7 +65,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES) -@@ -163,8 +159,8 @@ +@@ -166,8 +162,8 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -75,8 +75,8 @@ +libglib11d_la_OBJECTS = garray.lo gcache.lo gcompletion.lo gdataset.lo \ gdate.lo gerror.lo ghash.lo ghook.lo glist.lo gmain.lo giochannel.lo \ giounix.lo gmem.lo gmessages.lo gnode.lo gprimes.lo gslist.lo gtimer.lo \ - gtree.lo grel.lo gstring.lo gstrfuncs.lo gscanner.lo gutils.lo -@@ -172,15 +168,15 @@ + gtree.lo grel.lo gstring.lo gstrfuncs.lo gscanner.lo gutils.lo \ +@@ -176,15 +172,15 @@ testglib_SOURCES = testglib.c testglib_OBJECTS = testglib.o @@ -95,7 +95,7 @@ testgdateparser_LDFLAGS = SCRIPTS = $(bin_SCRIPTS) -@@ -188,7 +184,7 @@ +@@ -192,7 +188,7 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ @@ -104,7 +104,7 @@ HEADERS = $(include_HEADERS) -@@ -202,8 +198,8 @@ +@@ -206,8 +202,8 @@ TAR = tar GZIP = --best @@ -115,7 +115,7 @@ all: all-recursive-am all-am -@@ -244,7 +240,10 @@ +@@ -248,7 +244,10 @@ -rm -f config.h maintainer-clean-hdr: @@ -127,7 +127,7 @@ cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status mostlyclean-libLTLIBRARIES: -@@ -310,8 +309,8 @@ +@@ -314,8 +313,8 @@ maintainer-clean-libtool: @@ -138,7 +138,7 @@ mostlyclean-noinstPROGRAMS: -@@ -353,44 +352,6 @@ +@@ -357,44 +356,6 @@ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ done @@ -183,7 +183,7 @@ install-includeHEADERS: $(include_HEADERS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(includedir) -@@ -530,13 +491,13 @@ +@@ -534,13 +495,13 @@ all-recursive-am: config.h $(MAKE) all-recursive @@ -200,7 +200,7 @@ install-exec: install-exec-recursive install-exec-am @$(NORMAL_INSTALL) -@@ -612,8 +573,7 @@ +@@ -616,8 +577,7 @@ maintainer-clean-libtool mostlyclean-noinstPROGRAMS \ distclean-noinstPROGRAMS clean-noinstPROGRAMS \ maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \ @@ -210,9 +210,9 @@ install-includeHEADERS install-data-recursive uninstall-data-recursive \ install-exec-recursive uninstall-exec-recursive installdirs-recursive \ uninstalldirs-recursive all-recursive check-recursive \ ---- gmodule/Makefile.in.orig Wed Dec 9 09:02:46 1998 -+++ gmodule/Makefile.in Fri Dec 11 21:07:16 1998 -@@ -99,30 +99,29 @@ +--- gmodule/Makefile.in.orig Thu Dec 17 13:11:37 1998 ++++ gmodule/Makefile.in Sat Dec 26 22:51:58 1998 +@@ -101,30 +101,29 @@ include_HEADERS = \ gmodule.h @@ -229,7 +229,7 @@ @G_MODULE_LDFLAGS@ \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) -+ -version-info 1:0:0 ++ -version-info 1:1:0 -libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) +libgmodule11d_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) @@ -257,7 +257,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = gmoduleconf.h -@@ -133,17 +132,17 @@ +@@ -135,17 +134,17 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -282,7 +282,7 @@ testgmodule_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -@@ -159,10 +158,10 @@ +@@ -161,10 +160,10 @@ TAR = tar GZIP = --best @@ -296,7 +296,7 @@ .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -@@ -229,14 +228,14 @@ +@@ -231,14 +230,14 @@ maintainer-clean-libtool: @@ -317,7 +317,7 @@ mostlyclean-noinstPROGRAMS: -@@ -384,10 +383,10 @@ +@@ -386,10 +385,10 @@ echo $$p; \ done @@ -330,3 +330,74 @@ if test -f $$p; then \ echo "$(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \ $(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \ +--- gthread/Makefile.in.orig Thu Dec 17 13:11:39 1998 ++++ gthread/Makefile.in Sat Dec 26 22:51:58 1998 +@@ -93,19 +93,18 @@ + gthread-nspr.c \ + gthread-none.c + +-libglib = $(top_builddir)/libglib.la # -lglib ++libglib = $(top_builddir)/libglib11d.la # -lglib + +-lib_LTLIBRARIES = libgthread.la ++lib_LTLIBRARIES = libgthread11d.la + +-libgthread_la_SOURCES = gthread.c +-libgthread_la_LDFLAGS = \ +- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ +- -release $(LT_RELEASE) ++libgthread11d_la_SOURCES = gthread.c ++libgthread11d_la_LDFLAGS = \ ++ -version-info 1:1:0 + +-libgthread_la_LIBADD = @G_THREAD_LIBS@ ++libgthread11d_la_LIBADD = @G_THREAD_LIBS@ + + noinst_PROGRAMS = testgthread +-testgthread_LDADD = ../libglib.la libgthread.la ++testgthread_LDADD = ../libglib11d.la libgthread11d.la + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = +@@ -116,13 +115,13 @@ + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ +-libgthread_la_DEPENDENCIES = +-libgthread_la_OBJECTS = gthread.lo ++libgthread11d_la_DEPENDENCIES = ++libgthread11d_la_OBJECTS = gthread.lo + PROGRAMS = $(noinst_PROGRAMS) + + testgthread_SOURCES = testgthread.c + testgthread_OBJECTS = testgthread.o +-testgthread_DEPENDENCIES = ../libglib.la libgthread.la ++testgthread_DEPENDENCIES = ../libglib11d.la libgthread11d.la + testgthread_LDFLAGS = + CFLAGS = @CFLAGS@ + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +@@ -135,10 +134,10 @@ + + TAR = tar + GZIP = --best +-SOURCES = $(libgthread_la_SOURCES) testgthread.c +-OBJECTS = $(libgthread_la_OBJECTS) testgthread.o ++SOURCES = $(libgthread11d_la_SOURCES) testgthread.c ++OBJECTS = $(libgthread11d_la_OBJECTS) testgthread.o + +-all: Makefile $(LTLIBRARIES) $(PROGRAMS) ++all: Makefile $(LTLIBRARIES) + + .SUFFIXES: + .SUFFIXES: .S .c .lo .o .s +@@ -213,8 +212,8 @@ + + maintainer-clean-libtool: + +-libgthread.la: $(libgthread_la_OBJECTS) $(libgthread_la_DEPENDENCIES) +- $(LINK) -rpath $(libdir) $(libgthread_la_LDFLAGS) $(libgthread_la_OBJECTS) $(libgthread_la_LIBADD) $(LIBS) ++libgthread11d.la: $(libgthread11d_la_OBJECTS) $(libgthread11d_la_DEPENDENCIES) ++ $(LINK) -rpath $(libdir) $(libgthread11d_la_LDFLAGS) $(libgthread11d_la_OBJECTS) $(libgthread11d_la_LIBADD) $(LIBS) + + mostlyclean-noinstPROGRAMS: + diff --git a/devel/glib12/files/patch-ac b/devel/glib12/files/patch-ac index 877d8ad..557b5b5 100644 --- a/devel/glib12/files/patch-ac +++ b/devel/glib12/files/patch-ac @@ -1,5 +1,5 @@ ---- glib-config.in.orig Wed Sep 16 03:08:07 1998 -+++ glib-config.in Fri Dec 11 21:43:37 1998 +--- glib-config.in.orig Wed Dec 16 09:30:46 1998 ++++ glib-config.in Sat Dec 26 22:24:07 1998 @@ -7,7 +7,7 @@ usage() { @@ -9,22 +9,28 @@ Options: [--prefix[=DIR]] [--exec-prefix[=DIR]] -@@ -83,15 +83,15 @@ - echo $exec_prefix - fi - if test "$echo_cflags" = "yes"; then -- echo -I@libdir@/glib/include $includes -+ echo $includes +@@ -91,20 +91,20 @@ + if test "$lib_gthread" = "yes"; then + cflags="$cflags @G_THREAD_CFLAGS@" + fi +- echo -I@libdir@/glib/include $includes $cflags ++ echo $includes $cflags fi if test "$echo_libs" = "yes"; then - libs="" + libsp="" + libsa="" if test "$lib_glib" = "yes"; then -- libs="$libs -lglib" -+ libs="$libs -lglib11d" +- libsp="$libsp -lglib" ++ libsp="$libsp -lglib11d" + fi + if test "$lib_gthread" = "yes"; then +- libsp="-lgthread $libsp" ++ libsp="-lgthread11d $libsp" + libsa="$libsa @G_THREAD_LIBS@" fi if test "$lib_gmodule" = "yes"; then -- libs="@G_MODULE_LDFLAGS@ -lgmodule $libs @G_MODULE_LIBS@" -+ libs="@G_MODULE_LDFLAGS@ -lgmodule11d $libs @G_MODULE_LIBS@" +- libsp="@G_MODULE_LDFLAGS@ -lgmodule $libsp" ++ libsp="@G_MODULE_LDFLAGS@ -lgmodule11d $libsp" + libsa="$libsa @G_MODULE_LIBS@" fi - echo "-L@libdir@ $libs" - fi + echo -L@libdir@ $libsp $libsa diff --git a/devel/glib12/pkg-plist b/devel/glib12/pkg-plist index b65e648..42afcc8 100644 --- a/devel/glib12/pkg-plist +++ b/devel/glib12/pkg-plist @@ -5,11 +5,15 @@ include/glib11d/gmodule.h lib/libglib11d.a lib/libglib11d.la lib/libglib11d.so -lib/libglib11d.so.1 +lib/libglib11d.so.1.1 lib/libgmodule11d.a lib/libgmodule11d.la lib/libgmodule11d.so -lib/libgmodule11d.so.1 +lib/libgmodule11d.so.1.1 +lib/libgthread11d.a +lib/libgthread11d.la +lib/libgthread11d.so +lib/libgthread11d.so.1.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @dirrm include/glib11d diff --git a/devel/glib13/Makefile b/devel/glib13/Makefile index 56cd952..c995358 100644 --- a/devel/glib13/Makefile +++ b/devel/glib13/Makefile @@ -1,12 +1,12 @@ # New ports collection makefile for: glib11-devel -# Version required: 1.1.7 +# Version required: 1.1.9 # Date Created: 28 July 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.8 1998/12/11 08:39:47 asami Exp $ +# $Id: Makefile,v 1.9 1998/12/12 03:42:59 vanilla Exp $ # -DISTNAME= glib-1.1.7 +DISTNAME= glib-1.1.9 CATEGORIES= devel MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \ diff --git a/devel/glib13/distinfo b/devel/glib13/distinfo index 3cf1588..16b3bfd 100644 --- a/devel/glib13/distinfo +++ b/devel/glib13/distinfo @@ -1 +1 @@ -MD5 (glib-1.1.7.tar.gz) = 4ca0324332260bd9a06d1888854f5d27 +MD5 (glib-1.1.9.tar.gz) = a645722c4c32d091876851269da4bea1 diff --git a/devel/glib13/files/patch-ab b/devel/glib13/files/patch-ab index 021ca0a..0acb09a 100644 --- a/devel/glib13/files/patch-ab +++ b/devel/glib13/files/patch-ab @@ -1,11 +1,11 @@ ---- Makefile.in.orig Wed Dec 9 09:02:44 1998 -+++ Makefile.in Fri Dec 11 21:25:10 1998 -@@ -85,14 +85,12 @@ +--- Makefile.in.orig Thu Dec 17 13:11:36 1998 ++++ Makefile.in Sat Dec 26 22:58:19 1998 +@@ -87,14 +87,12 @@ RANLIB = @RANLIB@ VERSION = @VERSION@ --SUBDIRS = gmodule docs -+SUBDIRS = gmodule +-SUBDIRS = gmodule gthread docs ++SUBDIRS = gmodule gthread # alpha `automake' supports this better #SUBDIRS = . gmodule docs @@ -18,7 +18,7 @@ INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ -@@ -106,9 +104,9 @@ +@@ -108,9 +106,9 @@ makefile.msc \ glibconfig.h.win32 @@ -30,8 +30,8 @@ garray.c \ gcache.c \ gcompletion.c \ -@@ -135,27 +133,25 @@ - gutils.c +@@ -138,27 +136,25 @@ + gmutex.c include_HEADERS = \ - glib.h @@ -45,7 +45,7 @@ -libglib_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) +libglib11d_la_LDFLAGS = \ -+ -version-info 1:0:0 ++ -version-info 1:1:0 noinst_PROGRAMS = testglib testgdate testgdateparser -testglib_LDADD = libglib.la @@ -65,7 +65,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES) -@@ -163,8 +159,8 @@ +@@ -166,8 +162,8 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -75,8 +75,8 @@ +libglib11d_la_OBJECTS = garray.lo gcache.lo gcompletion.lo gdataset.lo \ gdate.lo gerror.lo ghash.lo ghook.lo glist.lo gmain.lo giochannel.lo \ giounix.lo gmem.lo gmessages.lo gnode.lo gprimes.lo gslist.lo gtimer.lo \ - gtree.lo grel.lo gstring.lo gstrfuncs.lo gscanner.lo gutils.lo -@@ -172,15 +168,15 @@ + gtree.lo grel.lo gstring.lo gstrfuncs.lo gscanner.lo gutils.lo \ +@@ -176,15 +172,15 @@ testglib_SOURCES = testglib.c testglib_OBJECTS = testglib.o @@ -95,7 +95,7 @@ testgdateparser_LDFLAGS = SCRIPTS = $(bin_SCRIPTS) -@@ -188,7 +184,7 @@ +@@ -192,7 +188,7 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ @@ -104,7 +104,7 @@ HEADERS = $(include_HEADERS) -@@ -202,8 +198,8 @@ +@@ -206,8 +202,8 @@ TAR = tar GZIP = --best @@ -115,7 +115,7 @@ all: all-recursive-am all-am -@@ -244,7 +240,10 @@ +@@ -248,7 +244,10 @@ -rm -f config.h maintainer-clean-hdr: @@ -127,7 +127,7 @@ cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status mostlyclean-libLTLIBRARIES: -@@ -310,8 +309,8 @@ +@@ -314,8 +313,8 @@ maintainer-clean-libtool: @@ -138,7 +138,7 @@ mostlyclean-noinstPROGRAMS: -@@ -353,44 +352,6 @@ +@@ -357,44 +356,6 @@ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ done @@ -183,7 +183,7 @@ install-includeHEADERS: $(include_HEADERS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(includedir) -@@ -530,13 +491,13 @@ +@@ -534,13 +495,13 @@ all-recursive-am: config.h $(MAKE) all-recursive @@ -200,7 +200,7 @@ install-exec: install-exec-recursive install-exec-am @$(NORMAL_INSTALL) -@@ -612,8 +573,7 @@ +@@ -616,8 +577,7 @@ maintainer-clean-libtool mostlyclean-noinstPROGRAMS \ distclean-noinstPROGRAMS clean-noinstPROGRAMS \ maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \ @@ -210,9 +210,9 @@ install-includeHEADERS install-data-recursive uninstall-data-recursive \ install-exec-recursive uninstall-exec-recursive installdirs-recursive \ uninstalldirs-recursive all-recursive check-recursive \ ---- gmodule/Makefile.in.orig Wed Dec 9 09:02:46 1998 -+++ gmodule/Makefile.in Fri Dec 11 21:07:16 1998 -@@ -99,30 +99,29 @@ +--- gmodule/Makefile.in.orig Thu Dec 17 13:11:37 1998 ++++ gmodule/Makefile.in Sat Dec 26 22:51:58 1998 +@@ -101,30 +101,29 @@ include_HEADERS = \ gmodule.h @@ -229,7 +229,7 @@ @G_MODULE_LDFLAGS@ \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) -+ -version-info 1:0:0 ++ -version-info 1:1:0 -libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) +libgmodule11d_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) @@ -257,7 +257,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = gmoduleconf.h -@@ -133,17 +132,17 @@ +@@ -135,17 +134,17 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -282,7 +282,7 @@ testgmodule_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -@@ -159,10 +158,10 @@ +@@ -161,10 +160,10 @@ TAR = tar GZIP = --best @@ -296,7 +296,7 @@ .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -@@ -229,14 +228,14 @@ +@@ -231,14 +230,14 @@ maintainer-clean-libtool: @@ -317,7 +317,7 @@ mostlyclean-noinstPROGRAMS: -@@ -384,10 +383,10 @@ +@@ -386,10 +385,10 @@ echo $$p; \ done @@ -330,3 +330,74 @@ if test -f $$p; then \ echo "$(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \ $(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \ +--- gthread/Makefile.in.orig Thu Dec 17 13:11:39 1998 ++++ gthread/Makefile.in Sat Dec 26 22:51:58 1998 +@@ -93,19 +93,18 @@ + gthread-nspr.c \ + gthread-none.c + +-libglib = $(top_builddir)/libglib.la # -lglib ++libglib = $(top_builddir)/libglib11d.la # -lglib + +-lib_LTLIBRARIES = libgthread.la ++lib_LTLIBRARIES = libgthread11d.la + +-libgthread_la_SOURCES = gthread.c +-libgthread_la_LDFLAGS = \ +- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ +- -release $(LT_RELEASE) ++libgthread11d_la_SOURCES = gthread.c ++libgthread11d_la_LDFLAGS = \ ++ -version-info 1:1:0 + +-libgthread_la_LIBADD = @G_THREAD_LIBS@ ++libgthread11d_la_LIBADD = @G_THREAD_LIBS@ + + noinst_PROGRAMS = testgthread +-testgthread_LDADD = ../libglib.la libgthread.la ++testgthread_LDADD = ../libglib11d.la libgthread11d.la + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = +@@ -116,13 +115,13 @@ + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ +-libgthread_la_DEPENDENCIES = +-libgthread_la_OBJECTS = gthread.lo ++libgthread11d_la_DEPENDENCIES = ++libgthread11d_la_OBJECTS = gthread.lo + PROGRAMS = $(noinst_PROGRAMS) + + testgthread_SOURCES = testgthread.c + testgthread_OBJECTS = testgthread.o +-testgthread_DEPENDENCIES = ../libglib.la libgthread.la ++testgthread_DEPENDENCIES = ../libglib11d.la libgthread11d.la + testgthread_LDFLAGS = + CFLAGS = @CFLAGS@ + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +@@ -135,10 +134,10 @@ + + TAR = tar + GZIP = --best +-SOURCES = $(libgthread_la_SOURCES) testgthread.c +-OBJECTS = $(libgthread_la_OBJECTS) testgthread.o ++SOURCES = $(libgthread11d_la_SOURCES) testgthread.c ++OBJECTS = $(libgthread11d_la_OBJECTS) testgthread.o + +-all: Makefile $(LTLIBRARIES) $(PROGRAMS) ++all: Makefile $(LTLIBRARIES) + + .SUFFIXES: + .SUFFIXES: .S .c .lo .o .s +@@ -213,8 +212,8 @@ + + maintainer-clean-libtool: + +-libgthread.la: $(libgthread_la_OBJECTS) $(libgthread_la_DEPENDENCIES) +- $(LINK) -rpath $(libdir) $(libgthread_la_LDFLAGS) $(libgthread_la_OBJECTS) $(libgthread_la_LIBADD) $(LIBS) ++libgthread11d.la: $(libgthread11d_la_OBJECTS) $(libgthread11d_la_DEPENDENCIES) ++ $(LINK) -rpath $(libdir) $(libgthread11d_la_LDFLAGS) $(libgthread11d_la_OBJECTS) $(libgthread11d_la_LIBADD) $(LIBS) + + mostlyclean-noinstPROGRAMS: + diff --git a/devel/glib13/pkg-plist b/devel/glib13/pkg-plist index b65e648..42afcc8 100644 --- a/devel/glib13/pkg-plist +++ b/devel/glib13/pkg-plist @@ -5,11 +5,15 @@ include/glib11d/gmodule.h lib/libglib11d.a lib/libglib11d.la lib/libglib11d.so -lib/libglib11d.so.1 +lib/libglib11d.so.1.1 lib/libgmodule11d.a lib/libgmodule11d.la lib/libgmodule11d.so -lib/libgmodule11d.so.1 +lib/libgmodule11d.so.1.1 +lib/libgthread11d.a +lib/libgthread11d.la +lib/libgthread11d.so +lib/libgthread11d.so.1.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @dirrm include/glib11d diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 56cd952..c995358 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -1,12 +1,12 @@ # New ports collection makefile for: glib11-devel -# Version required: 1.1.7 +# Version required: 1.1.9 # Date Created: 28 July 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.8 1998/12/11 08:39:47 asami Exp $ +# $Id: Makefile,v 1.9 1998/12/12 03:42:59 vanilla Exp $ # -DISTNAME= glib-1.1.7 +DISTNAME= glib-1.1.9 CATEGORIES= devel MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \ diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo index 3cf1588..16b3bfd 100644 --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -1 +1 @@ -MD5 (glib-1.1.7.tar.gz) = 4ca0324332260bd9a06d1888854f5d27 +MD5 (glib-1.1.9.tar.gz) = a645722c4c32d091876851269da4bea1 diff --git a/devel/glib20/files/patch-ab b/devel/glib20/files/patch-ab index 021ca0a..0acb09a 100644 --- a/devel/glib20/files/patch-ab +++ b/devel/glib20/files/patch-ab @@ -1,11 +1,11 @@ ---- Makefile.in.orig Wed Dec 9 09:02:44 1998 -+++ Makefile.in Fri Dec 11 21:25:10 1998 -@@ -85,14 +85,12 @@ +--- Makefile.in.orig Thu Dec 17 13:11:36 1998 ++++ Makefile.in Sat Dec 26 22:58:19 1998 +@@ -87,14 +87,12 @@ RANLIB = @RANLIB@ VERSION = @VERSION@ --SUBDIRS = gmodule docs -+SUBDIRS = gmodule +-SUBDIRS = gmodule gthread docs ++SUBDIRS = gmodule gthread # alpha `automake' supports this better #SUBDIRS = . gmodule docs @@ -18,7 +18,7 @@ INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ -@@ -106,9 +104,9 @@ +@@ -108,9 +106,9 @@ makefile.msc \ glibconfig.h.win32 @@ -30,8 +30,8 @@ garray.c \ gcache.c \ gcompletion.c \ -@@ -135,27 +133,25 @@ - gutils.c +@@ -138,27 +136,25 @@ + gmutex.c include_HEADERS = \ - glib.h @@ -45,7 +45,7 @@ -libglib_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) +libglib11d_la_LDFLAGS = \ -+ -version-info 1:0:0 ++ -version-info 1:1:0 noinst_PROGRAMS = testglib testgdate testgdateparser -testglib_LDADD = libglib.la @@ -65,7 +65,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES) -@@ -163,8 +159,8 @@ +@@ -166,8 +162,8 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -75,8 +75,8 @@ +libglib11d_la_OBJECTS = garray.lo gcache.lo gcompletion.lo gdataset.lo \ gdate.lo gerror.lo ghash.lo ghook.lo glist.lo gmain.lo giochannel.lo \ giounix.lo gmem.lo gmessages.lo gnode.lo gprimes.lo gslist.lo gtimer.lo \ - gtree.lo grel.lo gstring.lo gstrfuncs.lo gscanner.lo gutils.lo -@@ -172,15 +168,15 @@ + gtree.lo grel.lo gstring.lo gstrfuncs.lo gscanner.lo gutils.lo \ +@@ -176,15 +172,15 @@ testglib_SOURCES = testglib.c testglib_OBJECTS = testglib.o @@ -95,7 +95,7 @@ testgdateparser_LDFLAGS = SCRIPTS = $(bin_SCRIPTS) -@@ -188,7 +184,7 @@ +@@ -192,7 +188,7 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ @@ -104,7 +104,7 @@ HEADERS = $(include_HEADERS) -@@ -202,8 +198,8 @@ +@@ -206,8 +202,8 @@ TAR = tar GZIP = --best @@ -115,7 +115,7 @@ all: all-recursive-am all-am -@@ -244,7 +240,10 @@ +@@ -248,7 +244,10 @@ -rm -f config.h maintainer-clean-hdr: @@ -127,7 +127,7 @@ cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status mostlyclean-libLTLIBRARIES: -@@ -310,8 +309,8 @@ +@@ -314,8 +313,8 @@ maintainer-clean-libtool: @@ -138,7 +138,7 @@ mostlyclean-noinstPROGRAMS: -@@ -353,44 +352,6 @@ +@@ -357,44 +356,6 @@ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ done @@ -183,7 +183,7 @@ install-includeHEADERS: $(include_HEADERS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(includedir) -@@ -530,13 +491,13 @@ +@@ -534,13 +495,13 @@ all-recursive-am: config.h $(MAKE) all-recursive @@ -200,7 +200,7 @@ install-exec: install-exec-recursive install-exec-am @$(NORMAL_INSTALL) -@@ -612,8 +573,7 @@ +@@ -616,8 +577,7 @@ maintainer-clean-libtool mostlyclean-noinstPROGRAMS \ distclean-noinstPROGRAMS clean-noinstPROGRAMS \ maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \ @@ -210,9 +210,9 @@ install-includeHEADERS install-data-recursive uninstall-data-recursive \ install-exec-recursive uninstall-exec-recursive installdirs-recursive \ uninstalldirs-recursive all-recursive check-recursive \ ---- gmodule/Makefile.in.orig Wed Dec 9 09:02:46 1998 -+++ gmodule/Makefile.in Fri Dec 11 21:07:16 1998 -@@ -99,30 +99,29 @@ +--- gmodule/Makefile.in.orig Thu Dec 17 13:11:37 1998 ++++ gmodule/Makefile.in Sat Dec 26 22:51:58 1998 +@@ -101,30 +101,29 @@ include_HEADERS = \ gmodule.h @@ -229,7 +229,7 @@ @G_MODULE_LDFLAGS@ \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) -+ -version-info 1:0:0 ++ -version-info 1:1:0 -libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) +libgmodule11d_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) @@ -257,7 +257,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = gmoduleconf.h -@@ -133,17 +132,17 @@ +@@ -135,17 +134,17 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -282,7 +282,7 @@ testgmodule_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -@@ -159,10 +158,10 @@ +@@ -161,10 +160,10 @@ TAR = tar GZIP = --best @@ -296,7 +296,7 @@ .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -@@ -229,14 +228,14 @@ +@@ -231,14 +230,14 @@ maintainer-clean-libtool: @@ -317,7 +317,7 @@ mostlyclean-noinstPROGRAMS: -@@ -384,10 +383,10 @@ +@@ -386,10 +385,10 @@ echo $$p; \ done @@ -330,3 +330,74 @@ if test -f $$p; then \ echo "$(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \ $(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \ +--- gthread/Makefile.in.orig Thu Dec 17 13:11:39 1998 ++++ gthread/Makefile.in Sat Dec 26 22:51:58 1998 +@@ -93,19 +93,18 @@ + gthread-nspr.c \ + gthread-none.c + +-libglib = $(top_builddir)/libglib.la # -lglib ++libglib = $(top_builddir)/libglib11d.la # -lglib + +-lib_LTLIBRARIES = libgthread.la ++lib_LTLIBRARIES = libgthread11d.la + +-libgthread_la_SOURCES = gthread.c +-libgthread_la_LDFLAGS = \ +- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ +- -release $(LT_RELEASE) ++libgthread11d_la_SOURCES = gthread.c ++libgthread11d_la_LDFLAGS = \ ++ -version-info 1:1:0 + +-libgthread_la_LIBADD = @G_THREAD_LIBS@ ++libgthread11d_la_LIBADD = @G_THREAD_LIBS@ + + noinst_PROGRAMS = testgthread +-testgthread_LDADD = ../libglib.la libgthread.la ++testgthread_LDADD = ../libglib11d.la libgthread11d.la + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = +@@ -116,13 +115,13 @@ + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ +-libgthread_la_DEPENDENCIES = +-libgthread_la_OBJECTS = gthread.lo ++libgthread11d_la_DEPENDENCIES = ++libgthread11d_la_OBJECTS = gthread.lo + PROGRAMS = $(noinst_PROGRAMS) + + testgthread_SOURCES = testgthread.c + testgthread_OBJECTS = testgthread.o +-testgthread_DEPENDENCIES = ../libglib.la libgthread.la ++testgthread_DEPENDENCIES = ../libglib11d.la libgthread11d.la + testgthread_LDFLAGS = + CFLAGS = @CFLAGS@ + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +@@ -135,10 +134,10 @@ + + TAR = tar + GZIP = --best +-SOURCES = $(libgthread_la_SOURCES) testgthread.c +-OBJECTS = $(libgthread_la_OBJECTS) testgthread.o ++SOURCES = $(libgthread11d_la_SOURCES) testgthread.c ++OBJECTS = $(libgthread11d_la_OBJECTS) testgthread.o + +-all: Makefile $(LTLIBRARIES) $(PROGRAMS) ++all: Makefile $(LTLIBRARIES) + + .SUFFIXES: + .SUFFIXES: .S .c .lo .o .s +@@ -213,8 +212,8 @@ + + maintainer-clean-libtool: + +-libgthread.la: $(libgthread_la_OBJECTS) $(libgthread_la_DEPENDENCIES) +- $(LINK) -rpath $(libdir) $(libgthread_la_LDFLAGS) $(libgthread_la_OBJECTS) $(libgthread_la_LIBADD) $(LIBS) ++libgthread11d.la: $(libgthread11d_la_OBJECTS) $(libgthread11d_la_DEPENDENCIES) ++ $(LINK) -rpath $(libdir) $(libgthread11d_la_LDFLAGS) $(libgthread11d_la_OBJECTS) $(libgthread11d_la_LIBADD) $(LIBS) + + mostlyclean-noinstPROGRAMS: + diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist index b65e648..42afcc8 100644 --- a/devel/glib20/pkg-plist +++ b/devel/glib20/pkg-plist @@ -5,11 +5,15 @@ include/glib11d/gmodule.h lib/libglib11d.a lib/libglib11d.la lib/libglib11d.so -lib/libglib11d.so.1 +lib/libglib11d.so.1.1 lib/libgmodule11d.a lib/libgmodule11d.la lib/libgmodule11d.so -lib/libgmodule11d.so.1 +lib/libgmodule11d.so.1.1 +lib/libgthread11d.a +lib/libgthread11d.la +lib/libgthread11d.so +lib/libgthread11d.so.1.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @dirrm include/glib11d diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile index b1baf05..820c078 100644 --- a/x11-toolkits/gtk12/Makefile +++ b/x11-toolkits/gtk12/Makefile @@ -1,13 +1,13 @@ # New ports collection makefile for: gtk11-devel -# Version required: 1.1.7 +# Version required: 1.1.9 # Date Created: 28 Sep 1997 # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # -# $Id: Makefile,v 1.34 1998/12/22 07:56:14 asami Exp $ +# $Id: Makefile,v 1.35 1998/12/22 09:06:28 asami Exp $ # -DISTNAME= gtk+-1.1.7 -PKGNAME= gtk-1.1.7 +DISTNAME= gtk+-1.1.9 +PKGNAME= gtk-1.1.9 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \ @@ -15,17 +15,19 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \ MAINTAINER= vanilla@FreeBSD.ORG +RUN_DEPENDS= gettext:${PORTSDIR}/devel/gettext LIB_DEPENDS= glib11d.1:${PORTSDIR}/devel/glib11-devel USE_X_PREFIX= yes .include <bsd.port.pre.mk> .if ${OSVERSION} <= 300000 -BROKEN= requires perl5 +USE_PERL5= yes .endif GNU_CONFIGURE= yes CONFIGURE_ENV= INSTALL='$${INSTALL} -c' \ - GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" + GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \ + CPPFLAGS="-I${LOCALBASE}/include" CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk11d post-install: diff --git a/x11-toolkits/gtk12/distinfo b/x11-toolkits/gtk12/distinfo index 072f73b..8e06e73 100644 --- a/x11-toolkits/gtk12/distinfo +++ b/x11-toolkits/gtk12/distinfo @@ -1 +1 @@ -MD5 (gtk+-1.1.7.tar.gz) = 751cbeb13fb579626b7fec33ff9a10ee +MD5 (gtk+-1.1.9.tar.gz) = dc66f1faba2462f6b6b9e3c0f9a43805 diff --git a/x11-toolkits/gtk12/files/patch-aa b/x11-toolkits/gtk12/files/patch-aa index 07dc126..c507b7c 100644 --- a/x11-toolkits/gtk12/files/patch-aa +++ b/x11-toolkits/gtk12/files/patch-aa @@ -1,10 +1,10 @@ ---- Makefile.in.orig Fri Dec 11 14:20:23 1998 -+++ Makefile.in Sat Dec 12 11:35:00 1998 -@@ -100,9 +100,9 @@ +--- Makefile.in.orig Thu Dec 17 14:33:47 1998 ++++ Makefile.in Sun Dec 27 00:28:05 1998 +@@ -118,9 +118,9 @@ xinput_progs = @xinput_progs@ SRC_SUBDIRS = gdk gtk --SUBDIRS = $(SRC_SUBDIRS) docs +-SUBDIRS = po $(SRC_SUBDIRS) docs +SUBDIRS = $(SRC_SUBDIRS) -bin_SCRIPTS = gtk-config @@ -12,7 +12,7 @@ EXTRA_DIST = \ HACKING \ -@@ -187,7 +187,7 @@ +@@ -205,7 +205,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h @@ -21,19 +21,19 @@ SCRIPTS = $(bin_SCRIPTS) DATA = $(m4data_DATA) -@@ -240,7 +240,10 @@ +@@ -259,7 +259,10 @@ -rm -f config.h maintainer-clean-hdr: -gtk-config: $(top_builddir)/config.status gtk-config.in +gtk11d-config.in: gtk-config.in -+ cp gtk-config.in gtk11d-config.in ++ cp gtk-config.in gtk11-config.in + +gtk11d-config: $(top_builddir)/config.status gtk11d-config.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status install-binSCRIPTS: $(bin_SCRIPTS) -@@ -262,25 +265,6 @@ +@@ -281,25 +284,6 @@ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ done @@ -59,7 +59,7 @@ # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, -@@ -420,21 +404,19 @@ +@@ -439,21 +423,19 @@ all-recursive-am: config.h $(MAKE) all-recursive @@ -85,7 +85,7 @@ @: uninstall: uninstall-recursive uninstall-am -@@ -482,15 +464,15 @@ +@@ -501,15 +483,15 @@ -rm -f config.status .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ @@ -104,9 +104,9 @@ uninstall-am install-exec install-data install uninstall all \ installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean ---- gdk/Makefile.in.orig Fri Dec 11 14:20:26 1998 -+++ gdk/Makefile.in Sat Dec 12 11:42:19 1998 -@@ -101,7 +101,7 @@ +--- gdk/Makefile.in.orig Thu Dec 17 14:33:51 1998 ++++ gdk/Makefile.in Sun Dec 27 00:28:05 1998 +@@ -119,7 +119,7 @@ gdkincludedir = $(includedir)/gdk @@ -115,7 +115,7 @@ INCLUDES = \ -DG_LOG_DOMAIN=\"Gdk\" \ -@@ -113,7 +113,7 @@ +@@ -130,7 +130,7 @@ @GLIB_CFLAGS@ \ @x_cflags@ @@ -124,18 +124,18 @@ gdk.c \ gdkcc.c \ gdkcolor.c \ -@@ -156,8 +156,8 @@ - gdktypes.h \ - gdkx.h +@@ -179,8 +179,8 @@ + @GLIB_LIBS@ \ + -lm -libgdk_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \ +libgdk11d_la_LDFLAGS = \ -+ -version-info 1:0:0 \ - @x_ldflags@ @x_libs@ - - EXTRA_PROGRAMS = gxid -@@ -184,8 +184,8 @@ ++ -version-info 1:1:0 \ + @GLIB_LIBS@ \ + @x_ldflags@ \ + @x_libs@ \ +@@ -207,8 +207,8 @@ X_LIBS = @X_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -143,10 +143,10 @@ -libgdk_la_OBJECTS = gdk.lo gdkcc.lo gdkcolor.lo gdkcursor.lo gdkdnd.lo \ +libgdk11d_la_LIBADD = +libgdk11d_la_OBJECTS = gdk.lo gdkcc.lo gdkcolor.lo gdkcursor.lo gdkdnd.lo \ - gdkdraw.lo gdkfont.lo gdkgc.lo gdkglobals.lo gdkim.lo gdkimage.lo \ - gdkinput.lo gdkpixmap.lo gdkproperty.lo gdkrgb.lo gdkrectangle.lo \ - gdkregion.lo gdkselection.lo gdkthreads.lo gdkvisual.lo gdkwindow.lo \ -@@ -208,8 +208,8 @@ + gdkdraw.lo gdkevents.lo gdkfont.lo gdkgc.lo gdkglobals.lo gdkim.lo \ + gdkimage.lo gdkinput.lo gdkpixmap.lo gdkproperty.lo gdkrgb.lo \ + gdkrectangle.lo gdkregion.lo gdkselection.lo gdkvisual.lo gdkwindow.lo \ +@@ -231,8 +231,8 @@ TAR = tar GZIP = --best @@ -157,7 +157,7 @@ all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) -@@ -286,8 +286,8 @@ +@@ -309,8 +309,8 @@ maintainer-clean-libtool: @@ -168,9 +168,9 @@ mostlyclean-binPROGRAMS: ---- gtk/Makefile.in.orig Fri Dec 11 14:20:27 1998 -+++ gtk/Makefile.in Sat Dec 12 11:35:00 1998 -@@ -103,7 +103,7 @@ +--- gtk/Makefile.in.orig Thu Dec 17 14:33:52 1998 ++++ gtk/Makefile.in Sun Dec 27 00:28:05 1998 +@@ -121,7 +121,7 @@ gtkincludedir = $(includedir)/gtk @@ -179,7 +179,7 @@ static_sources = \ gtkaccelgroup.c \ -@@ -214,7 +214,7 @@ +@@ -231,7 +231,7 @@ fnmatch.c \ fnmatch.h @@ -188,19 +188,19 @@ $(static_sources) \ gtkmarshal.c -@@ -351,8 +351,8 @@ +@@ -368,8 +368,8 @@ ../gdk/gdktypes.h \ ../gdk/gdkrgb.h -libgtk_la_LDFLAGS = \ -- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) +- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \ +libgtk11d_la_LDFLAGS = \ -+ -version-info 1:0:0 - - EXTRA_DIST = \ - line-arrow.xbm \ -@@ -400,12 +400,12 @@ - noinst_PROGRAMS = testgtk testinput testselection testthreads testrgb testdnd simple ++ -version-info 1:1:0 \ + @GLIB_LIBS@ \ + @x_ldflags@ \ + @x_libs@ \ +@@ -422,12 +422,12 @@ + # testthreads DEPS = \ - libgtk.la \ @@ -216,7 +216,7 @@ @x_ldflags@ \ @x_libs@ \ @GLIB_LIBS@ \ -@@ -440,8 +440,8 @@ +@@ -462,8 +462,8 @@ X_LIBS = @X_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -227,21 +227,21 @@ gtkalignment.lo gtkarg.lo gtkarrow.lo gtkaspectframe.lo gtkbin.lo \ gtkbindings.lo gtkbbox.lo gtkbox.lo gtkbutton.lo gtkcalendar.lo \ gtkcheckbutton.lo gtkcheckmenuitem.lo gtkclist.lo gtkcolorsel.lo \ -@@ -501,10 +501,10 @@ +@@ -519,10 +519,10 @@ TAR = tar GZIP = --best --SOURCES = $(libgtk_la_SOURCES) testgtk.c testinput.c testselection.c testthreads.c testrgb.c testdnd.c simple.c --OBJECTS = $(libgtk_la_OBJECTS) testgtk.o testinput.o testselection.o testthreads.o testrgb.o testdnd.o simple.o -+SOURCES = $(libgtk11d_la_SOURCES) testgtk.c testinput.c testselection.c testthreads.c testrgb.c testdnd.c simple.c -+OBJECTS = $(libgtk11d_la_OBJECTS) testgtk.o testinput.o testselection.o testthreads.o testrgb.o testdnd.o simple.o +-SOURCES = $(libgtk_la_SOURCES) testgtk.c testinput.c testselection.c testrgb.c testdnd.c simple.c +-OBJECTS = $(libgtk_la_OBJECTS) testgtk.o testinput.o testselection.o testrgb.o testdnd.o simple.o ++SOURCES = $(libgtk11d_la_SOURCES) testgtk.c testinput.c testselection.c testrgb.c testdnd.c simple.c ++OBJECTS = $(libgtk11d_la_OBJECTS) testgtk.o testinput.o testselection.o testrgb.o testdnd.o simple.o -all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) +all: Makefile $(LTLIBRARIES) $(HEADERS) .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -@@ -581,8 +581,8 @@ +@@ -599,8 +599,8 @@ maintainer-clean-libtool: diff --git a/x11-toolkits/gtk12/files/patch-ab b/x11-toolkits/gtk12/files/patch-ab index ba04baf..5985d8c 100644 --- a/x11-toolkits/gtk12/files/patch-ab +++ b/x11-toolkits/gtk12/files/patch-ab @@ -1,5 +1,5 @@ --- gtk-config.in.orig Mon Nov 2 16:41:19 1998 -+++ gtk-config.in Fri Dec 11 21:42:44 1998 ++++ gtk-config.in Sun Dec 27 00:28:06 1998 @@ -8,7 +8,7 @@ exec_prefix_set=no @@ -14,7 +14,7 @@ fi done - echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @x_libs@ @GDK_WLIBS@ -lm -+ echo $libdirs @x_ldflags@ -lgtk11d -lgdk11d $my_glib_libs @x_libs@ @GDK_WLIBS@ -lm ++ echo $libdirs @x_ldflags@ -lgtk11d -lgdk11d $my_glib_libs @x_libs@ @GDK_WLIBS@ -lintl -lm ;; *) echo "${usage}" 1>&2 diff --git a/x11-toolkits/gtk12/files/patch-ad b/x11-toolkits/gtk12/files/patch-ad new file mode 100644 index 0000000..4825e81 --- /dev/null +++ b/x11-toolkits/gtk12/files/patch-ad @@ -0,0 +1,67 @@ +--- gtk/gtkrc.c.orig Wed Dec 16 09:42:10 1998 ++++ gtk/gtkrc.c Sun Dec 27 01:04:11 1998 +@@ -26,6 +26,10 @@ + #include <stdio.h> + #include <stdlib.h> + ++#ifdef X_LOCALE ++#include <locale.h> ++#endif ++ + #include "gtkrc.h" + #include "gtkbindings.h" + #include "gtkthemes.h" +@@ -228,13 +232,13 @@ + var = getenv("GTK_EXE_PREFIX"); + if (var) + { +- path = g_malloc(strlen(var) + strlen("/lib/gtk/themes/engines") +1); +- sprintf(path, "%s%s", var, "/lib/gtk/themes/engines"); ++ path = g_malloc(strlen(var) + strlen("/share/themes/engines") +1); ++ sprintf(path, "%s%s", var, "/share/themes/engines"); + } + else + { +- path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/lib/gtk/themes/engines") +1); +- sprintf(path, "%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines"); ++ path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/share/themes/engines") +1); ++ sprintf(path, "%s%s", GTK_EXE_PREFIX, "/share/themes/engines"); + } + return path; + } +@@ -248,13 +252,13 @@ + var = getenv("GTK_DATA_PREFIX"); + if (var) + { +- path = g_malloc(strlen(var) + strlen("/share/gtk/themes") +1); +- sprintf(path, "%s%s", var, "/share/gtk/themes"); ++ path = g_malloc(strlen(var) + strlen("/share/themes") +1); ++ sprintf(path, "%s%s", var, "/share/themes"); + } + else + { +- path = g_malloc(strlen(GTK_DATA_PREFIX) + strlen("/share/gtk/themes") +1); +- sprintf(path, "%s%s", GTK_DATA_PREFIX, "/share/gtk/themes"); ++ path = g_malloc(strlen(GTK_DATA_PREFIX) + strlen("/share/themes") +1); ++ sprintf(path, "%s%s", GTK_DATA_PREFIX, "/share/themes"); + } + + for (n = 0; pixmap_path[n]; n++) ; +@@ -290,13 +294,13 @@ + var = getenv("GTK_EXE_PREFIX"); + if (var) + { +- path = g_malloc(strlen(var) + strlen("/lib/gtk/themes/engines") +1); +- sprintf(path, "%s%s", var, "/lib/gtk/themes/engines"); ++ path = g_malloc(strlen(var) + strlen("/share/themes/engines") +1); ++ sprintf(path, "%s%s", var, "/share/themes/engines"); + } + else + { +- path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/lib/gtk/themes/engines") +1); +- sprintf(path, "%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines"); ++ path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/share/themes/engines") +1); ++ sprintf(path, "%s%s", GTK_EXE_PREFIX, "/share/themes/engines"); + } + module_path[n++] = g_strdup(path); + g_free(path); diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist index 4bbc747..8793d69 100644 --- a/x11-toolkits/gtk12/pkg-plist +++ b/x11-toolkits/gtk12/pkg-plist @@ -35,7 +35,6 @@ include/gtk11d/gtk/gtkdebug.h include/gtk11d/gtk/gtkdialog.h include/gtk11d/gtk/gtkdnd.h include/gtk11d/gtk/gtkdrawingarea.h -include/gtk11d/gtk/gtkdrawwindow.h include/gtk11d/gtk/gtkeditable.h include/gtk11d/gtk/gtkentry.h include/gtk11d/gtk/gtkenums.h @@ -58,6 +57,7 @@ include/gtk11d/gtk/gtkhseparator.h include/gtk11d/gtk/gtkimage.h include/gtk11d/gtk/gtkinputdialog.h include/gtk11d/gtk/gtkinvisible.h +include/gtk11d/gtk/gtkintl.h include/gtk11d/gtk/gtkitem.h include/gtk11d/gtk/gtkitemfactory.h include/gtk11d/gtk/gtklabel.h @@ -123,11 +123,11 @@ include/gtk11d/gtk/gtkwindow.h lib/libgdk11d.a lib/libgdk11d.la lib/libgdk11d.so -lib/libgdk11d.so.1 +lib/libgdk11d.so.1.1 lib/libgtk11d.a lib/libgtk11d.la lib/libgtk11d.so -lib/libgtk11d.so.1 +lib/libgtk11d.so.1.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/themes/Default/gtk/gtkrc diff --git a/x11-toolkits/gtk13/Makefile b/x11-toolkits/gtk13/Makefile index b1baf05..820c078 100644 --- a/x11-toolkits/gtk13/Makefile +++ b/x11-toolkits/gtk13/Makefile @@ -1,13 +1,13 @@ # New ports collection makefile for: gtk11-devel -# Version required: 1.1.7 +# Version required: 1.1.9 # Date Created: 28 Sep 1997 # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # -# $Id: Makefile,v 1.34 1998/12/22 07:56:14 asami Exp $ +# $Id: Makefile,v 1.35 1998/12/22 09:06:28 asami Exp $ # -DISTNAME= gtk+-1.1.7 -PKGNAME= gtk-1.1.7 +DISTNAME= gtk+-1.1.9 +PKGNAME= gtk-1.1.9 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \ @@ -15,17 +15,19 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \ MAINTAINER= vanilla@FreeBSD.ORG +RUN_DEPENDS= gettext:${PORTSDIR}/devel/gettext LIB_DEPENDS= glib11d.1:${PORTSDIR}/devel/glib11-devel USE_X_PREFIX= yes .include <bsd.port.pre.mk> .if ${OSVERSION} <= 300000 -BROKEN= requires perl5 +USE_PERL5= yes .endif GNU_CONFIGURE= yes CONFIGURE_ENV= INSTALL='$${INSTALL} -c' \ - GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" + GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \ + CPPFLAGS="-I${LOCALBASE}/include" CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk11d post-install: diff --git a/x11-toolkits/gtk13/distinfo b/x11-toolkits/gtk13/distinfo index 072f73b..8e06e73 100644 --- a/x11-toolkits/gtk13/distinfo +++ b/x11-toolkits/gtk13/distinfo @@ -1 +1 @@ -MD5 (gtk+-1.1.7.tar.gz) = 751cbeb13fb579626b7fec33ff9a10ee +MD5 (gtk+-1.1.9.tar.gz) = dc66f1faba2462f6b6b9e3c0f9a43805 diff --git a/x11-toolkits/gtk13/files/patch-ad b/x11-toolkits/gtk13/files/patch-ad new file mode 100644 index 0000000..4825e81 --- /dev/null +++ b/x11-toolkits/gtk13/files/patch-ad @@ -0,0 +1,67 @@ +--- gtk/gtkrc.c.orig Wed Dec 16 09:42:10 1998 ++++ gtk/gtkrc.c Sun Dec 27 01:04:11 1998 +@@ -26,6 +26,10 @@ + #include <stdio.h> + #include <stdlib.h> + ++#ifdef X_LOCALE ++#include <locale.h> ++#endif ++ + #include "gtkrc.h" + #include "gtkbindings.h" + #include "gtkthemes.h" +@@ -228,13 +232,13 @@ + var = getenv("GTK_EXE_PREFIX"); + if (var) + { +- path = g_malloc(strlen(var) + strlen("/lib/gtk/themes/engines") +1); +- sprintf(path, "%s%s", var, "/lib/gtk/themes/engines"); ++ path = g_malloc(strlen(var) + strlen("/share/themes/engines") +1); ++ sprintf(path, "%s%s", var, "/share/themes/engines"); + } + else + { +- path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/lib/gtk/themes/engines") +1); +- sprintf(path, "%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines"); ++ path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/share/themes/engines") +1); ++ sprintf(path, "%s%s", GTK_EXE_PREFIX, "/share/themes/engines"); + } + return path; + } +@@ -248,13 +252,13 @@ + var = getenv("GTK_DATA_PREFIX"); + if (var) + { +- path = g_malloc(strlen(var) + strlen("/share/gtk/themes") +1); +- sprintf(path, "%s%s", var, "/share/gtk/themes"); ++ path = g_malloc(strlen(var) + strlen("/share/themes") +1); ++ sprintf(path, "%s%s", var, "/share/themes"); + } + else + { +- path = g_malloc(strlen(GTK_DATA_PREFIX) + strlen("/share/gtk/themes") +1); +- sprintf(path, "%s%s", GTK_DATA_PREFIX, "/share/gtk/themes"); ++ path = g_malloc(strlen(GTK_DATA_PREFIX) + strlen("/share/themes") +1); ++ sprintf(path, "%s%s", GTK_DATA_PREFIX, "/share/themes"); + } + + for (n = 0; pixmap_path[n]; n++) ; +@@ -290,13 +294,13 @@ + var = getenv("GTK_EXE_PREFIX"); + if (var) + { +- path = g_malloc(strlen(var) + strlen("/lib/gtk/themes/engines") +1); +- sprintf(path, "%s%s", var, "/lib/gtk/themes/engines"); ++ path = g_malloc(strlen(var) + strlen("/share/themes/engines") +1); ++ sprintf(path, "%s%s", var, "/share/themes/engines"); + } + else + { +- path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/lib/gtk/themes/engines") +1); +- sprintf(path, "%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines"); ++ path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/share/themes/engines") +1); ++ sprintf(path, "%s%s", GTK_EXE_PREFIX, "/share/themes/engines"); + } + module_path[n++] = g_strdup(path); + g_free(path); diff --git a/x11-toolkits/gtk13/pkg-plist b/x11-toolkits/gtk13/pkg-plist index 4bbc747..8793d69 100644 --- a/x11-toolkits/gtk13/pkg-plist +++ b/x11-toolkits/gtk13/pkg-plist @@ -35,7 +35,6 @@ include/gtk11d/gtk/gtkdebug.h include/gtk11d/gtk/gtkdialog.h include/gtk11d/gtk/gtkdnd.h include/gtk11d/gtk/gtkdrawingarea.h -include/gtk11d/gtk/gtkdrawwindow.h include/gtk11d/gtk/gtkeditable.h include/gtk11d/gtk/gtkentry.h include/gtk11d/gtk/gtkenums.h @@ -58,6 +57,7 @@ include/gtk11d/gtk/gtkhseparator.h include/gtk11d/gtk/gtkimage.h include/gtk11d/gtk/gtkinputdialog.h include/gtk11d/gtk/gtkinvisible.h +include/gtk11d/gtk/gtkintl.h include/gtk11d/gtk/gtkitem.h include/gtk11d/gtk/gtkitemfactory.h include/gtk11d/gtk/gtklabel.h @@ -123,11 +123,11 @@ include/gtk11d/gtk/gtkwindow.h lib/libgdk11d.a lib/libgdk11d.la lib/libgdk11d.so -lib/libgdk11d.so.1 +lib/libgdk11d.so.1.1 lib/libgtk11d.a lib/libgtk11d.la lib/libgtk11d.so -lib/libgtk11d.so.1 +lib/libgtk11d.so.1.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/themes/Default/gtk/gtkrc diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index b1baf05..820c078 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -1,13 +1,13 @@ # New ports collection makefile for: gtk11-devel -# Version required: 1.1.7 +# Version required: 1.1.9 # Date Created: 28 Sep 1997 # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # -# $Id: Makefile,v 1.34 1998/12/22 07:56:14 asami Exp $ +# $Id: Makefile,v 1.35 1998/12/22 09:06:28 asami Exp $ # -DISTNAME= gtk+-1.1.7 -PKGNAME= gtk-1.1.7 +DISTNAME= gtk+-1.1.9 +PKGNAME= gtk-1.1.9 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \ @@ -15,17 +15,19 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \ MAINTAINER= vanilla@FreeBSD.ORG +RUN_DEPENDS= gettext:${PORTSDIR}/devel/gettext LIB_DEPENDS= glib11d.1:${PORTSDIR}/devel/glib11-devel USE_X_PREFIX= yes .include <bsd.port.pre.mk> .if ${OSVERSION} <= 300000 -BROKEN= requires perl5 +USE_PERL5= yes .endif GNU_CONFIGURE= yes CONFIGURE_ENV= INSTALL='$${INSTALL} -c' \ - GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" + GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \ + CPPFLAGS="-I${LOCALBASE}/include" CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk11d post-install: diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo index 072f73b..8e06e73 100644 --- a/x11-toolkits/gtk20/distinfo +++ b/x11-toolkits/gtk20/distinfo @@ -1 +1 @@ -MD5 (gtk+-1.1.7.tar.gz) = 751cbeb13fb579626b7fec33ff9a10ee +MD5 (gtk+-1.1.9.tar.gz) = dc66f1faba2462f6b6b9e3c0f9a43805 diff --git a/x11-toolkits/gtk20/files/patch-ad b/x11-toolkits/gtk20/files/patch-ad new file mode 100644 index 0000000..4825e81 --- /dev/null +++ b/x11-toolkits/gtk20/files/patch-ad @@ -0,0 +1,67 @@ +--- gtk/gtkrc.c.orig Wed Dec 16 09:42:10 1998 ++++ gtk/gtkrc.c Sun Dec 27 01:04:11 1998 +@@ -26,6 +26,10 @@ + #include <stdio.h> + #include <stdlib.h> + ++#ifdef X_LOCALE ++#include <locale.h> ++#endif ++ + #include "gtkrc.h" + #include "gtkbindings.h" + #include "gtkthemes.h" +@@ -228,13 +232,13 @@ + var = getenv("GTK_EXE_PREFIX"); + if (var) + { +- path = g_malloc(strlen(var) + strlen("/lib/gtk/themes/engines") +1); +- sprintf(path, "%s%s", var, "/lib/gtk/themes/engines"); ++ path = g_malloc(strlen(var) + strlen("/share/themes/engines") +1); ++ sprintf(path, "%s%s", var, "/share/themes/engines"); + } + else + { +- path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/lib/gtk/themes/engines") +1); +- sprintf(path, "%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines"); ++ path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/share/themes/engines") +1); ++ sprintf(path, "%s%s", GTK_EXE_PREFIX, "/share/themes/engines"); + } + return path; + } +@@ -248,13 +252,13 @@ + var = getenv("GTK_DATA_PREFIX"); + if (var) + { +- path = g_malloc(strlen(var) + strlen("/share/gtk/themes") +1); +- sprintf(path, "%s%s", var, "/share/gtk/themes"); ++ path = g_malloc(strlen(var) + strlen("/share/themes") +1); ++ sprintf(path, "%s%s", var, "/share/themes"); + } + else + { +- path = g_malloc(strlen(GTK_DATA_PREFIX) + strlen("/share/gtk/themes") +1); +- sprintf(path, "%s%s", GTK_DATA_PREFIX, "/share/gtk/themes"); ++ path = g_malloc(strlen(GTK_DATA_PREFIX) + strlen("/share/themes") +1); ++ sprintf(path, "%s%s", GTK_DATA_PREFIX, "/share/themes"); + } + + for (n = 0; pixmap_path[n]; n++) ; +@@ -290,13 +294,13 @@ + var = getenv("GTK_EXE_PREFIX"); + if (var) + { +- path = g_malloc(strlen(var) + strlen("/lib/gtk/themes/engines") +1); +- sprintf(path, "%s%s", var, "/lib/gtk/themes/engines"); ++ path = g_malloc(strlen(var) + strlen("/share/themes/engines") +1); ++ sprintf(path, "%s%s", var, "/share/themes/engines"); + } + else + { +- path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/lib/gtk/themes/engines") +1); +- sprintf(path, "%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines"); ++ path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/share/themes/engines") +1); ++ sprintf(path, "%s%s", GTK_EXE_PREFIX, "/share/themes/engines"); + } + module_path[n++] = g_strdup(path); + g_free(path); diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index 4bbc747..8793d69 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -35,7 +35,6 @@ include/gtk11d/gtk/gtkdebug.h include/gtk11d/gtk/gtkdialog.h include/gtk11d/gtk/gtkdnd.h include/gtk11d/gtk/gtkdrawingarea.h -include/gtk11d/gtk/gtkdrawwindow.h include/gtk11d/gtk/gtkeditable.h include/gtk11d/gtk/gtkentry.h include/gtk11d/gtk/gtkenums.h @@ -58,6 +57,7 @@ include/gtk11d/gtk/gtkhseparator.h include/gtk11d/gtk/gtkimage.h include/gtk11d/gtk/gtkinputdialog.h include/gtk11d/gtk/gtkinvisible.h +include/gtk11d/gtk/gtkintl.h include/gtk11d/gtk/gtkitem.h include/gtk11d/gtk/gtkitemfactory.h include/gtk11d/gtk/gtklabel.h @@ -123,11 +123,11 @@ include/gtk11d/gtk/gtkwindow.h lib/libgdk11d.a lib/libgdk11d.la lib/libgdk11d.so -lib/libgdk11d.so.1 +lib/libgdk11d.so.1.1 lib/libgtk11d.a lib/libgtk11d.la lib/libgtk11d.so -lib/libgtk11d.so.1 +lib/libgtk11d.so.1.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/themes/Default/gtk/gtkrc diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index b1baf05..820c078 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -1,13 +1,13 @@ # New ports collection makefile for: gtk11-devel -# Version required: 1.1.7 +# Version required: 1.1.9 # Date Created: 28 Sep 1997 # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # -# $Id: Makefile,v 1.34 1998/12/22 07:56:14 asami Exp $ +# $Id: Makefile,v 1.35 1998/12/22 09:06:28 asami Exp $ # -DISTNAME= gtk+-1.1.7 -PKGNAME= gtk-1.1.7 +DISTNAME= gtk+-1.1.9 +PKGNAME= gtk-1.1.9 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \ @@ -15,17 +15,19 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \ MAINTAINER= vanilla@FreeBSD.ORG +RUN_DEPENDS= gettext:${PORTSDIR}/devel/gettext LIB_DEPENDS= glib11d.1:${PORTSDIR}/devel/glib11-devel USE_X_PREFIX= yes .include <bsd.port.pre.mk> .if ${OSVERSION} <= 300000 -BROKEN= requires perl5 +USE_PERL5= yes .endif GNU_CONFIGURE= yes CONFIGURE_ENV= INSTALL='$${INSTALL} -c' \ - GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" + GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \ + CPPFLAGS="-I${LOCALBASE}/include" CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk11d post-install: diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo index 072f73b..8e06e73 100644 --- a/x11-toolkits/gtk30/distinfo +++ b/x11-toolkits/gtk30/distinfo @@ -1 +1 @@ -MD5 (gtk+-1.1.7.tar.gz) = 751cbeb13fb579626b7fec33ff9a10ee +MD5 (gtk+-1.1.9.tar.gz) = dc66f1faba2462f6b6b9e3c0f9a43805 diff --git a/x11-toolkits/gtk30/files/patch-ad b/x11-toolkits/gtk30/files/patch-ad new file mode 100644 index 0000000..4825e81 --- /dev/null +++ b/x11-toolkits/gtk30/files/patch-ad @@ -0,0 +1,67 @@ +--- gtk/gtkrc.c.orig Wed Dec 16 09:42:10 1998 ++++ gtk/gtkrc.c Sun Dec 27 01:04:11 1998 +@@ -26,6 +26,10 @@ + #include <stdio.h> + #include <stdlib.h> + ++#ifdef X_LOCALE ++#include <locale.h> ++#endif ++ + #include "gtkrc.h" + #include "gtkbindings.h" + #include "gtkthemes.h" +@@ -228,13 +232,13 @@ + var = getenv("GTK_EXE_PREFIX"); + if (var) + { +- path = g_malloc(strlen(var) + strlen("/lib/gtk/themes/engines") +1); +- sprintf(path, "%s%s", var, "/lib/gtk/themes/engines"); ++ path = g_malloc(strlen(var) + strlen("/share/themes/engines") +1); ++ sprintf(path, "%s%s", var, "/share/themes/engines"); + } + else + { +- path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/lib/gtk/themes/engines") +1); +- sprintf(path, "%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines"); ++ path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/share/themes/engines") +1); ++ sprintf(path, "%s%s", GTK_EXE_PREFIX, "/share/themes/engines"); + } + return path; + } +@@ -248,13 +252,13 @@ + var = getenv("GTK_DATA_PREFIX"); + if (var) + { +- path = g_malloc(strlen(var) + strlen("/share/gtk/themes") +1); +- sprintf(path, "%s%s", var, "/share/gtk/themes"); ++ path = g_malloc(strlen(var) + strlen("/share/themes") +1); ++ sprintf(path, "%s%s", var, "/share/themes"); + } + else + { +- path = g_malloc(strlen(GTK_DATA_PREFIX) + strlen("/share/gtk/themes") +1); +- sprintf(path, "%s%s", GTK_DATA_PREFIX, "/share/gtk/themes"); ++ path = g_malloc(strlen(GTK_DATA_PREFIX) + strlen("/share/themes") +1); ++ sprintf(path, "%s%s", GTK_DATA_PREFIX, "/share/themes"); + } + + for (n = 0; pixmap_path[n]; n++) ; +@@ -290,13 +294,13 @@ + var = getenv("GTK_EXE_PREFIX"); + if (var) + { +- path = g_malloc(strlen(var) + strlen("/lib/gtk/themes/engines") +1); +- sprintf(path, "%s%s", var, "/lib/gtk/themes/engines"); ++ path = g_malloc(strlen(var) + strlen("/share/themes/engines") +1); ++ sprintf(path, "%s%s", var, "/share/themes/engines"); + } + else + { +- path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/lib/gtk/themes/engines") +1); +- sprintf(path, "%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines"); ++ path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/share/themes/engines") +1); ++ sprintf(path, "%s%s", GTK_EXE_PREFIX, "/share/themes/engines"); + } + module_path[n++] = g_strdup(path); + g_free(path); diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index 4bbc747..8793d69 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/pkg-plist @@ -35,7 +35,6 @@ include/gtk11d/gtk/gtkdebug.h include/gtk11d/gtk/gtkdialog.h include/gtk11d/gtk/gtkdnd.h include/gtk11d/gtk/gtkdrawingarea.h -include/gtk11d/gtk/gtkdrawwindow.h include/gtk11d/gtk/gtkeditable.h include/gtk11d/gtk/gtkentry.h include/gtk11d/gtk/gtkenums.h @@ -58,6 +57,7 @@ include/gtk11d/gtk/gtkhseparator.h include/gtk11d/gtk/gtkimage.h include/gtk11d/gtk/gtkinputdialog.h include/gtk11d/gtk/gtkinvisible.h +include/gtk11d/gtk/gtkintl.h include/gtk11d/gtk/gtkitem.h include/gtk11d/gtk/gtkitemfactory.h include/gtk11d/gtk/gtklabel.h @@ -123,11 +123,11 @@ include/gtk11d/gtk/gtkwindow.h lib/libgdk11d.a lib/libgdk11d.la lib/libgdk11d.so -lib/libgdk11d.so.1 +lib/libgdk11d.so.1.1 lib/libgtk11d.a lib/libgtk11d.la lib/libgtk11d.so -lib/libgtk11d.so.1 +lib/libgtk11d.so.1.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/themes/Default/gtk/gtkrc |
