aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-toolkits/gtk12/Makefile27
-rw-r--r--x11-toolkits/gtk12/distinfo2
-rw-r--r--x11-toolkits/gtk12/files/patch-aa202
-rw-r--r--x11-toolkits/gtk12/files/patch-ab107
-rw-r--r--x11-toolkits/gtk12/pkg-plist270
-rw-r--r--x11-toolkits/gtk13/Makefile27
-rw-r--r--x11-toolkits/gtk13/distinfo2
-rw-r--r--x11-toolkits/gtk13/pkg-plist270
-rw-r--r--x11-toolkits/gtk20/Makefile27
-rw-r--r--x11-toolkits/gtk20/distinfo2
-rw-r--r--x11-toolkits/gtk20/pkg-plist270
-rw-r--r--x11-toolkits/gtk30/Makefile27
-rw-r--r--x11-toolkits/gtk30/distinfo2
-rw-r--r--x11-toolkits/gtk30/pkg-plist270
14 files changed, 728 insertions, 777 deletions
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index b34e46b1e3e3..14026a6f9315 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -1,13 +1,13 @@
-# New ports collection makefile for: gtk
-# Version required: 1.1.2
+# New ports collection makefile for: gtk11-devel
+# Version required: 1.1.7
# Date Created: 28 Sep 1997
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
-# $Id: Makefile,v 1.31 1998/12/10 13:18:16 vanilla Exp $
+# $Id: Makefile,v 1.32 1998/12/10 14:30:28 asami Exp $
#
-DISTNAME= gtk+-1.1.2
-PKGNAME= gtk-1.1.2
+DISTNAME= gtk+-1.1.7
+PKGNAME= gtk-1.1.7
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
@@ -15,24 +15,15 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \
MAINTAINER= vanilla@FreeBSD.ORG
-LIB_DEPENDS= glib11.0:${PORTSDIR}/devel/glib
-
-BROKEN= upgrade
+LIB_DEPENDS= glib11d.1:${PORTSDIR}/devel/glib11-devel
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= INSTALL='$${INSTALL} -c'
-CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk11
-
-MAN1= gtk-config.1
-
-pre-install:
- @if [ ! -f ${PREFIX}/info/dir ]; then \
- ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
- fi
+CONFIGURE_ENV= INSTALL='$${INSTALL} -c' \
+ GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config"
+CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk11d
post-install:
@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
- ${CAT} ${PKGDIR}/MESSAGE
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtk12/distinfo b/x11-toolkits/gtk12/distinfo
index 13bf0800541d..072f73bca142 100644
--- a/x11-toolkits/gtk12/distinfo
+++ b/x11-toolkits/gtk12/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.1.2.tar.gz) = d1abc3deded1a4647b0941c1319130ce
+MD5 (gtk+-1.1.7.tar.gz) = 751cbeb13fb579626b7fec33ff9a10ee
diff --git a/x11-toolkits/gtk12/files/patch-aa b/x11-toolkits/gtk12/files/patch-aa
index ab2df363f765..07dc1262ae58 100644
--- a/x11-toolkits/gtk12/files/patch-aa
+++ b/x11-toolkits/gtk12/files/patch-aa
@@ -1,36 +1,65 @@
---- Makefile.in.orig Tue Sep 22 11:47:07 1998
-+++ Makefile.in Tue Nov 17 22:36:30 1998
-@@ -97,7 +97,7 @@
+--- Makefile.in.orig Fri Dec 11 14:20:23 1998
++++ Makefile.in Sat Dec 12 11:35:00 1998
+@@ -100,9 +100,9 @@
+ xinput_progs = @xinput_progs@
+
SRC_SUBDIRS = gdk gtk
- SUBDIRS = $(SRC_SUBDIRS) docs
+-SUBDIRS = $(SRC_SUBDIRS) docs
++SUBDIRS = $(SRC_SUBDIRS)
-bin_SCRIPTS = gtk-config
-+bin_SCRIPTS = gtk11-config
++bin_SCRIPTS = gtk11d-config
EXTRA_DIST = \
HACKING \
-@@ -179,7 +179,7 @@
+@@ -187,7 +187,7 @@
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = gtk-config
-+CONFIG_CLEAN_FILES = gtk11-config
++CONFIG_CLEAN_FILES = gtk11d-config
SCRIPTS = $(bin_SCRIPTS)
DATA = $(m4data_DATA)
-@@ -232,7 +232,10 @@
+@@ -240,7 +240,10 @@
-rm -f config.h
maintainer-clean-hdr:
-gtk-config: $(top_builddir)/config.status gtk-config.in
-+gtk11-config.in: gtk-config.in
-+ cp gtk-config.in gtk11-config.in
++gtk11d-config.in: gtk-config.in
++ cp gtk-config.in gtk11d-config.in
+
-+gtk11-config: $(top_builddir)/config.status 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)
-@@ -412,7 +415,7 @@
+@@ -262,25 +265,6 @@
+ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+ done
+
+-install-m4dataDATA: $(m4data_DATA)
+- @$(NORMAL_INSTALL)
+- $(mkinstalldirs) $(DESTDIR)$(m4datadir)
+- @list='$(m4data_DATA)'; for p in $$list; do \
+- if test -f $(srcdir)/$$p; then \
+- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(m4datadir)/$$p"; \
+- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(m4datadir)/$$p; \
+- else if test -f $$p; then \
+- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(m4datadir)/$$p"; \
+- $(INSTALL_DATA) $$p $(DESTDIR)$(m4datadir)/$$p; \
+- fi; fi; \
+- done
+-
+-uninstall-m4dataDATA:
+- @$(NORMAL_UNINSTALL)
+- list='$(m4data_DATA)'; for p in $$list; do \
+- rm -f $(DESTDIR)$(m4datadir)/$$p; \
+- done
+-
+ # 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 @@
all-recursive-am: config.h
$(MAKE) all-recursive
@@ -39,8 +68,16 @@
install-exec-am: install-binSCRIPTS
-@@ -426,7 +429,7 @@
- install-data: install-data-recursive install-data-am
+-install-data-am: install-m4dataDATA
+-
+-uninstall-am: uninstall-binSCRIPTS uninstall-m4dataDATA
++uninstall-am: uninstall-binSCRIPTS
+
+ install-exec: install-exec-recursive install-exec-am
+ @$(NORMAL_INSTALL)
+
+-install-data: install-data-recursive install-data-am
++install-data: install-data-recursive
@$(NORMAL_INSTALL)
-install: install-recursive install-exec-am install-data-am
@@ -48,139 +85,170 @@
@:
uninstall: uninstall-recursive uninstall-am
---- gdk/Makefile.in.orig Tue Sep 22 11:47:10 1998
-+++ gdk/Makefile.in Tue Nov 17 22:42:44 1998
-@@ -96,9 +96,9 @@
+@@ -482,15 +464,15 @@
+ -rm -f config.status
+
+ .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
+-uninstall-binSCRIPTS install-binSCRIPTS uninstall-m4dataDATA \
+-install-m4dataDATA install-data-recursive uninstall-data-recursive \
++uninstall-binSCRIPTS install-binSCRIPTS \
++install-data-recursive uninstall-data-recursive \
+ install-exec-recursive uninstall-exec-recursive installdirs-recursive \
+ uninstalldirs-recursive all-recursive check-recursive \
+ installcheck-recursive info-recursive dvi-recursive \
+ mostlyclean-recursive distclean-recursive clean-recursive \
+ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
+ distclean-tags clean-tags maintainer-clean-tags distdir info dvi \
+-installcheck all-recursive-am all-am install-exec-am install-data-am \
++installcheck all-recursive-am all-am install-exec-am \
+ 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 @@
gdkincludedir = $(includedir)/gdk
-lib_LTLIBRARIES = libgdk.la
-+lib_LTLIBRARIES = libgdk11.la
++lib_LTLIBRARIES = libgdk11d.la
+
+ INCLUDES = \
+ -DG_LOG_DOMAIN=\"Gdk\" \
+@@ -113,7 +113,7 @@
+ @GLIB_CFLAGS@ \
+ @x_cflags@
-libgdk_la_SOURCES = \
-+libgdk11_la_SOURCES = \
++libgdk11d_la_SOURCES = \
gdk.c \
gdkcc.c \
gdkcolor.c \
-@@ -140,8 +140,8 @@
+@@ -156,8 +156,8 @@
gdktypes.h \
gdkx.h
-libgdk_la_LDFLAGS = \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \
-+libgdk11_la_LDFLAGS = \
-+ -version-info 1:2:0 \
++libgdk11d_la_LDFLAGS = \
++ -version-info 1:0:0 \
@x_ldflags@ @x_libs@
- INCLUDES = -I$(top_srcdir) @GLIB_CFLAGS@ @x_cflags@
-@@ -174,8 +174,8 @@
+ EXTRA_PROGRAMS = gxid
+@@ -184,8 +184,8 @@
X_LIBS = @X_LIBS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-libgdk_la_LIBADD =
-libgdk_la_OBJECTS = gdk.lo gdkcc.lo gdkcolor.lo gdkcursor.lo gdkdnd.lo \
-+libgdk11_la_LIBADD =
-+libgdk11_la_OBJECTS = gdk.lo gdkcc.lo gdkcolor.lo gdkcursor.lo gdkdnd.lo \
- gdkdraw.lo gdkfont.lo gdkgc.lo gdkglobals.lo gdkimage.lo gdkinput.lo \
- gdkpixmap.lo gdkproperty.lo gdkrgb.lo gdkrectangle.lo gdkregion.lo \
- gdkselection.lo gdkthreads.lo gdkvisual.lo gdkwindow.lo gdkxid.lo \
-@@ -198,8 +198,8 @@
++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 @@
TAR = tar
GZIP = --best
-SOURCES = $(libgdk_la_SOURCES) $(gxid_SOURCES)
-OBJECTS = $(libgdk_la_OBJECTS) $(gxid_OBJECTS)
-+SOURCES = $(libgdk11_la_SOURCES) $(gxid_SOURCES)
-+OBJECTS = $(libgdk11_la_OBJECTS) $(gxid_OBJECTS)
++SOURCES = $(libgdk11d_la_SOURCES) $(gxid_SOURCES)
++OBJECTS = $(libgdk11d_la_OBJECTS) $(gxid_OBJECTS)
all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
-@@ -276,8 +276,8 @@
+@@ -286,8 +286,8 @@
maintainer-clean-libtool:
-libgdk.la: $(libgdk_la_OBJECTS) $(libgdk_la_DEPENDENCIES)
- $(LINK) -rpath $(libdir) $(libgdk_la_LDFLAGS) $(libgdk_la_OBJECTS) $(libgdk_la_LIBADD) $(LIBS)
-+libgdk11.la: $(libgdk11_la_OBJECTS) $(libgdk11_la_DEPENDENCIES)
-+ $(LINK) -rpath $(libdir) $(libgdk11_la_LDFLAGS) $(libgdk11_la_OBJECTS) $(libgdk11_la_LIBADD) $(LIBS)
++libgdk11d.la: $(libgdk11d_la_OBJECTS) $(libgdk11d_la_DEPENDENCIES)
++ $(LINK) -rpath $(libdir) $(libgdk11d_la_LDFLAGS) $(libgdk11d_la_OBJECTS) $(libgdk11d_la_LIBADD) $(LIBS)
mostlyclean-binPROGRAMS:
---- gtk/Makefile.in.orig Tue Sep 22 11:47:15 1998
-+++ gtk/Makefile.in Tue Nov 17 22:43:07 1998
-@@ -98,9 +98,9 @@
+--- 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 @@
gtkincludedir = $(includedir)/gtk
-lib_LTLIBRARIES = libgtk.la
-+lib_LTLIBRARIES = libgtk11.la
++lib_LTLIBRARIES = libgtk11d.la
--libgtk_la_SOURCES = \
-+libgtk11_la_SOURCES = \
+ static_sources = \
gtkaccelgroup.c \
- gtkaccellabel.c \
- gtkadjustment.c \
-@@ -329,8 +329,8 @@
- # special remake rules
- # makeenums.h: @REBUILD@ gtk.h gtkprivate.h
+@@ -214,7 +214,7 @@
+ fnmatch.c \
+ fnmatch.h
+
+-libgtk_la_SOURCES = \
++libgtk11d_la_SOURCES = \
+ $(static_sources) \
+ gtkmarshal.c
+
+@@ -351,8 +351,8 @@
+ ../gdk/gdktypes.h \
+ ../gdk/gdkrgb.h
-libgtk_la_LDFLAGS = \
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libgtk11_la_LDFLAGS = \
-+ -version-info 1:2:0
++libgtk11d_la_LDFLAGS = \
++ -version-info 1:0:0
EXTRA_DIST = \
line-arrow.xbm \
-@@ -367,12 +367,12 @@
- noinst_PROGRAMS = testgtk testinput testselection testthreads testrgb simple
+@@ -400,12 +400,12 @@
+ noinst_PROGRAMS = testgtk testinput testselection testthreads testrgb testdnd simple
DEPS = \
- libgtk.la \
- $(top_builddir)/gdk/libgdk.la
-+ libgtk11.la \
-+ $(top_builddir)/gdk/libgdk11.la
++ libgtk11d.la \
++ $(top_builddir)/gdk/libgdk11d.la
LDADDS = \
- libgtk.la \
- $(top_builddir)/gdk/libgdk.la \
-+ libgtk11.la \
-+ $(top_builddir)/gdk/libgdk11.la \
++ libgtk11d.la \
++ $(top_builddir)/gdk/libgdk11d.la \
@x_ldflags@ \
@x_libs@ \
@GLIB_LIBS@ \
-@@ -405,8 +405,8 @@
+@@ -440,8 +440,8 @@
X_LIBS = @X_LIBS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-libgtk_la_LIBADD =
-libgtk_la_OBJECTS = gtkaccelgroup.lo gtkaccellabel.lo gtkadjustment.lo \
-+libgtk11_la_LIBADD =
-+libgtk11_la_OBJECTS = gtkaccelgroup.lo gtkaccellabel.lo gtkadjustment.lo \
++libgtk11d_la_LIBADD =
++libgtk11d_la_OBJECTS = gtkaccelgroup.lo gtkaccellabel.lo gtkadjustment.lo \
gtkalignment.lo gtkarg.lo gtkarrow.lo gtkaspectframe.lo gtkbin.lo \
- gtkbindings.lo gtkbbox.lo gtkbox.lo gtkbutton.lo gtkcheckbutton.lo \
- gtkcheckmenuitem.lo gtkclist.lo gtkcolorsel.lo gtkcombo.lo \
-@@ -461,10 +461,10 @@
+ gtkbindings.lo gtkbbox.lo gtkbox.lo gtkbutton.lo gtkcalendar.lo \
+ gtkcheckbutton.lo gtkcheckmenuitem.lo gtkclist.lo gtkcolorsel.lo \
+@@ -501,10 +501,10 @@
TAR = tar
GZIP = --best
--SOURCES = $(libgtk_la_SOURCES) testgtk.c testinput.c testselection.c testthreads.c testrgb.c simple.c
--OBJECTS = $(libgtk_la_OBJECTS) testgtk.o testinput.o testselection.o testthreads.o testrgb.o simple.o
-+SOURCES = $(libgtk11_la_SOURCES) testgtk.c testinput.c testselection.c testthreads.c testrgb.c simple.c
-+OBJECTS = $(libgtk11_la_OBJECTS) testgtk.o testinput.o testselection.o testthreads.o testrgb.o simple.o
+-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
-all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
+all: Makefile $(LTLIBRARIES) $(HEADERS)
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .s
-@@ -541,8 +541,8 @@
+@@ -581,8 +581,8 @@
maintainer-clean-libtool:
-libgtk.la: $(libgtk_la_OBJECTS) $(libgtk_la_DEPENDENCIES)
- $(LINK) -rpath $(libdir) $(libgtk_la_LDFLAGS) $(libgtk_la_OBJECTS) $(libgtk_la_LIBADD) $(LIBS)
-+libgtk11.la: $(libgtk11_la_OBJECTS) $(libgtk11_la_DEPENDENCIES)
-+ $(LINK) -rpath $(libdir) $(libgtk11_la_LDFLAGS) $(libgtk11_la_OBJECTS) $(libgtk11_la_LIBADD) $(LIBS)
++libgtk11d.la: $(libgtk11d_la_OBJECTS) $(libgtk11d_la_DEPENDENCIES)
++ $(LINK) -rpath $(libdir) $(libgtk11d_la_LDFLAGS) $(libgtk11d_la_OBJECTS) $(libgtk11d_la_LIBADD) $(LIBS)
mostlyclean-noinstPROGRAMS:
diff --git a/x11-toolkits/gtk12/files/patch-ab b/x11-toolkits/gtk12/files/patch-ab
index 7587411b1dab..ba04baf37278 100644
--- a/x11-toolkits/gtk12/files/patch-ab
+++ b/x11-toolkits/gtk12/files/patch-ab
@@ -1,11 +1,11 @@
---- gtk-config.in.orig Sat Sep 19 14:38:07 1998
-+++ gtk-config.in Tue Sep 22 22:47:02 1998
+--- gtk-config.in.orig Mon Nov 2 16:41:19 1998
++++ gtk-config.in Fri Dec 11 21:42:44 1998
@@ -8,7 +8,7 @@
exec_prefix_set=no
usage="\
-Usage: gtk-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
-+Usage: gtk11-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
++Usage: gtk11d-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
if test $# -eq 0; then
echo "${usage}" 1>&2
@@ -13,105 +13,8 @@
fi
fi
done
-- echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @x_libs@ -lm
-+ echo $libdirs @x_ldflags@ -lgtk11 -lgdk11 $my_glib_libs @x_libs@ -lm
+- 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 "${usage}" 1>&2
---- gtk.m4.orig Tue Sep 15 09:55:52 1998
-+++ gtk.m4 Tue Sep 22 22:46:00 1998
-@@ -6,7 +6,7 @@
- dnl
- AC_DEFUN(AM_PATH_GTK,
- [dnl
--dnl Get the cflags and libraries from the gtk-config script
-+dnl Get the cflags and libraries from the gtk11-config script
- dnl
- AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)],
- gtk_config_prefix="$withval", gtk_config_prefix="")
-@@ -18,17 +18,17 @@
- if test x$gtk_config_exec_prefix != x ; then
- gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
- if test x${GTK_CONFIG+set} != xset ; then
-- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk11-config
- fi
- fi
- if test x$gtk_config_prefix != x ; then
- gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
- if test x${GTK_CONFIG+set} != xset ; then
-- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-+ GTK_CONFIG=$gtk_config_prefix/bin/gtk11-config
- fi
- fi
-
-- AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
-+ AC_PATH_PROG(GTK_CONFIG, gtk11-config, no)
- min_gtk_version=ifelse([$1], ,0.99.7,$1)
- AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
- no_gtk=""
-@@ -50,7 +50,7 @@
- LIBS="$LIBS $GTK_LIBS"
- dnl
- dnl Now check if the installed GTK is sufficiently new. (Also sanity
--dnl checks the results of gtk-config to some extent
-+dnl checks the results of gtk11-config to some extent
- dnl
- rm -f conf.gtktest
- AC_TRY_RUN([
-@@ -77,16 +77,16 @@
- (gtk_minor_version != $gtk_config_minor_version) ||
- (gtk_micro_version != $gtk_config_micro_version))
- {
-- printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
-+ printf("\n*** 'gtk11-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
- $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
- gtk_major_version, gtk_minor_version, gtk_micro_version);
-- printf ("*** was found! If gtk-config was correct, then it is best\n");
-+ printf ("*** was found! If gtk11-config was correct, then it is best\n");
- printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
- printf("*** required on your system.\n");
-- printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
-- printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
-+ printf("*** If gtk11-config was wrong, set the environment variable GTK_CONFIG\n");
-+ printf("*** to point to the correct copy of gtk11-config, and remove the file config.cache\n");
- printf("*** before re-running configure\n");
- }
- #if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
-@@ -117,10 +117,10 @@
- printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
- printf("***\n");
- printf("*** If you have already installed a sufficiently new version, this error\n");
-- printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
-+ printf("*** probably means that the wrong copy of the gtk11-config shell script is\n");
- printf("*** being found. The easiest way to fix this is to remove the old version\n");
- printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
-- printf("*** correct copy of gtk-config. (In this case, you will have to\n");
-+ printf("*** correct copy of gtk11-config. (In this case, you will have to\n");
- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
- printf("*** so that the correct libraries are found at run-time))\n");
- }
-@@ -138,10 +138,10 @@
- else
- AC_MSG_RESULT(no)
- if test "$GTK_CONFIG" = "no" ; then
-- echo "*** The gtk-config script installed by GTK could not be found"
-+ echo "*** The gtk11-config script installed by GTK could not be found"
- echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
- echo "*** your path, or set the GTK_CONFIG environment variable to the"
-- echo "*** full path to gtk-config."
-+ echo "*** full path to gtk11-config."
- else
- if test -f conf.gtktest ; then
- :
-@@ -170,7 +170,7 @@
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means GTK was incorrectly installed"
- echo "*** or that you have moved GTK since it was installed. In the latter case, you"
-- echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
-+ echo "*** may want to edit the gtk11-config script: $GTK_CONFIG" ])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist
index a2e5b964889f..4bbc747f9bf4 100644
--- a/x11-toolkits/gtk12/pkg-plist
+++ b/x11-toolkits/gtk12/pkg-plist
@@ -1,135 +1,139 @@
-bin/gtk11-config
-include/gtk11/gdk/gdk.h
-include/gtk11/gdk/gdkcursors.h
-include/gtk11/gdk/gdki18n.h
-include/gtk11/gdk/gdkkeysyms.h
-include/gtk11/gdk/gdkprivate.h
-include/gtk11/gdk/gdkrgb.h
-include/gtk11/gdk/gdktypes.h
-include/gtk11/gdk/gdkx.h
-include/gtk11/gtk/gtk.h
-include/gtk11/gtk/gtkaccelgroup.h
-include/gtk11/gtk/gtkaccellabel.h
-include/gtk11/gtk/gtkadjustment.h
-include/gtk11/gtk/gtkalignment.h
-include/gtk11/gtk/gtkarg.h
-include/gtk11/gtk/gtkarrow.h
-include/gtk11/gtk/gtkaspectframe.h
-include/gtk11/gtk/gtkbbox.h
-include/gtk11/gtk/gtkbin.h
-include/gtk11/gtk/gtkbindings.h
-include/gtk11/gtk/gtkbox.h
-include/gtk11/gtk/gtkbutton.h
-include/gtk11/gtk/gtkcheckbutton.h
-include/gtk11/gtk/gtkcheckmenuitem.h
-include/gtk11/gtk/gtkclist.h
-include/gtk11/gtk/gtkcolorsel.h
-include/gtk11/gtk/gtkcombo.h
-include/gtk11/gtk/gtkcontainer.h
-include/gtk11/gtk/gtkctree.h
-include/gtk11/gtk/gtkcurve.h
-include/gtk11/gtk/gtkdata.h
-include/gtk11/gtk/gtkdebug.h
-include/gtk11/gtk/gtkdialog.h
-include/gtk11/gtk/gtkdrawingarea.h
-include/gtk11/gtk/gtkeditable.h
-include/gtk11/gtk/gtkentry.h
-include/gtk11/gtk/gtkenums.h
-include/gtk11/gtk/gtkeventbox.h
-include/gtk11/gtk/gtkfeatures.h
-include/gtk11/gtk/gtkfilesel.h
-include/gtk11/gtk/gtkfixed.h
-include/gtk11/gtk/gtkfontsel.h
-include/gtk11/gtk/gtkframe.h
-include/gtk11/gtk/gtkgamma.h
-include/gtk11/gtk/gtkgc.h
-include/gtk11/gtk/gtkhandlebox.h
-include/gtk11/gtk/gtkhbbox.h
-include/gtk11/gtk/gtkhbox.h
-include/gtk11/gtk/gtkhpaned.h
-include/gtk11/gtk/gtkhruler.h
-include/gtk11/gtk/gtkhscale.h
-include/gtk11/gtk/gtkhscrollbar.h
-include/gtk11/gtk/gtkhseparator.h
-include/gtk11/gtk/gtkimage.h
-include/gtk11/gtk/gtkinputdialog.h
-include/gtk11/gtk/gtkitem.h
-include/gtk11/gtk/gtkitemfactory.h
-include/gtk11/gtk/gtklabel.h
-include/gtk11/gtk/gtklist.h
-include/gtk11/gtk/gtklistitem.h
-include/gtk11/gtk/gtkmain.h
-include/gtk11/gtk/gtkmarshal.h
-include/gtk11/gtk/gtkmenu.h
-include/gtk11/gtk/gtkmenubar.h
-include/gtk11/gtk/gtkmenufactory.h
-include/gtk11/gtk/gtkmenuitem.h
-include/gtk11/gtk/gtkmenushell.h
-include/gtk11/gtk/gtkmisc.h
-include/gtk11/gtk/gtknotebook.h
-include/gtk11/gtk/gtkobject.h
-include/gtk11/gtk/gtkoptionmenu.h
-include/gtk11/gtk/gtkpacker.h
-include/gtk11/gtk/gtkpaned.h
-include/gtk11/gtk/gtkpixmap.h
-include/gtk11/gtk/gtkpreview.h
-include/gtk11/gtk/gtkprivate.h
-include/gtk11/gtk/gtkprogress.h
-include/gtk11/gtk/gtkprogressbar.h
-include/gtk11/gtk/gtkradiobutton.h
-include/gtk11/gtk/gtkradiomenuitem.h
-include/gtk11/gtk/gtkrange.h
-include/gtk11/gtk/gtkrc.h
-include/gtk11/gtk/gtkruler.h
-include/gtk11/gtk/gtkscale.h
-include/gtk11/gtk/gtkscrollbar.h
-include/gtk11/gtk/gtkscrolledwindow.h
-include/gtk11/gtk/gtkselection.h
-include/gtk11/gtk/gtkseparator.h
-include/gtk11/gtk/gtksignal.h
-include/gtk11/gtk/gtkspinbutton.h
-include/gtk11/gtk/gtkstatusbar.h
-include/gtk11/gtk/gtkstyle.h
-include/gtk11/gtk/gtktable.h
-include/gtk11/gtk/gtktearoffmenuitem.h
-include/gtk11/gtk/gtktext.h
-include/gtk11/gtk/gtktipsquery.h
-include/gtk11/gtk/gtktogglebutton.h
-include/gtk11/gtk/gtktoolbar.h
-include/gtk11/gtk/gtktooltips.h
-include/gtk11/gtk/gtktree.h
-include/gtk11/gtk/gtktreeitem.h
-include/gtk11/gtk/gtktypebuiltins.h
-include/gtk11/gtk/gtktypeutils.h
-include/gtk11/gtk/gtkvbbox.h
-include/gtk11/gtk/gtkvbox.h
-include/gtk11/gtk/gtkviewport.h
-include/gtk11/gtk/gtkvpaned.h
-include/gtk11/gtk/gtkvruler.h
-include/gtk11/gtk/gtkvscale.h
-include/gtk11/gtk/gtkvscrollbar.h
-include/gtk11/gtk/gtkvseparator.h
-include/gtk11/gtk/gtkwidget.h
-include/gtk11/gtk/gtkwindow.h
-@unexec install-info --delete %D/info/glib.info %D/info/dir
-@unexec install-info --delete %D/info/gdk.info %D/info/dir
-@unexec install-info --delete %D/info/gtk.info %D/info/dir
-info/gdk.info
-info/gtk.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
-@exec install-info %D/info/glib.info %D/info/dir
-@exec install-info %D/info/gdk.info %D/info/dir
-@exec install-info %D/info/gtk.info %D/info/dir
-lib/libgdk11.a
-lib/libgdk11.la
-lib/libgdk11.so
-lib/libgdk11.so.1.2
-lib/libgtk11.a
-lib/libgtk11.la
-lib/libgtk11.so
-lib/libgtk11.so.1.2
+bin/gtk11d-config
+include/gtk11d/gdk/gdk.h
+include/gtk11d/gdk/gdkcursors.h
+include/gtk11d/gdk/gdki18n.h
+include/gtk11d/gdk/gdkkeysyms.h
+include/gtk11d/gdk/gdkprivate.h
+include/gtk11d/gdk/gdkrgb.h
+include/gtk11d/gdk/gdktypes.h
+include/gtk11d/gdk/gdkx.h
+include/gtk11d/gtk/gtk.h
+include/gtk11d/gtk/gtkaccelgroup.h
+include/gtk11d/gtk/gtkaccellabel.h
+include/gtk11d/gtk/gtkadjustment.h
+include/gtk11d/gtk/gtkalignment.h
+include/gtk11d/gtk/gtkarg.h
+include/gtk11d/gtk/gtkarrow.h
+include/gtk11d/gtk/gtkaspectframe.h
+include/gtk11d/gtk/gtkbbox.h
+include/gtk11d/gtk/gtkbin.h
+include/gtk11d/gtk/gtkbindings.h
+include/gtk11d/gtk/gtkbox.h
+include/gtk11d/gtk/gtkbutton.h
+include/gtk11d/gtk/gtkcalendar.h
+include/gtk11d/gtk/gtkcheckbutton.h
+include/gtk11d/gtk/gtkcheckmenuitem.h
+include/gtk11d/gtk/gtkclist.h
+include/gtk11d/gtk/gtkcolorsel.h
+include/gtk11d/gtk/gtkcombo.h
+include/gtk11d/gtk/gtkcompat.h
+include/gtk11d/gtk/gtkcontainer.h
+include/gtk11d/gtk/gtkctree.h
+include/gtk11d/gtk/gtkcurve.h
+include/gtk11d/gtk/gtkdata.h
+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
+include/gtk11d/gtk/gtkeventbox.h
+include/gtk11d/gtk/gtkfeatures.h
+include/gtk11d/gtk/gtkfilesel.h
+include/gtk11d/gtk/gtkfixed.h
+include/gtk11d/gtk/gtkfontsel.h
+include/gtk11d/gtk/gtkframe.h
+include/gtk11d/gtk/gtkgamma.h
+include/gtk11d/gtk/gtkgc.h
+include/gtk11d/gtk/gtkhandlebox.h
+include/gtk11d/gtk/gtkhbbox.h
+include/gtk11d/gtk/gtkhbox.h
+include/gtk11d/gtk/gtkhpaned.h
+include/gtk11d/gtk/gtkhruler.h
+include/gtk11d/gtk/gtkhscale.h
+include/gtk11d/gtk/gtkhscrollbar.h
+include/gtk11d/gtk/gtkhseparator.h
+include/gtk11d/gtk/gtkimage.h
+include/gtk11d/gtk/gtkinputdialog.h
+include/gtk11d/gtk/gtkinvisible.h
+include/gtk11d/gtk/gtkitem.h
+include/gtk11d/gtk/gtkitemfactory.h
+include/gtk11d/gtk/gtklabel.h
+include/gtk11d/gtk/gtklayout.h
+include/gtk11d/gtk/gtklist.h
+include/gtk11d/gtk/gtklistitem.h
+include/gtk11d/gtk/gtkmain.h
+include/gtk11d/gtk/gtkmarshal.h
+include/gtk11d/gtk/gtkmenu.h
+include/gtk11d/gtk/gtkmenubar.h
+include/gtk11d/gtk/gtkmenufactory.h
+include/gtk11d/gtk/gtkmenuitem.h
+include/gtk11d/gtk/gtkmenushell.h
+include/gtk11d/gtk/gtkmisc.h
+include/gtk11d/gtk/gtknotebook.h
+include/gtk11d/gtk/gtkobject.h
+include/gtk11d/gtk/gtkoptionmenu.h
+include/gtk11d/gtk/gtkpacker.h
+include/gtk11d/gtk/gtkpaned.h
+include/gtk11d/gtk/gtkpixmap.h
+include/gtk11d/gtk/gtkplug.h
+include/gtk11d/gtk/gtkpreview.h
+include/gtk11d/gtk/gtkprivate.h
+include/gtk11d/gtk/gtkprogress.h
+include/gtk11d/gtk/gtkprogressbar.h
+include/gtk11d/gtk/gtkradiobutton.h
+include/gtk11d/gtk/gtkradiomenuitem.h
+include/gtk11d/gtk/gtkrange.h
+include/gtk11d/gtk/gtkrc.h
+include/gtk11d/gtk/gtkruler.h
+include/gtk11d/gtk/gtkscale.h
+include/gtk11d/gtk/gtkscrollbar.h
+include/gtk11d/gtk/gtkscrolledwindow.h
+include/gtk11d/gtk/gtkselection.h
+include/gtk11d/gtk/gtkseparator.h
+include/gtk11d/gtk/gtksignal.h
+include/gtk11d/gtk/gtksocket.h
+include/gtk11d/gtk/gtkspinbutton.h
+include/gtk11d/gtk/gtkstatusbar.h
+include/gtk11d/gtk/gtkstyle.h
+include/gtk11d/gtk/gtktable.h
+include/gtk11d/gtk/gtktearoffmenuitem.h
+include/gtk11d/gtk/gtktext.h
+include/gtk11d/gtk/gtkthemes.h
+include/gtk11d/gtk/gtktipsquery.h
+include/gtk11d/gtk/gtktogglebutton.h
+include/gtk11d/gtk/gtktoolbar.h
+include/gtk11d/gtk/gtktooltips.h
+include/gtk11d/gtk/gtktree.h
+include/gtk11d/gtk/gtktreeitem.h
+include/gtk11d/gtk/gtktypebuiltins.h
+include/gtk11d/gtk/gtktypeutils.h
+include/gtk11d/gtk/gtkvbbox.h
+include/gtk11d/gtk/gtkvbox.h
+include/gtk11d/gtk/gtkviewport.h
+include/gtk11d/gtk/gtkvpaned.h
+include/gtk11d/gtk/gtkvruler.h
+include/gtk11d/gtk/gtkvscale.h
+include/gtk11d/gtk/gtkvscrollbar.h
+include/gtk11d/gtk/gtkvseparator.h
+include/gtk11d/gtk/gtkwidget.h
+include/gtk11d/gtk/gtkwindow.h
+lib/libgdk11d.a
+lib/libgdk11d.la
+lib/libgdk11d.so
+lib/libgdk11d.so.1
+lib/libgtk11d.a
+lib/libgtk11d.la
+lib/libgtk11d.so
+lib/libgtk11d.so.1
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@dirrm include/gtk11/gdk
-@dirrm include/gtk11/gtk
-@dirrm include/gtk11
+share/themes/Default/gtk/gtkrc
+@dirrm share/themes/Default/gtk
+@dirrm share/themes/Default
+@dirrm share/themes
+@dirrm include/gtk11d/gdk
+@dirrm include/gtk11d/gtk
+@dirrm include/gtk11d
diff --git a/x11-toolkits/gtk13/Makefile b/x11-toolkits/gtk13/Makefile
index b34e46b1e3e3..14026a6f9315 100644
--- a/x11-toolkits/gtk13/Makefile
+++ b/x11-toolkits/gtk13/Makefile
@@ -1,13 +1,13 @@
-# New ports collection makefile for: gtk
-# Version required: 1.1.2
+# New ports collection makefile for: gtk11-devel
+# Version required: 1.1.7
# Date Created: 28 Sep 1997
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
-# $Id: Makefile,v 1.31 1998/12/10 13:18:16 vanilla Exp $
+# $Id: Makefile,v 1.32 1998/12/10 14:30:28 asami Exp $
#
-DISTNAME= gtk+-1.1.2
-PKGNAME= gtk-1.1.2
+DISTNAME= gtk+-1.1.7
+PKGNAME= gtk-1.1.7
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
@@ -15,24 +15,15 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \
MAINTAINER= vanilla@FreeBSD.ORG
-LIB_DEPENDS= glib11.0:${PORTSDIR}/devel/glib
-
-BROKEN= upgrade
+LIB_DEPENDS= glib11d.1:${PORTSDIR}/devel/glib11-devel
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= INSTALL='$${INSTALL} -c'
-CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk11
-
-MAN1= gtk-config.1
-
-pre-install:
- @if [ ! -f ${PREFIX}/info/dir ]; then \
- ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
- fi
+CONFIGURE_ENV= INSTALL='$${INSTALL} -c' \
+ GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config"
+CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk11d
post-install:
@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
- ${CAT} ${PKGDIR}/MESSAGE
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtk13/distinfo b/x11-toolkits/gtk13/distinfo
index 13bf0800541d..072f73bca142 100644
--- a/x11-toolkits/gtk13/distinfo
+++ b/x11-toolkits/gtk13/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.1.2.tar.gz) = d1abc3deded1a4647b0941c1319130ce
+MD5 (gtk+-1.1.7.tar.gz) = 751cbeb13fb579626b7fec33ff9a10ee
diff --git a/x11-toolkits/gtk13/pkg-plist b/x11-toolkits/gtk13/pkg-plist
index a2e5b964889f..4bbc747f9bf4 100644
--- a/x11-toolkits/gtk13/pkg-plist
+++ b/x11-toolkits/gtk13/pkg-plist
@@ -1,135 +1,139 @@
-bin/gtk11-config
-include/gtk11/gdk/gdk.h
-include/gtk11/gdk/gdkcursors.h
-include/gtk11/gdk/gdki18n.h
-include/gtk11/gdk/gdkkeysyms.h
-include/gtk11/gdk/gdkprivate.h
-include/gtk11/gdk/gdkrgb.h
-include/gtk11/gdk/gdktypes.h
-include/gtk11/gdk/gdkx.h
-include/gtk11/gtk/gtk.h
-include/gtk11/gtk/gtkaccelgroup.h
-include/gtk11/gtk/gtkaccellabel.h
-include/gtk11/gtk/gtkadjustment.h
-include/gtk11/gtk/gtkalignment.h
-include/gtk11/gtk/gtkarg.h
-include/gtk11/gtk/gtkarrow.h
-include/gtk11/gtk/gtkaspectframe.h
-include/gtk11/gtk/gtkbbox.h
-include/gtk11/gtk/gtkbin.h
-include/gtk11/gtk/gtkbindings.h
-include/gtk11/gtk/gtkbox.h
-include/gtk11/gtk/gtkbutton.h
-include/gtk11/gtk/gtkcheckbutton.h
-include/gtk11/gtk/gtkcheckmenuitem.h
-include/gtk11/gtk/gtkclist.h
-include/gtk11/gtk/gtkcolorsel.h
-include/gtk11/gtk/gtkcombo.h
-include/gtk11/gtk/gtkcontainer.h
-include/gtk11/gtk/gtkctree.h
-include/gtk11/gtk/gtkcurve.h
-include/gtk11/gtk/gtkdata.h
-include/gtk11/gtk/gtkdebug.h
-include/gtk11/gtk/gtkdialog.h
-include/gtk11/gtk/gtkdrawingarea.h
-include/gtk11/gtk/gtkeditable.h
-include/gtk11/gtk/gtkentry.h
-include/gtk11/gtk/gtkenums.h
-include/gtk11/gtk/gtkeventbox.h
-include/gtk11/gtk/gtkfeatures.h
-include/gtk11/gtk/gtkfilesel.h
-include/gtk11/gtk/gtkfixed.h
-include/gtk11/gtk/gtkfontsel.h
-include/gtk11/gtk/gtkframe.h
-include/gtk11/gtk/gtkgamma.h
-include/gtk11/gtk/gtkgc.h
-include/gtk11/gtk/gtkhandlebox.h
-include/gtk11/gtk/gtkhbbox.h
-include/gtk11/gtk/gtkhbox.h
-include/gtk11/gtk/gtkhpaned.h
-include/gtk11/gtk/gtkhruler.h
-include/gtk11/gtk/gtkhscale.h
-include/gtk11/gtk/gtkhscrollbar.h
-include/gtk11/gtk/gtkhseparator.h
-include/gtk11/gtk/gtkimage.h
-include/gtk11/gtk/gtkinputdialog.h
-include/gtk11/gtk/gtkitem.h
-include/gtk11/gtk/gtkitemfactory.h
-include/gtk11/gtk/gtklabel.h
-include/gtk11/gtk/gtklist.h
-include/gtk11/gtk/gtklistitem.h
-include/gtk11/gtk/gtkmain.h
-include/gtk11/gtk/gtkmarshal.h
-include/gtk11/gtk/gtkmenu.h
-include/gtk11/gtk/gtkmenubar.h
-include/gtk11/gtk/gtkmenufactory.h
-include/gtk11/gtk/gtkmenuitem.h
-include/gtk11/gtk/gtkmenushell.h
-include/gtk11/gtk/gtkmisc.h
-include/gtk11/gtk/gtknotebook.h
-include/gtk11/gtk/gtkobject.h
-include/gtk11/gtk/gtkoptionmenu.h
-include/gtk11/gtk/gtkpacker.h
-include/gtk11/gtk/gtkpaned.h
-include/gtk11/gtk/gtkpixmap.h
-include/gtk11/gtk/gtkpreview.h
-include/gtk11/gtk/gtkprivate.h
-include/gtk11/gtk/gtkprogress.h
-include/gtk11/gtk/gtkprogressbar.h
-include/gtk11/gtk/gtkradiobutton.h
-include/gtk11/gtk/gtkradiomenuitem.h
-include/gtk11/gtk/gtkrange.h
-include/gtk11/gtk/gtkrc.h
-include/gtk11/gtk/gtkruler.h
-include/gtk11/gtk/gtkscale.h
-include/gtk11/gtk/gtkscrollbar.h
-include/gtk11/gtk/gtkscrolledwindow.h
-include/gtk11/gtk/gtkselection.h
-include/gtk11/gtk/gtkseparator.h
-include/gtk11/gtk/gtksignal.h
-include/gtk11/gtk/gtkspinbutton.h
-include/gtk11/gtk/gtkstatusbar.h
-include/gtk11/gtk/gtkstyle.h
-include/gtk11/gtk/gtktable.h
-include/gtk11/gtk/gtktearoffmenuitem.h
-include/gtk11/gtk/gtktext.h
-include/gtk11/gtk/gtktipsquery.h
-include/gtk11/gtk/gtktogglebutton.h
-include/gtk11/gtk/gtktoolbar.h
-include/gtk11/gtk/gtktooltips.h
-include/gtk11/gtk/gtktree.h
-include/gtk11/gtk/gtktreeitem.h
-include/gtk11/gtk/gtktypebuiltins.h
-include/gtk11/gtk/gtktypeutils.h
-include/gtk11/gtk/gtkvbbox.h
-include/gtk11/gtk/gtkvbox.h
-include/gtk11/gtk/gtkviewport.h
-include/gtk11/gtk/gtkvpaned.h
-include/gtk11/gtk/gtkvruler.h
-include/gtk11/gtk/gtkvscale.h
-include/gtk11/gtk/gtkvscrollbar.h
-include/gtk11/gtk/gtkvseparator.h
-include/gtk11/gtk/gtkwidget.h
-include/gtk11/gtk/gtkwindow.h
-@unexec install-info --delete %D/info/glib.info %D/info/dir
-@unexec install-info --delete %D/info/gdk.info %D/info/dir
-@unexec install-info --delete %D/info/gtk.info %D/info/dir
-info/gdk.info
-info/gtk.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
-@exec install-info %D/info/glib.info %D/info/dir
-@exec install-info %D/info/gdk.info %D/info/dir
-@exec install-info %D/info/gtk.info %D/info/dir
-lib/libgdk11.a
-lib/libgdk11.la
-lib/libgdk11.so
-lib/libgdk11.so.1.2
-lib/libgtk11.a
-lib/libgtk11.la
-lib/libgtk11.so
-lib/libgtk11.so.1.2
+bin/gtk11d-config
+include/gtk11d/gdk/gdk.h
+include/gtk11d/gdk/gdkcursors.h
+include/gtk11d/gdk/gdki18n.h
+include/gtk11d/gdk/gdkkeysyms.h
+include/gtk11d/gdk/gdkprivate.h
+include/gtk11d/gdk/gdkrgb.h
+include/gtk11d/gdk/gdktypes.h
+include/gtk11d/gdk/gdkx.h
+include/gtk11d/gtk/gtk.h
+include/gtk11d/gtk/gtkaccelgroup.h
+include/gtk11d/gtk/gtkaccellabel.h
+include/gtk11d/gtk/gtkadjustment.h
+include/gtk11d/gtk/gtkalignment.h
+include/gtk11d/gtk/gtkarg.h
+include/gtk11d/gtk/gtkarrow.h
+include/gtk11d/gtk/gtkaspectframe.h
+include/gtk11d/gtk/gtkbbox.h
+include/gtk11d/gtk/gtkbin.h
+include/gtk11d/gtk/gtkbindings.h
+include/gtk11d/gtk/gtkbox.h
+include/gtk11d/gtk/gtkbutton.h
+include/gtk11d/gtk/gtkcalendar.h
+include/gtk11d/gtk/gtkcheckbutton.h
+include/gtk11d/gtk/gtkcheckmenuitem.h
+include/gtk11d/gtk/gtkclist.h
+include/gtk11d/gtk/gtkcolorsel.h
+include/gtk11d/gtk/gtkcombo.h
+include/gtk11d/gtk/gtkcompat.h
+include/gtk11d/gtk/gtkcontainer.h
+include/gtk11d/gtk/gtkctree.h
+include/gtk11d/gtk/gtkcurve.h
+include/gtk11d/gtk/gtkdata.h
+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
+include/gtk11d/gtk/gtkeventbox.h
+include/gtk11d/gtk/gtkfeatures.h
+include/gtk11d/gtk/gtkfilesel.h
+include/gtk11d/gtk/gtkfixed.h
+include/gtk11d/gtk/gtkfontsel.h
+include/gtk11d/gtk/gtkframe.h
+include/gtk11d/gtk/gtkgamma.h
+include/gtk11d/gtk/gtkgc.h
+include/gtk11d/gtk/gtkhandlebox.h
+include/gtk11d/gtk/gtkhbbox.h
+include/gtk11d/gtk/gtkhbox.h
+include/gtk11d/gtk/gtkhpaned.h
+include/gtk11d/gtk/gtkhruler.h
+include/gtk11d/gtk/gtkhscale.h
+include/gtk11d/gtk/gtkhscrollbar.h
+include/gtk11d/gtk/gtkhseparator.h
+include/gtk11d/gtk/gtkimage.h
+include/gtk11d/gtk/gtkinputdialog.h
+include/gtk11d/gtk/gtkinvisible.h
+include/gtk11d/gtk/gtkitem.h
+include/gtk11d/gtk/gtkitemfactory.h
+include/gtk11d/gtk/gtklabel.h
+include/gtk11d/gtk/gtklayout.h
+include/gtk11d/gtk/gtklist.h
+include/gtk11d/gtk/gtklistitem.h
+include/gtk11d/gtk/gtkmain.h
+include/gtk11d/gtk/gtkmarshal.h
+include/gtk11d/gtk/gtkmenu.h
+include/gtk11d/gtk/gtkmenubar.h
+include/gtk11d/gtk/gtkmenufactory.h
+include/gtk11d/gtk/gtkmenuitem.h
+include/gtk11d/gtk/gtkmenushell.h
+include/gtk11d/gtk/gtkmisc.h
+include/gtk11d/gtk/gtknotebook.h
+include/gtk11d/gtk/gtkobject.h
+include/gtk11d/gtk/gtkoptionmenu.h
+include/gtk11d/gtk/gtkpacker.h
+include/gtk11d/gtk/gtkpaned.h
+include/gtk11d/gtk/gtkpixmap.h
+include/gtk11d/gtk/gtkplug.h
+include/gtk11d/gtk/gtkpreview.h
+include/gtk11d/gtk/gtkprivate.h
+include/gtk11d/gtk/gtkprogress.h
+include/gtk11d/gtk/gtkprogressbar.h
+include/gtk11d/gtk/gtkradiobutton.h
+include/gtk11d/gtk/gtkradiomenuitem.h
+include/gtk11d/gtk/gtkrange.h
+include/gtk11d/gtk/gtkrc.h
+include/gtk11d/gtk/gtkruler.h
+include/gtk11d/gtk/gtkscale.h
+include/gtk11d/gtk/gtkscrollbar.h
+include/gtk11d/gtk/gtkscrolledwindow.h
+include/gtk11d/gtk/gtkselection.h
+include/gtk11d/gtk/gtkseparator.h
+include/gtk11d/gtk/gtksignal.h
+include/gtk11d/gtk/gtksocket.h
+include/gtk11d/gtk/gtkspinbutton.h
+include/gtk11d/gtk/gtkstatusbar.h
+include/gtk11d/gtk/gtkstyle.h
+include/gtk11d/gtk/gtktable.h
+include/gtk11d/gtk/gtktearoffmenuitem.h
+include/gtk11d/gtk/gtktext.h
+include/gtk11d/gtk/gtkthemes.h
+include/gtk11d/gtk/gtktipsquery.h
+include/gtk11d/gtk/gtktogglebutton.h
+include/gtk11d/gtk/gtktoolbar.h
+include/gtk11d/gtk/gtktooltips.h
+include/gtk11d/gtk/gtktree.h
+include/gtk11d/gtk/gtktreeitem.h
+include/gtk11d/gtk/gtktypebuiltins.h
+include/gtk11d/gtk/gtktypeutils.h
+include/gtk11d/gtk/gtkvbbox.h
+include/gtk11d/gtk/gtkvbox.h
+include/gtk11d/gtk/gtkviewport.h
+include/gtk11d/gtk/gtkvpaned.h
+include/gtk11d/gtk/gtkvruler.h
+include/gtk11d/gtk/gtkvscale.h
+include/gtk11d/gtk/gtkvscrollbar.h
+include/gtk11d/gtk/gtkvseparator.h
+include/gtk11d/gtk/gtkwidget.h
+include/gtk11d/gtk/gtkwindow.h
+lib/libgdk11d.a
+lib/libgdk11d.la
+lib/libgdk11d.so
+lib/libgdk11d.so.1
+lib/libgtk11d.a
+lib/libgtk11d.la
+lib/libgtk11d.so
+lib/libgtk11d.so.1
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@dirrm include/gtk11/gdk
-@dirrm include/gtk11/gtk
-@dirrm include/gtk11
+share/themes/Default/gtk/gtkrc
+@dirrm share/themes/Default/gtk
+@dirrm share/themes/Default
+@dirrm share/themes
+@dirrm include/gtk11d/gdk
+@dirrm include/gtk11d/gtk
+@dirrm include/gtk11d
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index b34e46b1e3e3..14026a6f9315 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -1,13 +1,13 @@
-# New ports collection makefile for: gtk
-# Version required: 1.1.2
+# New ports collection makefile for: gtk11-devel
+# Version required: 1.1.7
# Date Created: 28 Sep 1997
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
-# $Id: Makefile,v 1.31 1998/12/10 13:18:16 vanilla Exp $
+# $Id: Makefile,v 1.32 1998/12/10 14:30:28 asami Exp $
#
-DISTNAME= gtk+-1.1.2
-PKGNAME= gtk-1.1.2
+DISTNAME= gtk+-1.1.7
+PKGNAME= gtk-1.1.7
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
@@ -15,24 +15,15 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \
MAINTAINER= vanilla@FreeBSD.ORG
-LIB_DEPENDS= glib11.0:${PORTSDIR}/devel/glib
-
-BROKEN= upgrade
+LIB_DEPENDS= glib11d.1:${PORTSDIR}/devel/glib11-devel
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= INSTALL='$${INSTALL} -c'
-CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk11
-
-MAN1= gtk-config.1
-
-pre-install:
- @if [ ! -f ${PREFIX}/info/dir ]; then \
- ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
- fi
+CONFIGURE_ENV= INSTALL='$${INSTALL} -c' \
+ GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config"
+CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk11d
post-install:
@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
- ${CAT} ${PKGDIR}/MESSAGE
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index 13bf0800541d..072f73bca142 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.1.2.tar.gz) = d1abc3deded1a4647b0941c1319130ce
+MD5 (gtk+-1.1.7.tar.gz) = 751cbeb13fb579626b7fec33ff9a10ee
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index a2e5b964889f..4bbc747f9bf4 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -1,135 +1,139 @@
-bin/gtk11-config
-include/gtk11/gdk/gdk.h
-include/gtk11/gdk/gdkcursors.h
-include/gtk11/gdk/gdki18n.h
-include/gtk11/gdk/gdkkeysyms.h
-include/gtk11/gdk/gdkprivate.h
-include/gtk11/gdk/gdkrgb.h
-include/gtk11/gdk/gdktypes.h
-include/gtk11/gdk/gdkx.h
-include/gtk11/gtk/gtk.h
-include/gtk11/gtk/gtkaccelgroup.h
-include/gtk11/gtk/gtkaccellabel.h
-include/gtk11/gtk/gtkadjustment.h
-include/gtk11/gtk/gtkalignment.h
-include/gtk11/gtk/gtkarg.h
-include/gtk11/gtk/gtkarrow.h
-include/gtk11/gtk/gtkaspectframe.h
-include/gtk11/gtk/gtkbbox.h
-include/gtk11/gtk/gtkbin.h
-include/gtk11/gtk/gtkbindings.h
-include/gtk11/gtk/gtkbox.h
-include/gtk11/gtk/gtkbutton.h
-include/gtk11/gtk/gtkcheckbutton.h
-include/gtk11/gtk/gtkcheckmenuitem.h
-include/gtk11/gtk/gtkclist.h
-include/gtk11/gtk/gtkcolorsel.h
-include/gtk11/gtk/gtkcombo.h
-include/gtk11/gtk/gtkcontainer.h
-include/gtk11/gtk/gtkctree.h
-include/gtk11/gtk/gtkcurve.h
-include/gtk11/gtk/gtkdata.h
-include/gtk11/gtk/gtkdebug.h
-include/gtk11/gtk/gtkdialog.h
-include/gtk11/gtk/gtkdrawingarea.h
-include/gtk11/gtk/gtkeditable.h
-include/gtk11/gtk/gtkentry.h
-include/gtk11/gtk/gtkenums.h
-include/gtk11/gtk/gtkeventbox.h
-include/gtk11/gtk/gtkfeatures.h
-include/gtk11/gtk/gtkfilesel.h
-include/gtk11/gtk/gtkfixed.h
-include/gtk11/gtk/gtkfontsel.h
-include/gtk11/gtk/gtkframe.h
-include/gtk11/gtk/gtkgamma.h
-include/gtk11/gtk/gtkgc.h
-include/gtk11/gtk/gtkhandlebox.h
-include/gtk11/gtk/gtkhbbox.h
-include/gtk11/gtk/gtkhbox.h
-include/gtk11/gtk/gtkhpaned.h
-include/gtk11/gtk/gtkhruler.h
-include/gtk11/gtk/gtkhscale.h
-include/gtk11/gtk/gtkhscrollbar.h
-include/gtk11/gtk/gtkhseparator.h
-include/gtk11/gtk/gtkimage.h
-include/gtk11/gtk/gtkinputdialog.h
-include/gtk11/gtk/gtkitem.h
-include/gtk11/gtk/gtkitemfactory.h
-include/gtk11/gtk/gtklabel.h
-include/gtk11/gtk/gtklist.h
-include/gtk11/gtk/gtklistitem.h
-include/gtk11/gtk/gtkmain.h
-include/gtk11/gtk/gtkmarshal.h
-include/gtk11/gtk/gtkmenu.h
-include/gtk11/gtk/gtkmenubar.h
-include/gtk11/gtk/gtkmenufactory.h
-include/gtk11/gtk/gtkmenuitem.h
-include/gtk11/gtk/gtkmenushell.h
-include/gtk11/gtk/gtkmisc.h
-include/gtk11/gtk/gtknotebook.h
-include/gtk11/gtk/gtkobject.h
-include/gtk11/gtk/gtkoptionmenu.h
-include/gtk11/gtk/gtkpacker.h
-include/gtk11/gtk/gtkpaned.h
-include/gtk11/gtk/gtkpixmap.h
-include/gtk11/gtk/gtkpreview.h
-include/gtk11/gtk/gtkprivate.h
-include/gtk11/gtk/gtkprogress.h
-include/gtk11/gtk/gtkprogressbar.h
-include/gtk11/gtk/gtkradiobutton.h
-include/gtk11/gtk/gtkradiomenuitem.h
-include/gtk11/gtk/gtkrange.h
-include/gtk11/gtk/gtkrc.h
-include/gtk11/gtk/gtkruler.h
-include/gtk11/gtk/gtkscale.h
-include/gtk11/gtk/gtkscrollbar.h
-include/gtk11/gtk/gtkscrolledwindow.h
-include/gtk11/gtk/gtkselection.h
-include/gtk11/gtk/gtkseparator.h
-include/gtk11/gtk/gtksignal.h
-include/gtk11/gtk/gtkspinbutton.h
-include/gtk11/gtk/gtkstatusbar.h
-include/gtk11/gtk/gtkstyle.h
-include/gtk11/gtk/gtktable.h
-include/gtk11/gtk/gtktearoffmenuitem.h
-include/gtk11/gtk/gtktext.h
-include/gtk11/gtk/gtktipsquery.h
-include/gtk11/gtk/gtktogglebutton.h
-include/gtk11/gtk/gtktoolbar.h
-include/gtk11/gtk/gtktooltips.h
-include/gtk11/gtk/gtktree.h
-include/gtk11/gtk/gtktreeitem.h
-include/gtk11/gtk/gtktypebuiltins.h
-include/gtk11/gtk/gtktypeutils.h
-include/gtk11/gtk/gtkvbbox.h
-include/gtk11/gtk/gtkvbox.h
-include/gtk11/gtk/gtkviewport.h
-include/gtk11/gtk/gtkvpaned.h
-include/gtk11/gtk/gtkvruler.h
-include/gtk11/gtk/gtkvscale.h
-include/gtk11/gtk/gtkvscrollbar.h
-include/gtk11/gtk/gtkvseparator.h
-include/gtk11/gtk/gtkwidget.h
-include/gtk11/gtk/gtkwindow.h
-@unexec install-info --delete %D/info/glib.info %D/info/dir
-@unexec install-info --delete %D/info/gdk.info %D/info/dir
-@unexec install-info --delete %D/info/gtk.info %D/info/dir
-info/gdk.info
-info/gtk.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
-@exec install-info %D/info/glib.info %D/info/dir
-@exec install-info %D/info/gdk.info %D/info/dir
-@exec install-info %D/info/gtk.info %D/info/dir
-lib/libgdk11.a
-lib/libgdk11.la
-lib/libgdk11.so
-lib/libgdk11.so.1.2
-lib/libgtk11.a
-lib/libgtk11.la
-lib/libgtk11.so
-lib/libgtk11.so.1.2
+bin/gtk11d-config
+include/gtk11d/gdk/gdk.h
+include/gtk11d/gdk/gdkcursors.h
+include/gtk11d/gdk/gdki18n.h
+include/gtk11d/gdk/gdkkeysyms.h
+include/gtk11d/gdk/gdkprivate.h
+include/gtk11d/gdk/gdkrgb.h
+include/gtk11d/gdk/gdktypes.h
+include/gtk11d/gdk/gdkx.h
+include/gtk11d/gtk/gtk.h
+include/gtk11d/gtk/gtkaccelgroup.h
+include/gtk11d/gtk/gtkaccellabel.h
+include/gtk11d/gtk/gtkadjustment.h
+include/gtk11d/gtk/gtkalignment.h
+include/gtk11d/gtk/gtkarg.h
+include/gtk11d/gtk/gtkarrow.h
+include/gtk11d/gtk/gtkaspectframe.h
+include/gtk11d/gtk/gtkbbox.h
+include/gtk11d/gtk/gtkbin.h
+include/gtk11d/gtk/gtkbindings.h
+include/gtk11d/gtk/gtkbox.h
+include/gtk11d/gtk/gtkbutton.h
+include/gtk11d/gtk/gtkcalendar.h
+include/gtk11d/gtk/gtkcheckbutton.h
+include/gtk11d/gtk/gtkcheckmenuitem.h
+include/gtk11d/gtk/gtkclist.h
+include/gtk11d/gtk/gtkcolorsel.h
+include/gtk11d/gtk/gtkcombo.h
+include/gtk11d/gtk/gtkcompat.h
+include/gtk11d/gtk/gtkcontainer.h
+include/gtk11d/gtk/gtkctree.h
+include/gtk11d/gtk/gtkcurve.h
+include/gtk11d/gtk/gtkdata.h
+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
+include/gtk11d/gtk/gtkeventbox.h
+include/gtk11d/gtk/gtkfeatures.h
+include/gtk11d/gtk/gtkfilesel.h
+include/gtk11d/gtk/gtkfixed.h
+include/gtk11d/gtk/gtkfontsel.h
+include/gtk11d/gtk/gtkframe.h
+include/gtk11d/gtk/gtkgamma.h
+include/gtk11d/gtk/gtkgc.h
+include/gtk11d/gtk/gtkhandlebox.h
+include/gtk11d/gtk/gtkhbbox.h
+include/gtk11d/gtk/gtkhbox.h
+include/gtk11d/gtk/gtkhpaned.h
+include/gtk11d/gtk/gtkhruler.h
+include/gtk11d/gtk/gtkhscale.h
+include/gtk11d/gtk/gtkhscrollbar.h
+include/gtk11d/gtk/gtkhseparator.h
+include/gtk11d/gtk/gtkimage.h
+include/gtk11d/gtk/gtkinputdialog.h
+include/gtk11d/gtk/gtkinvisible.h
+include/gtk11d/gtk/gtkitem.h
+include/gtk11d/gtk/gtkitemfactory.h
+include/gtk11d/gtk/gtklabel.h
+include/gtk11d/gtk/gtklayout.h
+include/gtk11d/gtk/gtklist.h
+include/gtk11d/gtk/gtklistitem.h
+include/gtk11d/gtk/gtkmain.h
+include/gtk11d/gtk/gtkmarshal.h
+include/gtk11d/gtk/gtkmenu.h
+include/gtk11d/gtk/gtkmenubar.h
+include/gtk11d/gtk/gtkmenufactory.h
+include/gtk11d/gtk/gtkmenuitem.h
+include/gtk11d/gtk/gtkmenushell.h
+include/gtk11d/gtk/gtkmisc.h
+include/gtk11d/gtk/gtknotebook.h
+include/gtk11d/gtk/gtkobject.h
+include/gtk11d/gtk/gtkoptionmenu.h
+include/gtk11d/gtk/gtkpacker.h
+include/gtk11d/gtk/gtkpaned.h
+include/gtk11d/gtk/gtkpixmap.h
+include/gtk11d/gtk/gtkplug.h
+include/gtk11d/gtk/gtkpreview.h
+include/gtk11d/gtk/gtkprivate.h
+include/gtk11d/gtk/gtkprogress.h
+include/gtk11d/gtk/gtkprogressbar.h
+include/gtk11d/gtk/gtkradiobutton.h
+include/gtk11d/gtk/gtkradiomenuitem.h
+include/gtk11d/gtk/gtkrange.h
+include/gtk11d/gtk/gtkrc.h
+include/gtk11d/gtk/gtkruler.h
+include/gtk11d/gtk/gtkscale.h
+include/gtk11d/gtk/gtkscrollbar.h
+include/gtk11d/gtk/gtkscrolledwindow.h
+include/gtk11d/gtk/gtkselection.h
+include/gtk11d/gtk/gtkseparator.h
+include/gtk11d/gtk/gtksignal.h
+include/gtk11d/gtk/gtksocket.h
+include/gtk11d/gtk/gtkspinbutton.h
+include/gtk11d/gtk/gtkstatusbar.h
+include/gtk11d/gtk/gtkstyle.h
+include/gtk11d/gtk/gtktable.h
+include/gtk11d/gtk/gtktearoffmenuitem.h
+include/gtk11d/gtk/gtktext.h
+include/gtk11d/gtk/gtkthemes.h
+include/gtk11d/gtk/gtktipsquery.h
+include/gtk11d/gtk/gtktogglebutton.h
+include/gtk11d/gtk/gtktoolbar.h
+include/gtk11d/gtk/gtktooltips.h
+include/gtk11d/gtk/gtktree.h
+include/gtk11d/gtk/gtktreeitem.h
+include/gtk11d/gtk/gtktypebuiltins.h
+include/gtk11d/gtk/gtktypeutils.h
+include/gtk11d/gtk/gtkvbbox.h
+include/gtk11d/gtk/gtkvbox.h
+include/gtk11d/gtk/gtkviewport.h
+include/gtk11d/gtk/gtkvpaned.h
+include/gtk11d/gtk/gtkvruler.h
+include/gtk11d/gtk/gtkvscale.h
+include/gtk11d/gtk/gtkvscrollbar.h
+include/gtk11d/gtk/gtkvseparator.h
+include/gtk11d/gtk/gtkwidget.h
+include/gtk11d/gtk/gtkwindow.h
+lib/libgdk11d.a
+lib/libgdk11d.la
+lib/libgdk11d.so
+lib/libgdk11d.so.1
+lib/libgtk11d.a
+lib/libgtk11d.la
+lib/libgtk11d.so
+lib/libgtk11d.so.1
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@dirrm include/gtk11/gdk
-@dirrm include/gtk11/gtk
-@dirrm include/gtk11
+share/themes/Default/gtk/gtkrc
+@dirrm share/themes/Default/gtk
+@dirrm share/themes/Default
+@dirrm share/themes
+@dirrm include/gtk11d/gdk
+@dirrm include/gtk11d/gtk
+@dirrm include/gtk11d
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index b34e46b1e3e3..14026a6f9315 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -1,13 +1,13 @@
-# New ports collection makefile for: gtk
-# Version required: 1.1.2
+# New ports collection makefile for: gtk11-devel
+# Version required: 1.1.7
# Date Created: 28 Sep 1997
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
-# $Id: Makefile,v 1.31 1998/12/10 13:18:16 vanilla Exp $
+# $Id: Makefile,v 1.32 1998/12/10 14:30:28 asami Exp $
#
-DISTNAME= gtk+-1.1.2
-PKGNAME= gtk-1.1.2
+DISTNAME= gtk+-1.1.7
+PKGNAME= gtk-1.1.7
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
@@ -15,24 +15,15 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \
MAINTAINER= vanilla@FreeBSD.ORG
-LIB_DEPENDS= glib11.0:${PORTSDIR}/devel/glib
-
-BROKEN= upgrade
+LIB_DEPENDS= glib11d.1:${PORTSDIR}/devel/glib11-devel
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= INSTALL='$${INSTALL} -c'
-CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk11
-
-MAN1= gtk-config.1
-
-pre-install:
- @if [ ! -f ${PREFIX}/info/dir ]; then \
- ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
- fi
+CONFIGURE_ENV= INSTALL='$${INSTALL} -c' \
+ GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config"
+CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk11d
post-install:
@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
- ${CAT} ${PKGDIR}/MESSAGE
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index 13bf0800541d..072f73bca142 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.1.2.tar.gz) = d1abc3deded1a4647b0941c1319130ce
+MD5 (gtk+-1.1.7.tar.gz) = 751cbeb13fb579626b7fec33ff9a10ee
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index a2e5b964889f..4bbc747f9bf4 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -1,135 +1,139 @@
-bin/gtk11-config
-include/gtk11/gdk/gdk.h
-include/gtk11/gdk/gdkcursors.h
-include/gtk11/gdk/gdki18n.h
-include/gtk11/gdk/gdkkeysyms.h
-include/gtk11/gdk/gdkprivate.h
-include/gtk11/gdk/gdkrgb.h
-include/gtk11/gdk/gdktypes.h
-include/gtk11/gdk/gdkx.h
-include/gtk11/gtk/gtk.h
-include/gtk11/gtk/gtkaccelgroup.h
-include/gtk11/gtk/gtkaccellabel.h
-include/gtk11/gtk/gtkadjustment.h
-include/gtk11/gtk/gtkalignment.h
-include/gtk11/gtk/gtkarg.h
-include/gtk11/gtk/gtkarrow.h
-include/gtk11/gtk/gtkaspectframe.h
-include/gtk11/gtk/gtkbbox.h
-include/gtk11/gtk/gtkbin.h
-include/gtk11/gtk/gtkbindings.h
-include/gtk11/gtk/gtkbox.h
-include/gtk11/gtk/gtkbutton.h
-include/gtk11/gtk/gtkcheckbutton.h
-include/gtk11/gtk/gtkcheckmenuitem.h
-include/gtk11/gtk/gtkclist.h
-include/gtk11/gtk/gtkcolorsel.h
-include/gtk11/gtk/gtkcombo.h
-include/gtk11/gtk/gtkcontainer.h
-include/gtk11/gtk/gtkctree.h
-include/gtk11/gtk/gtkcurve.h
-include/gtk11/gtk/gtkdata.h
-include/gtk11/gtk/gtkdebug.h
-include/gtk11/gtk/gtkdialog.h
-include/gtk11/gtk/gtkdrawingarea.h
-include/gtk11/gtk/gtkeditable.h
-include/gtk11/gtk/gtkentry.h
-include/gtk11/gtk/gtkenums.h
-include/gtk11/gtk/gtkeventbox.h
-include/gtk11/gtk/gtkfeatures.h
-include/gtk11/gtk/gtkfilesel.h
-include/gtk11/gtk/gtkfixed.h
-include/gtk11/gtk/gtkfontsel.h
-include/gtk11/gtk/gtkframe.h
-include/gtk11/gtk/gtkgamma.h
-include/gtk11/gtk/gtkgc.h
-include/gtk11/gtk/gtkhandlebox.h
-include/gtk11/gtk/gtkhbbox.h
-include/gtk11/gtk/gtkhbox.h
-include/gtk11/gtk/gtkhpaned.h
-include/gtk11/gtk/gtkhruler.h
-include/gtk11/gtk/gtkhscale.h
-include/gtk11/gtk/gtkhscrollbar.h
-include/gtk11/gtk/gtkhseparator.h
-include/gtk11/gtk/gtkimage.h
-include/gtk11/gtk/gtkinputdialog.h
-include/gtk11/gtk/gtkitem.h
-include/gtk11/gtk/gtkitemfactory.h
-include/gtk11/gtk/gtklabel.h
-include/gtk11/gtk/gtklist.h
-include/gtk11/gtk/gtklistitem.h
-include/gtk11/gtk/gtkmain.h
-include/gtk11/gtk/gtkmarshal.h
-include/gtk11/gtk/gtkmenu.h
-include/gtk11/gtk/gtkmenubar.h
-include/gtk11/gtk/gtkmenufactory.h
-include/gtk11/gtk/gtkmenuitem.h
-include/gtk11/gtk/gtkmenushell.h
-include/gtk11/gtk/gtkmisc.h
-include/gtk11/gtk/gtknotebook.h
-include/gtk11/gtk/gtkobject.h
-include/gtk11/gtk/gtkoptionmenu.h
-include/gtk11/gtk/gtkpacker.h
-include/gtk11/gtk/gtkpaned.h
-include/gtk11/gtk/gtkpixmap.h
-include/gtk11/gtk/gtkpreview.h
-include/gtk11/gtk/gtkprivate.h
-include/gtk11/gtk/gtkprogress.h
-include/gtk11/gtk/gtkprogressbar.h
-include/gtk11/gtk/gtkradiobutton.h
-include/gtk11/gtk/gtkradiomenuitem.h
-include/gtk11/gtk/gtkrange.h
-include/gtk11/gtk/gtkrc.h
-include/gtk11/gtk/gtkruler.h
-include/gtk11/gtk/gtkscale.h
-include/gtk11/gtk/gtkscrollbar.h
-include/gtk11/gtk/gtkscrolledwindow.h
-include/gtk11/gtk/gtkselection.h
-include/gtk11/gtk/gtkseparator.h
-include/gtk11/gtk/gtksignal.h
-include/gtk11/gtk/gtkspinbutton.h
-include/gtk11/gtk/gtkstatusbar.h
-include/gtk11/gtk/gtkstyle.h
-include/gtk11/gtk/gtktable.h
-include/gtk11/gtk/gtktearoffmenuitem.h
-include/gtk11/gtk/gtktext.h
-include/gtk11/gtk/gtktipsquery.h
-include/gtk11/gtk/gtktogglebutton.h
-include/gtk11/gtk/gtktoolbar.h
-include/gtk11/gtk/gtktooltips.h
-include/gtk11/gtk/gtktree.h
-include/gtk11/gtk/gtktreeitem.h
-include/gtk11/gtk/gtktypebuiltins.h
-include/gtk11/gtk/gtktypeutils.h
-include/gtk11/gtk/gtkvbbox.h
-include/gtk11/gtk/gtkvbox.h
-include/gtk11/gtk/gtkviewport.h
-include/gtk11/gtk/gtkvpaned.h
-include/gtk11/gtk/gtkvruler.h
-include/gtk11/gtk/gtkvscale.h
-include/gtk11/gtk/gtkvscrollbar.h
-include/gtk11/gtk/gtkvseparator.h
-include/gtk11/gtk/gtkwidget.h
-include/gtk11/gtk/gtkwindow.h
-@unexec install-info --delete %D/info/glib.info %D/info/dir
-@unexec install-info --delete %D/info/gdk.info %D/info/dir
-@unexec install-info --delete %D/info/gtk.info %D/info/dir
-info/gdk.info
-info/gtk.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
-@exec install-info %D/info/glib.info %D/info/dir
-@exec install-info %D/info/gdk.info %D/info/dir
-@exec install-info %D/info/gtk.info %D/info/dir
-lib/libgdk11.a
-lib/libgdk11.la
-lib/libgdk11.so
-lib/libgdk11.so.1.2
-lib/libgtk11.a
-lib/libgtk11.la
-lib/libgtk11.so
-lib/libgtk11.so.1.2
+bin/gtk11d-config
+include/gtk11d/gdk/gdk.h
+include/gtk11d/gdk/gdkcursors.h
+include/gtk11d/gdk/gdki18n.h
+include/gtk11d/gdk/gdkkeysyms.h
+include/gtk11d/gdk/gdkprivate.h
+include/gtk11d/gdk/gdkrgb.h
+include/gtk11d/gdk/gdktypes.h
+include/gtk11d/gdk/gdkx.h
+include/gtk11d/gtk/gtk.h
+include/gtk11d/gtk/gtkaccelgroup.h
+include/gtk11d/gtk/gtkaccellabel.h
+include/gtk11d/gtk/gtkadjustment.h
+include/gtk11d/gtk/gtkalignment.h
+include/gtk11d/gtk/gtkarg.h
+include/gtk11d/gtk/gtkarrow.h
+include/gtk11d/gtk/gtkaspectframe.h
+include/gtk11d/gtk/gtkbbox.h
+include/gtk11d/gtk/gtkbin.h
+include/gtk11d/gtk/gtkbindings.h
+include/gtk11d/gtk/gtkbox.h
+include/gtk11d/gtk/gtkbutton.h
+include/gtk11d/gtk/gtkcalendar.h
+include/gtk11d/gtk/gtkcheckbutton.h
+include/gtk11d/gtk/gtkcheckmenuitem.h
+include/gtk11d/gtk/gtkclist.h
+include/gtk11d/gtk/gtkcolorsel.h
+include/gtk11d/gtk/gtkcombo.h
+include/gtk11d/gtk/gtkcompat.h
+include/gtk11d/gtk/gtkcontainer.h
+include/gtk11d/gtk/gtkctree.h
+include/gtk11d/gtk/gtkcurve.h
+include/gtk11d/gtk/gtkdata.h
+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
+include/gtk11d/gtk/gtkeventbox.h
+include/gtk11d/gtk/gtkfeatures.h
+include/gtk11d/gtk/gtkfilesel.h
+include/gtk11d/gtk/gtkfixed.h
+include/gtk11d/gtk/gtkfontsel.h
+include/gtk11d/gtk/gtkframe.h
+include/gtk11d/gtk/gtkgamma.h
+include/gtk11d/gtk/gtkgc.h
+include/gtk11d/gtk/gtkhandlebox.h
+include/gtk11d/gtk/gtkhbbox.h
+include/gtk11d/gtk/gtkhbox.h
+include/gtk11d/gtk/gtkhpaned.h
+include/gtk11d/gtk/gtkhruler.h
+include/gtk11d/gtk/gtkhscale.h
+include/gtk11d/gtk/gtkhscrollbar.h
+include/gtk11d/gtk/gtkhseparator.h
+include/gtk11d/gtk/gtkimage.h
+include/gtk11d/gtk/gtkinputdialog.h
+include/gtk11d/gtk/gtkinvisible.h
+include/gtk11d/gtk/gtkitem.h
+include/gtk11d/gtk/gtkitemfactory.h
+include/gtk11d/gtk/gtklabel.h
+include/gtk11d/gtk/gtklayout.h
+include/gtk11d/gtk/gtklist.h
+include/gtk11d/gtk/gtklistitem.h
+include/gtk11d/gtk/gtkmain.h
+include/gtk11d/gtk/gtkmarshal.h
+include/gtk11d/gtk/gtkmenu.h
+include/gtk11d/gtk/gtkmenubar.h
+include/gtk11d/gtk/gtkmenufactory.h
+include/gtk11d/gtk/gtkmenuitem.h
+include/gtk11d/gtk/gtkmenushell.h
+include/gtk11d/gtk/gtkmisc.h
+include/gtk11d/gtk/gtknotebook.h
+include/gtk11d/gtk/gtkobject.h
+include/gtk11d/gtk/gtkoptionmenu.h
+include/gtk11d/gtk/gtkpacker.h
+include/gtk11d/gtk/gtkpaned.h
+include/gtk11d/gtk/gtkpixmap.h
+include/gtk11d/gtk/gtkplug.h
+include/gtk11d/gtk/gtkpreview.h
+include/gtk11d/gtk/gtkprivate.h
+include/gtk11d/gtk/gtkprogress.h
+include/gtk11d/gtk/gtkprogressbar.h
+include/gtk11d/gtk/gtkradiobutton.h
+include/gtk11d/gtk/gtkradiomenuitem.h
+include/gtk11d/gtk/gtkrange.h
+include/gtk11d/gtk/gtkrc.h
+include/gtk11d/gtk/gtkruler.h
+include/gtk11d/gtk/gtkscale.h
+include/gtk11d/gtk/gtkscrollbar.h
+include/gtk11d/gtk/gtkscrolledwindow.h
+include/gtk11d/gtk/gtkselection.h
+include/gtk11d/gtk/gtkseparator.h
+include/gtk11d/gtk/gtksignal.h
+include/gtk11d/gtk/gtksocket.h
+include/gtk11d/gtk/gtkspinbutton.h
+include/gtk11d/gtk/gtkstatusbar.h
+include/gtk11d/gtk/gtkstyle.h
+include/gtk11d/gtk/gtktable.h
+include/gtk11d/gtk/gtktearoffmenuitem.h
+include/gtk11d/gtk/gtktext.h
+include/gtk11d/gtk/gtkthemes.h
+include/gtk11d/gtk/gtktipsquery.h
+include/gtk11d/gtk/gtktogglebutton.h
+include/gtk11d/gtk/gtktoolbar.h
+include/gtk11d/gtk/gtktooltips.h
+include/gtk11d/gtk/gtktree.h
+include/gtk11d/gtk/gtktreeitem.h
+include/gtk11d/gtk/gtktypebuiltins.h
+include/gtk11d/gtk/gtktypeutils.h
+include/gtk11d/gtk/gtkvbbox.h
+include/gtk11d/gtk/gtkvbox.h
+include/gtk11d/gtk/gtkviewport.h
+include/gtk11d/gtk/gtkvpaned.h
+include/gtk11d/gtk/gtkvruler.h
+include/gtk11d/gtk/gtkvscale.h
+include/gtk11d/gtk/gtkvscrollbar.h
+include/gtk11d/gtk/gtkvseparator.h
+include/gtk11d/gtk/gtkwidget.h
+include/gtk11d/gtk/gtkwindow.h
+lib/libgdk11d.a
+lib/libgdk11d.la
+lib/libgdk11d.so
+lib/libgdk11d.so.1
+lib/libgtk11d.a
+lib/libgtk11d.la
+lib/libgtk11d.so
+lib/libgtk11d.so.1
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@dirrm include/gtk11/gdk
-@dirrm include/gtk11/gtk
-@dirrm include/gtk11
+share/themes/Default/gtk/gtkrc
+@dirrm share/themes/Default/gtk
+@dirrm share/themes/Default
+@dirrm share/themes
+@dirrm include/gtk11d/gdk
+@dirrm include/gtk11d/gtk
+@dirrm include/gtk11d