summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--x11-toolkits/gtk12/Makefile28
-rw-r--r--x11-toolkits/gtk12/distinfo2
-rw-r--r--x11-toolkits/gtk12/files/patch-aa152
-rw-r--r--x11-toolkits/gtk12/files/patch-ab4
-rw-r--r--x11-toolkits/gtk12/files/patch-ad8
-rw-r--r--x11-toolkits/gtk12/files/patch-ae38
-rw-r--r--x11-toolkits/gtk12/pkg-plist22
-rw-r--r--x11-toolkits/gtk13/Makefile28
-rw-r--r--x11-toolkits/gtk13/distinfo2
-rw-r--r--x11-toolkits/gtk13/files/patch-ad8
-rw-r--r--x11-toolkits/gtk13/files/patch-ae38
-rw-r--r--x11-toolkits/gtk13/pkg-plist22
-rw-r--r--x11-toolkits/gtk20/Makefile28
-rw-r--r--x11-toolkits/gtk20/distinfo2
-rw-r--r--x11-toolkits/gtk20/files/patch-ad8
-rw-r--r--x11-toolkits/gtk20/files/patch-ae38
-rw-r--r--x11-toolkits/gtk20/pkg-plist22
-rw-r--r--x11-toolkits/gtk30/Makefile28
-rw-r--r--x11-toolkits/gtk30/distinfo2
-rw-r--r--x11-toolkits/gtk30/files/patch-ad8
-rw-r--r--x11-toolkits/gtk30/files/patch-ae38
-rw-r--r--x11-toolkits/gtk30/pkg-plist22
22 files changed, 297 insertions, 251 deletions
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 3f95abd930bd..ba60715ca5ae 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -1,13 +1,13 @@
# New ports collection makefile for: gtk12
-# Version required: 1.2.2
+# Version required: 1.2.3
# Date Created: 28 Sep 1997
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
-# $Id: Makefile,v 1.48 1999/03/27 00:00:16 flathill Exp $
+# $Id: Makefile,v 1.49 1999/05/02 05:21:19 kuriyama Exp $
#
-DISTNAME= gtk+-1.2.2
-PKGNAME= gtk-1.2.2
+DISTNAME= gtk+-1.2.3
+PKGNAME= gtk-1.2.3
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
@@ -15,15 +15,18 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
MAINTAINER= vanilla@FreeBSD.ORG
-LIB_DEPENDS= glib12.1:${PORTSDIR}/devel/glib12 \
+LIB_DEPENDS= glib12.2:${PORTSDIR}/devel/glib12 \
intl.1:${PORTSDIR}/devel/gettext
+GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
+
USE_X_PREFIX= yes
USE_PERL5= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk12
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \
+ X_CFLAGS="-I${LOCALBASE}/include" \
+ GLIB_CONFIG="${GLIB_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
MAN1= gtk12-config.1
@@ -33,16 +36,5 @@ pre-build:
post-install:
@${MKDIR} ${PREFIX}/share/themes/engines
- @if [ ! -f ${PREFIX}/share/info ]; then \
- ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
- fi
- @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
- @${ECHO} '*********************************************************'
- @${ECHO} '* *'
- @${ECHO} '* If you want to use autoconf with gtk, *'
- @${ECHO} '* Please copy gtk.m4 to /usr/local/share/aclocal *'
- @${ECHO} '* by yourself, thanks. *'
- @${ECHO} '* *'
- @${ECHO} '*********************************************************'
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtk12/distinfo b/x11-toolkits/gtk12/distinfo
index ea2fb1bb49c9..ff4bd14745b7 100644
--- a/x11-toolkits/gtk12/distinfo
+++ b/x11-toolkits/gtk12/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.2.2.tar.gz) = 2776dca7d9f907b7b851ac9a4d4fb304
+MD5 (gtk+-1.2.3.tar.gz) = 51d880fc05a99861be4abe161adaaddd
diff --git a/x11-toolkits/gtk12/files/patch-aa b/x11-toolkits/gtk12/files/patch-aa
index 60e624a4d285..9049ce73a3a1 100644
--- a/x11-toolkits/gtk12/files/patch-aa
+++ b/x11-toolkits/gtk12/files/patch-aa
@@ -1,36 +1,36 @@
---- Makefile.in.orig Sun Jan 31 23:26:39 1999
-+++ Makefile.in Sun Jan 31 23:31:06 1999
-@@ -126,7 +126,7 @@
+--- Makefile.in.orig Tue May 11 06:11:20 1999
++++ Makefile.in Mon May 17 22:58:32 1999
+@@ -127,7 +127,7 @@
SRC_SUBDIRS = gdk gtk
SUBDIRS = po $(SRC_SUBDIRS) docs
-bin_SCRIPTS = gtk-config
-+bin_SCRIPTS = gtk12-config
++bin_SCRIPTS = gtk@LT_RELEASE@-config
EXTRA_DIST = HACKING gtk+.spec.in gtk.m4 makecopyright TODO NEWS.pre-1-0 ChangeLog.pre-1-0 README.cvs-commits intl/libgettext.h intl/po2tbl.sed.in examples/aspectframe/Makefile examples/aspectframe/aspectframe.c examples/Makefile examples/README.1ST examples/extract.awk examples/extract.sh examples/base/Makefile examples/base/base.c examples/buttons/Makefile examples/buttons/buttons.c examples/buttons/info.xpm examples/calendar/Makefile examples/calendar/gcalendar.c examples/clist/Makefile examples/clist/clist.c examples/entry/Makefile examples/entry/entry.c examples/eventbox/Makefile examples/eventbox/eventbox.c examples/filesel/Makefile examples/filesel/filesel.c examples/gtkdial/Makefile examples/gtkdial/dial_test.c examples/gtkdial/gtkdial.c examples/gtkdial/gtkdial.h examples/helloworld/Makefile examples/helloworld/helloworld.c examples/helloworld2/Makefile examples/helloworld2/helloworld2.c examples/list/Makefile examples/list/list.c examples/menu/Makefile examples/menu/menu.c examples/menu/itemfactory.c examples/notebook/Makefile examples/notebook/notebook.c examples/packbox/Makefile examples/packbox/packbox.c examples/packer/Makefile examples/packer/pack.c examples/paned/Makefile examples/paned/paned.c examples/pixmap/Makefile examples/pixmap/pixmap.c examples/progressbar/Makefile examples/progressbar/progressbar.c examples/radiobuttons/Makefile examples/radiobuttons/radiobuttons.c examples/rangewidgets/Makefile examples/rangewidgets/rangewidgets.c examples/rulers/Makefile examples/rulers/rulers.c examples/scribble-simple/Makefile examples/scribble-simple/scribble-simple.c examples/scrolledwin/Makefile examples/scrolledwin/scrolledwin.c examples/selection/Makefile examples/selection/gettargets.c examples/selection/setselection.c examples/statusbar/Makefile examples/statusbar/statusbar.c examples/table/Makefile examples/table/table.c examples/text/Makefile examples/text/text.c examples/tictactoe/Makefile examples/tictactoe/tictactoe.c examples/tictactoe/tictactoe.h examples/tictactoe/ttt_test.c examples/tree/Makefile examples/tree/tree.c examples/wheelbarrow/Makefile examples/wheelbarrow/wheelbarrow.c examples/fixed/fixed.c examples/fixed/Makefile examples/frame/frame.c examples/frame/Makefile examples/spinbutton/spinbutton.c examples/spinbutton/Makefile examples/find-examples.sh
-@@ -136,7 +136,7 @@
+@@ -137,7 +137,7 @@
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = gtk+.spec gtk-config
-+CONFIG_CLEAN_FILES = gtk-config
++CONFIG_CLEAN_FILES = gtk+.spec gtk@LT_RELEASE@-config
SCRIPTS = $(bin_SCRIPTS)
DATA = $(m4data_DATA)
-@@ -198,7 +198,10 @@
+@@ -199,7 +199,10 @@
maintainer-clean-hdr:
gtk+.spec: $(top_builddir)/config.status gtk+.spec.in
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-gtk-config: $(top_builddir)/config.status gtk-config.in
-+gtk12-config.in: gtk-config.in
-+ cp gtk-config.in gtk12-config.in
++gtk@LT_RELEASE@-config.in: gtk-config.in
++ cp gtk-config.in gtk@LT_RELEASE@-config.in
+
-+gtk12-config: $(top_builddir)/config.status gtk12-config.in
++gtk@LT_RELEASE@-config: $(top_builddir)/config.status gtk@LT_RELEASE@-config.in
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
install-binSCRIPTS: $(bin_SCRIPTS)
-@@ -407,7 +410,6 @@
+@@ -408,7 +411,6 @@
|| exit 1; \
fi; \
done
@@ -38,76 +38,17 @@
info-am:
info: info-recursive
dvi-am:
-@@ -422,13 +424,13 @@
- install-exec-am: install-binSCRIPTS
- install-exec: install-exec-recursive
-
--install-data-am: install-m4dataDATA
-+install-data-am:
- install-data: install-data-recursive
-
- install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
- install: install-recursive
--uninstall-am: uninstall-binSCRIPTS uninstall-m4dataDATA
-+uninstall-am: uninstall-binSCRIPTS
- uninstall: uninstall-recursive
- all-am: Makefile $(SCRIPTS) $(DATA) config.h
- all-redirect: all-recursive-am
---- gdk/Makefile.in.orig Sun Jan 31 23:33:26 1999
-+++ gdk/Makefile.in Sun Jan 31 23:35:01 1999
-@@ -125,7 +125,7 @@
-
- gdkincludedir = $(includedir)/gdk
-
--lib_LTLIBRARIES = libgdk.la
-+lib_LTLIBRARIES = libgdk12.la
-
- INCLUDES = -DG_LOG_DOMAIN=\"Gdk\" -I$(top_srcdir) @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @GLIB_CFLAGS@ @x_cflags@
-
-@@ -139,7 +139,7 @@
- LDADDS = @x_ldflags@ @x_libs@ @GLIB_LIBS@ -lm
-
-
--libgdk_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm
-+libgdk_la_LDFLAGS = -version-info 1:0:0 @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm
-
-
- EXTRA_PROGRAMS = gxid
-@@ -265,7 +265,7 @@
-
- maintainer-clean-libtool:
-
--libgdk.la: $(libgdk_la_OBJECTS) $(libgdk_la_DEPENDENCIES)
-+libgdk12.la: $(libgdk_la_OBJECTS) $(libgdk_la_DEPENDENCIES)
- $(LINK) -rpath $(libdir) $(libgdk_la_LDFLAGS) $(libgdk_la_OBJECTS) $(libgdk_la_LIBADD) $(LIBS)
-
- mostlyclean-binPROGRAMS:
---- gtk/Makefile.in.orig Sun Jan 31 23:35:10 1999
-+++ gtk/Makefile.in Sun Jan 31 23:37:31 1999
-@@ -127,7 +127,7 @@
-
- gtkincludedir = $(includedir)/gtk
-
--lib_LTLIBRARIES = libgtk.la
-+lib_LTLIBRARIES = libgtk12.la
-
- static_SOURCES = gtkaccelgroup.c gtkaccellabel.c gtkadjustment.c gtkalignment.c gtkarg.c gtkarrow.c gtkaspectframe.c gtkbin.c gtkbindings.c gtkbbox.c gtkbox.c gtkbutton.c gtkcalendar.c gtkcheckbutton.c gtkcheckmenuitem.c gtkclist.c gtkcolorsel.c gtkcombo.c gtkcontainer.c gtkctree.c gtkcurve.c gtkdata.c gtkdialog.c gtkdnd.c gtkdrawingarea.c gtkeditable.c gtkentry.c gtkeventbox.c gtkfilesel.c gtkfixed.c gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c gtkhscrollbar.c gtkhseparator.c gtkimage.c gtkinputdialog.c gtkintl.h gtkinvisible.c gtkitem.c gtkitemfactory.c gtklabel.c gtklayout.c gtklist.c gtklistitem.c gtkmain.c gtkmenu.c gtkmenubar.c gtkmenufactory.c gtkmenuitem.c gtkmenushell.c gtkmisc.c gtknotebook.c gtkobject.c gtkoptionmenu.c gtkpacker.c gtkpaned.c gtkpixmap.c gtkplug.c gtkpreview.c gtkprogress.c gtkprogressbar.c gtkradiobutton.c gtkradiomenuitem.c gtkrange.c gtkrc.c gtkruler.c gtkscale.c gtkscrollbar.c gtkscrolledwindow.c gtkselection.c gtkseparator.c gtksignal.c gtksocket.c gtkspinbutton.c gtkstyle.c gtkstatusbar.c gtktable.c gtktearoffmenuitem.c gtktext.c gtkthemes.c gtktipsquery.c gtktogglebutton.c gtktoolbar.c gtktooltips.c gtktree.c gtktreeitem.c gtktypeutils.c gtkvbbox.c gtkvbox.c gtkviewport.c gtkvpaned.c gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c gtkwidget.c gtkwindow.c fnmatch.c fnmatch.h
-
-@@ -152,26 +152,26 @@
- gdk_headers = ../gdk/gdktypes.h ../gdk/gdkrgb.h
-
-
--libgtk_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm
-+libgtk_la_LDFLAGS = -version-info 1:0:0 @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm
+--- gtk/Makefile.in.orig Tue May 11 06:11:28 1999
++++ gtk/Makefile.in Mon May 17 22:58:32 1999
+@@ -157,13 +157,13 @@
# $(top_builddir)/gdk/libgdk.la
-gtkconfdir = $(sysconfdir)/gtk
+gtkconfdir = $(datadir)/themes/Default/gtk
- gtkconf_DATA = gtkrc gtkrc.ja gtkrc.ko gtkrc.ru
+ gtkconf_DATA = gtkrc.ja gtkrc.ko gtkrc.ru gtkrc.iso-8859-2
- EXTRA_DIST = line-arrow.xbm line-wrap.xbm testgtk.1 testgtkrc testgtkrc2 gtkfeatures.h.in makeenums.pl makeenums.awk maketypes.awk makeenums.h gtkargcollector.c gtktypebuiltins_vars.c gtktypebuiltins_ids.c gtktypebuiltins_evals.c gtk-boxed.defs gtk.defs genmarshal.pl gtkmarshal.list check-y.xpm check-n.xpm test.xpm marble.xpm 3DRings.xpm FilesQueue.xpm Modeller.xpm tree_plus.xpm tree_minus.xpm tree_plus.xbm tree_minus.xbm circles.xbm gtkrc.ja gtkrc.ko gtkrc.ru
+ EXTRA_DIST = line-arrow.xbm line-wrap.xbm testgtk.1 testgtkrc testgtkrc2 gtkfeatures.h.in makeenums.pl makeenums.awk maketypes.awk makeenums.h gtkargcollector.c gtktypebuiltins_vars.c gtktypebuiltins_ids.c gtktypebuiltins_evals.c gtk-boxed.defs gtk.defs genmarshal.pl gtkmarshal.list check-y.xpm check-n.xpm test.xpm marble.xpm 3DRings.xpm FilesQueue.xpm Modeller.xpm tree_plus.xpm tree_minus.xpm tree_plus.xbm tree_minus.xbm circles.xbm gtkrc.iso-8859-2 gtkrc.ja gtkrc.ko gtkrc.ru
-INCLUDES = -DGTK_DISABLE_COMPAT_H -DG_LOG_DOMAIN=\"Gtk\" -DGTK_EXE_PREFIX=\"$(exec_prefix)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -I$(top_srcdir) @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @GLIB_CFLAGS@ @x_cflags@
@@ -115,27 +56,7 @@
noinst_PROGRAMS = testgtk testinput testselection testrgb testdnd simple
- # testthreads
-
--DEPS = libgtk.la $(top_builddir)/gdk/libgdk.la
-+DEPS = libgtk12.la $(top_builddir)/gdk/libgdk12.la
-
-
--LDADDS = libgtk.la $(top_builddir)/gdk/libgdk.la @x_ldflags@ @x_libs@ @GLIB_LIBS@ -lm
-+LDADDS = libgtk12.la $(top_builddir)/gdk/libgdk12.la @x_ldflags@ @x_libs@ @GLIB_LIBS@ -lm
-
-
- testgtk_DEPENDENCIES = $(DEPS)
-@@ -342,7 +342,7 @@
-
- maintainer-clean-libtool:
-
--libgtk.la: $(libgtk_la_OBJECTS) $(libgtk_la_DEPENDENCIES)
-+libgtk12.la: $(libgtk_la_OBJECTS) $(libgtk_la_DEPENDENCIES)
- $(LINK) -rpath $(libdir) $(libgtk_la_LDFLAGS) $(libgtk_la_OBJECTS) $(libgtk_la_LIBADD) $(LIBS)
-
- mostlyclean-noinstPROGRAMS:
-@@ -478,7 +478,7 @@
+@@ -479,7 +479,7 @@
uninstall-am: uninstall-libLTLIBRARIES uninstall-gtkconfDATA \
uninstall-gtkincludeHEADERS uninstall-local
uninstall: uninstall-am
@@ -144,27 +65,8 @@
all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-@@ -599,17 +599,11 @@
- && echo timestamp > stamp-m
-
- gtkrc:
-- :
--
--# We create a dummy theme for the default GTK+ theme
-+ echo "# Empty gtkrc for default theme" > gtkrc
-
- install-data-local:
-- $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk
-- echo "# Empty gtkrc for default theme" > \
-- $(DESTDIR)$(datadir)/themes/Default/gtk/gtkrc
-
- uninstall-local:
-- rm -f $(DESTDIR)$(datadir)/themes/Default/gtkrc
-
- .PHONY: files test test-debug
-
---- docs/Makefile.in.orig Thu Feb 25 22:17:02 1999
-+++ docs/Makefile.in Tue Mar 2 11:39:50 1999
+--- docs/Makefile.in.orig Tue May 11 06:13:29 1999
++++ docs/Makefile.in Mon May 17 22:58:33 1999
@@ -99,7 +99,7 @@
LT_RELEASE = @LT_RELEASE@
LT_REVISION = @LT_REVISION@
@@ -173,31 +75,31 @@
+MAKEINFO = @MAKEINFO@ --no-split
MKINSTALLDIRS = @MKINSTALLDIRS@
NM = @NM@
- PACKAGE = @PACKAGE@
-@@ -125,7 +125,7 @@
+ OBJDUMP = @OBJDUMP@
+@@ -126,7 +126,7 @@
info_TEXINFOS = gdk.texi gtk.texi
-man_MANS = gtk-config.1
-+man_MANS = gtk12-config.1
++man_MANS = gtk@LT_RELEASE@-config.1
TUTORIAL_FR_FILES = html/gtk_tut_fr-1.html html/gtk_tut_fr-2.html html/gtk_tut_fr-3.html html/gtk_tut_fr-4.html html/gtk_tut_fr-5.html html/gtk_tut_fr-6.html html/gtk_tut_fr-7.html html/gtk_tut_fr-8.html html/gtk_tut_fr-9.html html/gtk_tut_fr-10.html html/gtk_tut_fr-11.html html/gtk_tut_fr-12.html html/gtk_tut_fr-13.html html/gtk_tut_fr-14.html html/gtk_tut_fr-15.html html/gtk_tut_fr-16.html html/gtk_tut_fr-17.html html/gtk_tut_fr-18.html html/gtk_tut_fr-19.html html/gtk_tut_fr-20.html html/gtk_tut_fr-21.html html/gtk_tut_fr-22.html html/gtk_tut_fr-23.html html/gtk_tut_fr-24.html html/gtk_tut_fr.html text/gtk_tut_fr.txt
-@@ -139,7 +139,7 @@
+@@ -140,7 +140,7 @@
FAQ_FILES = html/gtkfaq.html html/gtkfaq-1.html html/gtkfaq-2.html html/gtkfaq-3.html html/gtkfaq-4.html html/gtkfaq-5.html html/gtkfaq-6.html html/gtkfaq-7.html text/gtkfaq.txt
-EXTRA_DIST = gtk-config.1.in texinfo.tex macros.texi gtkdocs_fix gtkfaq.sgml gtk-config.txt gtk_tut.sgml gtk_tut_it.sgml gtk_tut_fr.sgml debugging.txt developers.txt refcounting.txt styles.txt text_widget.txt widget_system.txt gtk_tut_packbox1.gif gtk_tut_packbox2.gif html/gtk_tut_table.gif html/gtk_tut_packbox1.gif html/gtk_tut_packbox2.gif gtk_tut_table.gif html/gdk.html html/gdk_toc.html html/gtk.html html/gtk_toc.html $(TUTORIAL_FILES) $(TUTORIAL_FR_FILES) $(TUTORIAL_IT_FILES) $(FAQ_FILES)
-+EXTRA_DIST = gtk12-config.1.in texinfo.tex macros.texi gtkdocs_fix gtkfaq.sgml gtk-config.txt gtk_tut.sgml gtk_tut_it.sgml gtk_tut_fr.sgml debugging.txt developers.txt refcounting.txt styles.txt text_widget.txt widget_system.txt gtk_tut_packbox1.gif gtk_tut_packbox2.gif html/gtk_tut_table.gif html/gtk_tut_packbox1.gif html/gtk_tut_packbox2.gif gtk_tut_table.gif html/gdk.html html/gdk_toc.html html/gtk.html html/gtk_toc.html $(TUTORIAL_FILES) $(TUTORIAL_FR_FILES) $(TUTORIAL_IT_FILES) $(FAQ_FILES)
++EXTRA_DIST = gtk@LT_RELEASE@-config.1.in texinfo.tex macros.texi gtkdocs_fix gtkfaq.sgml gtk-config.txt gtk_tut.sgml gtk_tut_it.sgml gtk_tut_fr.sgml debugging.txt developers.txt refcounting.txt styles.txt text_widget.txt widget_system.txt gtk_tut_packbox1.gif gtk_tut_packbox2.gif html/gtk_tut_table.gif html/gtk_tut_packbox1.gif html/gtk_tut_packbox2.gif gtk_tut_table.gif html/gdk.html html/gdk_toc.html html/gtk.html html/gtk_toc.html $(TUTORIAL_FILES) $(TUTORIAL_FR_FILES) $(TUTORIAL_IT_FILES) $(FAQ_FILES)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
-@@ -177,6 +177,8 @@
+@@ -180,6 +180,8 @@
gtk.info: gtk.texi
gtk.dvi: gtk.texi
-+gtk12-config.1: gtk-config.1
-+ cp gtk-config.1 gtk12-config.1
++gtk@LT_RELEASE@-config.1: gtk-config.1
++ cp gtk-config.1 gtk@LT_RELEASE@-config.1
DVIPS = dvips
diff --git a/x11-toolkits/gtk12/files/patch-ab b/x11-toolkits/gtk12/files/patch-ab
index 5daa432dc5b9..653be5ddf824 100644
--- a/x11-toolkits/gtk12/files/patch-ab
+++ b/x11-toolkits/gtk12/files/patch-ab
@@ -5,7 +5,7 @@
{
cat <<EOF
-Usage: gtk-config [OPTIONS] [LIBRARIES]
-+Usage: gtk12-config [OPTIONS] [LIBRARIES]
++Usage: gtk@LT_RELEASE@-config [OPTIONS] [LIBRARIES]
Options:
[--prefix[=DIR]]
[--exec-prefix[=DIR]]
@@ -14,6 +14,6 @@
done
- echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
-+ echo $libdirs @x_ldflags@ -lgtk12 -lgdk12 $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
++ echo $libdirs @x_ldflags@ -lgtk@LT_RELEASE@ -lgdk@LT_RELEASE@ $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
fi
diff --git a/x11-toolkits/gtk12/files/patch-ad b/x11-toolkits/gtk12/files/patch-ad
index f03d93d683ea..fb578b3b9032 100644
--- a/x11-toolkits/gtk12/files/patch-ad
+++ b/x11-toolkits/gtk12/files/patch-ad
@@ -1,5 +1,5 @@
---- gtk/gtkrc.c.orig Wed Apr 14 05:20:09 1999
-+++ gtk/gtkrc.c Sun May 2 13:27:23 1999
+--- gtk/gtkrc.c.orig Tue May 11 04:31:09 1999
++++ gtk/gtkrc.c Sat May 15 19:01:44 1999
@@ -231,9 +231,9 @@
var = getenv("GTK_EXE_PREFIX");
@@ -38,8 +38,8 @@
var = g_get_home_dir ();
if (var)
-- path = g_strdup_printf("%s%s", var, ".gtk/lib/themes/engines");
-+ path = g_strdup_printf("%s%s", var, ".gtk/themes/engines");
+- path = g_strdup_printf("%s%s", var, "/.gtk/lib/themes/engines");
++ path = g_strdup_printf("%s%s", var, "/.gtk/themes/engines");
module_path[n++] = g_strdup(path);
module_path[n] = NULL;
g_free(path);
diff --git a/x11-toolkits/gtk12/files/patch-ae b/x11-toolkits/gtk12/files/patch-ae
index 854b0d4e5cc3..c241c2e075a6 100644
--- a/x11-toolkits/gtk12/files/patch-ae
+++ b/x11-toolkits/gtk12/files/patch-ae
@@ -1,6 +1,21 @@
---- configure.orig Thu Feb 25 13:02:28 1999
-+++ configure Tue Mar 2 11:11:14 1999
-@@ -3977,7 +3977,7 @@
+--- configure.orig Tue May 11 05:42:09 1999
++++ configure Mon May 17 22:59:13 1999
+@@ -606,10 +606,10 @@
+
+
+ # libtool versioning
+-LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION
+-LT_CURRENT=`expr $GTK_MICRO_VERSION - $GTK_INTERFACE_AGE`
+-LT_REVISION=$GTK_INTERFACE_AGE
+-LT_AGE=`expr $GTK_BINARY_AGE - $GTK_INTERFACE_AGE`
++LT_RELEASE=12
++LT_CURRENT=2
++LT_REVISION=0
++LT_AGE=0
+
+
+
+@@ -3689,7 +3689,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
@@ -9,3 +24,20 @@
fi
rm -f conftest*
INSTOBJEXT=.mo
+@@ -3699,7 +3699,7 @@
+ # Added by Martin Baulig 12/15/98 for libc5 systems
+ if test "$gt_cv_func_dgettext_libc" != "yes" \
+ && test "$gt_cv_func_dgettext_libintl" = "yes"; then
+- INTLLIBS=-lintl
++ INTLLIBS="-lintl -lxpg4"
+ LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+ fi
+
+@@ -4446,6 +4446,7 @@
+ glib_thread_cflags="$GLIB_CFLAGS"
+ glib_libs=`$GLIB_CONFIG glib gmodule --libs`
+ glib_thread_libs="$GLIB_LIBS"
++ GLIB_CFLAGS="$glib_cflags"
+ GLIB_LIBS="$glib_libs"
+ GLIB_DEPLIBS="$glib_libs"
+ else
diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist
index eaa533417e51..3777b1036248 100644
--- a/x11-toolkits/gtk12/pkg-plist
+++ b/x11-toolkits/gtk12/pkg-plist
@@ -123,23 +123,24 @@ include/gtk12/gtk/gtkwindow.h
@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/gdk.info %D/info/dir
@exec install-info %D/info/gtk.info %D/info/dir
lib/libgdk12.a
-lib/libgdk12.la
lib/libgdk12.so
-lib/libgdk12.so.1
+lib/libgdk12.so.2
lib/libgtk12.a
-lib/libgtk12.la
lib/libgtk12.so
-lib/libgtk12.so.1
+lib/libgtk12.so.2
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+share/aclocal/gtk.m4
+share/locale/ca/LC_MESSAGES/gtk+.mo
share/locale/cs/LC_MESSAGES/gtk+.mo
share/locale/de/LC_MESSAGES/gtk+.mo
share/locale/es/LC_MESSAGES/gtk+.mo
+share/locale/fi/LC_MESSAGES/gtk+.mo
share/locale/fr/LC_MESSAGES/gtk+.mo
+share/locale/hr/LC_MESSAGES/gtk+.mo
share/locale/hu/LC_MESSAGES/gtk+.mo
share/locale/it/LC_MESSAGES/gtk+.mo
share/locale/ja/LC_MESSAGES/gtk+.mo
@@ -149,11 +150,22 @@ share/locale/no/LC_MESSAGES/gtk+.mo
share/locale/pl/LC_MESSAGES/gtk+.mo
share/locale/pt/LC_MESSAGES/gtk+.mo
share/locale/ru/LC_MESSAGES/gtk+.mo
+share/locale/sk/LC_MESSAGES/gtk+.mo
+share/locale/sl/LC_MESSAGES/gtk+.mo
share/locale/sv/LC_MESSAGES/gtk+.mo
+share/locale/wa/LC_MESSAGES/gtk+.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/gtk+.mo
share/themes/Default/gtk/gtkrc
+share/themes/Default/gtk/gtkrc.cs
+share/themes/Default/gtk/gtkrc.hr
+share/themes/Default/gtk/gtkrc.hu
+share/themes/Default/gtk/gtkrc.iso-8859-2
share/themes/Default/gtk/gtkrc.ja
share/themes/Default/gtk/gtkrc.ko
+share/themes/Default/gtk/gtkrc.pl
share/themes/Default/gtk/gtkrc.ru
+share/themes/Default/gtk/gtkrc.sk
+share/themes/Default/gtk/gtkrc.sl
@exec mkdir -p %D/share/themes/engines
@dirrm share/themes/Default/gtk
@dirrm share/themes/Default
diff --git a/x11-toolkits/gtk13/Makefile b/x11-toolkits/gtk13/Makefile
index 3f95abd930bd..ba60715ca5ae 100644
--- a/x11-toolkits/gtk13/Makefile
+++ b/x11-toolkits/gtk13/Makefile
@@ -1,13 +1,13 @@
# New ports collection makefile for: gtk12
-# Version required: 1.2.2
+# Version required: 1.2.3
# Date Created: 28 Sep 1997
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
-# $Id: Makefile,v 1.48 1999/03/27 00:00:16 flathill Exp $
+# $Id: Makefile,v 1.49 1999/05/02 05:21:19 kuriyama Exp $
#
-DISTNAME= gtk+-1.2.2
-PKGNAME= gtk-1.2.2
+DISTNAME= gtk+-1.2.3
+PKGNAME= gtk-1.2.3
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
@@ -15,15 +15,18 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
MAINTAINER= vanilla@FreeBSD.ORG
-LIB_DEPENDS= glib12.1:${PORTSDIR}/devel/glib12 \
+LIB_DEPENDS= glib12.2:${PORTSDIR}/devel/glib12 \
intl.1:${PORTSDIR}/devel/gettext
+GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
+
USE_X_PREFIX= yes
USE_PERL5= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk12
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \
+ X_CFLAGS="-I${LOCALBASE}/include" \
+ GLIB_CONFIG="${GLIB_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
MAN1= gtk12-config.1
@@ -33,16 +36,5 @@ pre-build:
post-install:
@${MKDIR} ${PREFIX}/share/themes/engines
- @if [ ! -f ${PREFIX}/share/info ]; then \
- ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
- fi
- @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
- @${ECHO} '*********************************************************'
- @${ECHO} '* *'
- @${ECHO} '* If you want to use autoconf with gtk, *'
- @${ECHO} '* Please copy gtk.m4 to /usr/local/share/aclocal *'
- @${ECHO} '* by yourself, thanks. *'
- @${ECHO} '* *'
- @${ECHO} '*********************************************************'
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtk13/distinfo b/x11-toolkits/gtk13/distinfo
index ea2fb1bb49c9..ff4bd14745b7 100644
--- a/x11-toolkits/gtk13/distinfo
+++ b/x11-toolkits/gtk13/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.2.2.tar.gz) = 2776dca7d9f907b7b851ac9a4d4fb304
+MD5 (gtk+-1.2.3.tar.gz) = 51d880fc05a99861be4abe161adaaddd
diff --git a/x11-toolkits/gtk13/files/patch-ad b/x11-toolkits/gtk13/files/patch-ad
index f03d93d683ea..fb578b3b9032 100644
--- a/x11-toolkits/gtk13/files/patch-ad
+++ b/x11-toolkits/gtk13/files/patch-ad
@@ -1,5 +1,5 @@
---- gtk/gtkrc.c.orig Wed Apr 14 05:20:09 1999
-+++ gtk/gtkrc.c Sun May 2 13:27:23 1999
+--- gtk/gtkrc.c.orig Tue May 11 04:31:09 1999
++++ gtk/gtkrc.c Sat May 15 19:01:44 1999
@@ -231,9 +231,9 @@
var = getenv("GTK_EXE_PREFIX");
@@ -38,8 +38,8 @@
var = g_get_home_dir ();
if (var)
-- path = g_strdup_printf("%s%s", var, ".gtk/lib/themes/engines");
-+ path = g_strdup_printf("%s%s", var, ".gtk/themes/engines");
+- path = g_strdup_printf("%s%s", var, "/.gtk/lib/themes/engines");
++ path = g_strdup_printf("%s%s", var, "/.gtk/themes/engines");
module_path[n++] = g_strdup(path);
module_path[n] = NULL;
g_free(path);
diff --git a/x11-toolkits/gtk13/files/patch-ae b/x11-toolkits/gtk13/files/patch-ae
index 854b0d4e5cc3..c241c2e075a6 100644
--- a/x11-toolkits/gtk13/files/patch-ae
+++ b/x11-toolkits/gtk13/files/patch-ae
@@ -1,6 +1,21 @@
---- configure.orig Thu Feb 25 13:02:28 1999
-+++ configure Tue Mar 2 11:11:14 1999
-@@ -3977,7 +3977,7 @@
+--- configure.orig Tue May 11 05:42:09 1999
++++ configure Mon May 17 22:59:13 1999
+@@ -606,10 +606,10 @@
+
+
+ # libtool versioning
+-LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION
+-LT_CURRENT=`expr $GTK_MICRO_VERSION - $GTK_INTERFACE_AGE`
+-LT_REVISION=$GTK_INTERFACE_AGE
+-LT_AGE=`expr $GTK_BINARY_AGE - $GTK_INTERFACE_AGE`
++LT_RELEASE=12
++LT_CURRENT=2
++LT_REVISION=0
++LT_AGE=0
+
+
+
+@@ -3689,7 +3689,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
@@ -9,3 +24,20 @@
fi
rm -f conftest*
INSTOBJEXT=.mo
+@@ -3699,7 +3699,7 @@
+ # Added by Martin Baulig 12/15/98 for libc5 systems
+ if test "$gt_cv_func_dgettext_libc" != "yes" \
+ && test "$gt_cv_func_dgettext_libintl" = "yes"; then
+- INTLLIBS=-lintl
++ INTLLIBS="-lintl -lxpg4"
+ LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+ fi
+
+@@ -4446,6 +4446,7 @@
+ glib_thread_cflags="$GLIB_CFLAGS"
+ glib_libs=`$GLIB_CONFIG glib gmodule --libs`
+ glib_thread_libs="$GLIB_LIBS"
++ GLIB_CFLAGS="$glib_cflags"
+ GLIB_LIBS="$glib_libs"
+ GLIB_DEPLIBS="$glib_libs"
+ else
diff --git a/x11-toolkits/gtk13/pkg-plist b/x11-toolkits/gtk13/pkg-plist
index eaa533417e51..3777b1036248 100644
--- a/x11-toolkits/gtk13/pkg-plist
+++ b/x11-toolkits/gtk13/pkg-plist
@@ -123,23 +123,24 @@ include/gtk12/gtk/gtkwindow.h
@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/gdk.info %D/info/dir
@exec install-info %D/info/gtk.info %D/info/dir
lib/libgdk12.a
-lib/libgdk12.la
lib/libgdk12.so
-lib/libgdk12.so.1
+lib/libgdk12.so.2
lib/libgtk12.a
-lib/libgtk12.la
lib/libgtk12.so
-lib/libgtk12.so.1
+lib/libgtk12.so.2
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+share/aclocal/gtk.m4
+share/locale/ca/LC_MESSAGES/gtk+.mo
share/locale/cs/LC_MESSAGES/gtk+.mo
share/locale/de/LC_MESSAGES/gtk+.mo
share/locale/es/LC_MESSAGES/gtk+.mo
+share/locale/fi/LC_MESSAGES/gtk+.mo
share/locale/fr/LC_MESSAGES/gtk+.mo
+share/locale/hr/LC_MESSAGES/gtk+.mo
share/locale/hu/LC_MESSAGES/gtk+.mo
share/locale/it/LC_MESSAGES/gtk+.mo
share/locale/ja/LC_MESSAGES/gtk+.mo
@@ -149,11 +150,22 @@ share/locale/no/LC_MESSAGES/gtk+.mo
share/locale/pl/LC_MESSAGES/gtk+.mo
share/locale/pt/LC_MESSAGES/gtk+.mo
share/locale/ru/LC_MESSAGES/gtk+.mo
+share/locale/sk/LC_MESSAGES/gtk+.mo
+share/locale/sl/LC_MESSAGES/gtk+.mo
share/locale/sv/LC_MESSAGES/gtk+.mo
+share/locale/wa/LC_MESSAGES/gtk+.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/gtk+.mo
share/themes/Default/gtk/gtkrc
+share/themes/Default/gtk/gtkrc.cs
+share/themes/Default/gtk/gtkrc.hr
+share/themes/Default/gtk/gtkrc.hu
+share/themes/Default/gtk/gtkrc.iso-8859-2
share/themes/Default/gtk/gtkrc.ja
share/themes/Default/gtk/gtkrc.ko
+share/themes/Default/gtk/gtkrc.pl
share/themes/Default/gtk/gtkrc.ru
+share/themes/Default/gtk/gtkrc.sk
+share/themes/Default/gtk/gtkrc.sl
@exec mkdir -p %D/share/themes/engines
@dirrm share/themes/Default/gtk
@dirrm share/themes/Default
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 3f95abd930bd..ba60715ca5ae 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -1,13 +1,13 @@
# New ports collection makefile for: gtk12
-# Version required: 1.2.2
+# Version required: 1.2.3
# Date Created: 28 Sep 1997
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
-# $Id: Makefile,v 1.48 1999/03/27 00:00:16 flathill Exp $
+# $Id: Makefile,v 1.49 1999/05/02 05:21:19 kuriyama Exp $
#
-DISTNAME= gtk+-1.2.2
-PKGNAME= gtk-1.2.2
+DISTNAME= gtk+-1.2.3
+PKGNAME= gtk-1.2.3
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
@@ -15,15 +15,18 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
MAINTAINER= vanilla@FreeBSD.ORG
-LIB_DEPENDS= glib12.1:${PORTSDIR}/devel/glib12 \
+LIB_DEPENDS= glib12.2:${PORTSDIR}/devel/glib12 \
intl.1:${PORTSDIR}/devel/gettext
+GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
+
USE_X_PREFIX= yes
USE_PERL5= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk12
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \
+ X_CFLAGS="-I${LOCALBASE}/include" \
+ GLIB_CONFIG="${GLIB_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
MAN1= gtk12-config.1
@@ -33,16 +36,5 @@ pre-build:
post-install:
@${MKDIR} ${PREFIX}/share/themes/engines
- @if [ ! -f ${PREFIX}/share/info ]; then \
- ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
- fi
- @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
- @${ECHO} '*********************************************************'
- @${ECHO} '* *'
- @${ECHO} '* If you want to use autoconf with gtk, *'
- @${ECHO} '* Please copy gtk.m4 to /usr/local/share/aclocal *'
- @${ECHO} '* by yourself, thanks. *'
- @${ECHO} '* *'
- @${ECHO} '*********************************************************'
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index ea2fb1bb49c9..ff4bd14745b7 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.2.2.tar.gz) = 2776dca7d9f907b7b851ac9a4d4fb304
+MD5 (gtk+-1.2.3.tar.gz) = 51d880fc05a99861be4abe161adaaddd
diff --git a/x11-toolkits/gtk20/files/patch-ad b/x11-toolkits/gtk20/files/patch-ad
index f03d93d683ea..fb578b3b9032 100644
--- a/x11-toolkits/gtk20/files/patch-ad
+++ b/x11-toolkits/gtk20/files/patch-ad
@@ -1,5 +1,5 @@
---- gtk/gtkrc.c.orig Wed Apr 14 05:20:09 1999
-+++ gtk/gtkrc.c Sun May 2 13:27:23 1999
+--- gtk/gtkrc.c.orig Tue May 11 04:31:09 1999
++++ gtk/gtkrc.c Sat May 15 19:01:44 1999
@@ -231,9 +231,9 @@
var = getenv("GTK_EXE_PREFIX");
@@ -38,8 +38,8 @@
var = g_get_home_dir ();
if (var)
-- path = g_strdup_printf("%s%s", var, ".gtk/lib/themes/engines");
-+ path = g_strdup_printf("%s%s", var, ".gtk/themes/engines");
+- path = g_strdup_printf("%s%s", var, "/.gtk/lib/themes/engines");
++ path = g_strdup_printf("%s%s", var, "/.gtk/themes/engines");
module_path[n++] = g_strdup(path);
module_path[n] = NULL;
g_free(path);
diff --git a/x11-toolkits/gtk20/files/patch-ae b/x11-toolkits/gtk20/files/patch-ae
index 854b0d4e5cc3..c241c2e075a6 100644
--- a/x11-toolkits/gtk20/files/patch-ae
+++ b/x11-toolkits/gtk20/files/patch-ae
@@ -1,6 +1,21 @@
---- configure.orig Thu Feb 25 13:02:28 1999
-+++ configure Tue Mar 2 11:11:14 1999
-@@ -3977,7 +3977,7 @@
+--- configure.orig Tue May 11 05:42:09 1999
++++ configure Mon May 17 22:59:13 1999
+@@ -606,10 +606,10 @@
+
+
+ # libtool versioning
+-LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION
+-LT_CURRENT=`expr $GTK_MICRO_VERSION - $GTK_INTERFACE_AGE`
+-LT_REVISION=$GTK_INTERFACE_AGE
+-LT_AGE=`expr $GTK_BINARY_AGE - $GTK_INTERFACE_AGE`
++LT_RELEASE=12
++LT_CURRENT=2
++LT_REVISION=0
++LT_AGE=0
+
+
+
+@@ -3689,7 +3689,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
@@ -9,3 +24,20 @@
fi
rm -f conftest*
INSTOBJEXT=.mo
+@@ -3699,7 +3699,7 @@
+ # Added by Martin Baulig 12/15/98 for libc5 systems
+ if test "$gt_cv_func_dgettext_libc" != "yes" \
+ && test "$gt_cv_func_dgettext_libintl" = "yes"; then
+- INTLLIBS=-lintl
++ INTLLIBS="-lintl -lxpg4"
+ LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+ fi
+
+@@ -4446,6 +4446,7 @@
+ glib_thread_cflags="$GLIB_CFLAGS"
+ glib_libs=`$GLIB_CONFIG glib gmodule --libs`
+ glib_thread_libs="$GLIB_LIBS"
++ GLIB_CFLAGS="$glib_cflags"
+ GLIB_LIBS="$glib_libs"
+ GLIB_DEPLIBS="$glib_libs"
+ else
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index eaa533417e51..3777b1036248 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -123,23 +123,24 @@ include/gtk12/gtk/gtkwindow.h
@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/gdk.info %D/info/dir
@exec install-info %D/info/gtk.info %D/info/dir
lib/libgdk12.a
-lib/libgdk12.la
lib/libgdk12.so
-lib/libgdk12.so.1
+lib/libgdk12.so.2
lib/libgtk12.a
-lib/libgtk12.la
lib/libgtk12.so
-lib/libgtk12.so.1
+lib/libgtk12.so.2
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+share/aclocal/gtk.m4
+share/locale/ca/LC_MESSAGES/gtk+.mo
share/locale/cs/LC_MESSAGES/gtk+.mo
share/locale/de/LC_MESSAGES/gtk+.mo
share/locale/es/LC_MESSAGES/gtk+.mo
+share/locale/fi/LC_MESSAGES/gtk+.mo
share/locale/fr/LC_MESSAGES/gtk+.mo
+share/locale/hr/LC_MESSAGES/gtk+.mo
share/locale/hu/LC_MESSAGES/gtk+.mo
share/locale/it/LC_MESSAGES/gtk+.mo
share/locale/ja/LC_MESSAGES/gtk+.mo
@@ -149,11 +150,22 @@ share/locale/no/LC_MESSAGES/gtk+.mo
share/locale/pl/LC_MESSAGES/gtk+.mo
share/locale/pt/LC_MESSAGES/gtk+.mo
share/locale/ru/LC_MESSAGES/gtk+.mo
+share/locale/sk/LC_MESSAGES/gtk+.mo
+share/locale/sl/LC_MESSAGES/gtk+.mo
share/locale/sv/LC_MESSAGES/gtk+.mo
+share/locale/wa/LC_MESSAGES/gtk+.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/gtk+.mo
share/themes/Default/gtk/gtkrc
+share/themes/Default/gtk/gtkrc.cs
+share/themes/Default/gtk/gtkrc.hr
+share/themes/Default/gtk/gtkrc.hu
+share/themes/Default/gtk/gtkrc.iso-8859-2
share/themes/Default/gtk/gtkrc.ja
share/themes/Default/gtk/gtkrc.ko
+share/themes/Default/gtk/gtkrc.pl
share/themes/Default/gtk/gtkrc.ru
+share/themes/Default/gtk/gtkrc.sk
+share/themes/Default/gtk/gtkrc.sl
@exec mkdir -p %D/share/themes/engines
@dirrm share/themes/Default/gtk
@dirrm share/themes/Default
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 3f95abd930bd..ba60715ca5ae 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -1,13 +1,13 @@
# New ports collection makefile for: gtk12
-# Version required: 1.2.2
+# Version required: 1.2.3
# Date Created: 28 Sep 1997
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
-# $Id: Makefile,v 1.48 1999/03/27 00:00:16 flathill Exp $
+# $Id: Makefile,v 1.49 1999/05/02 05:21:19 kuriyama Exp $
#
-DISTNAME= gtk+-1.2.2
-PKGNAME= gtk-1.2.2
+DISTNAME= gtk+-1.2.3
+PKGNAME= gtk-1.2.3
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
@@ -15,15 +15,18 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
MAINTAINER= vanilla@FreeBSD.ORG
-LIB_DEPENDS= glib12.1:${PORTSDIR}/devel/glib12 \
+LIB_DEPENDS= glib12.2:${PORTSDIR}/devel/glib12 \
intl.1:${PORTSDIR}/devel/gettext
+GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
+
USE_X_PREFIX= yes
USE_PERL5= yes
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk12
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \
+ X_CFLAGS="-I${LOCALBASE}/include" \
+ GLIB_CONFIG="${GLIB_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
MAN1= gtk12-config.1
@@ -33,16 +36,5 @@ pre-build:
post-install:
@${MKDIR} ${PREFIX}/share/themes/engines
- @if [ ! -f ${PREFIX}/share/info ]; then \
- ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
- fi
- @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
- @${ECHO} '*********************************************************'
- @${ECHO} '* *'
- @${ECHO} '* If you want to use autoconf with gtk, *'
- @${ECHO} '* Please copy gtk.m4 to /usr/local/share/aclocal *'
- @${ECHO} '* by yourself, thanks. *'
- @${ECHO} '* *'
- @${ECHO} '*********************************************************'
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index ea2fb1bb49c9..ff4bd14745b7 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.2.2.tar.gz) = 2776dca7d9f907b7b851ac9a4d4fb304
+MD5 (gtk+-1.2.3.tar.gz) = 51d880fc05a99861be4abe161adaaddd
diff --git a/x11-toolkits/gtk30/files/patch-ad b/x11-toolkits/gtk30/files/patch-ad
index f03d93d683ea..fb578b3b9032 100644
--- a/x11-toolkits/gtk30/files/patch-ad
+++ b/x11-toolkits/gtk30/files/patch-ad
@@ -1,5 +1,5 @@
---- gtk/gtkrc.c.orig Wed Apr 14 05:20:09 1999
-+++ gtk/gtkrc.c Sun May 2 13:27:23 1999
+--- gtk/gtkrc.c.orig Tue May 11 04:31:09 1999
++++ gtk/gtkrc.c Sat May 15 19:01:44 1999
@@ -231,9 +231,9 @@
var = getenv("GTK_EXE_PREFIX");
@@ -38,8 +38,8 @@
var = g_get_home_dir ();
if (var)
-- path = g_strdup_printf("%s%s", var, ".gtk/lib/themes/engines");
-+ path = g_strdup_printf("%s%s", var, ".gtk/themes/engines");
+- path = g_strdup_printf("%s%s", var, "/.gtk/lib/themes/engines");
++ path = g_strdup_printf("%s%s", var, "/.gtk/themes/engines");
module_path[n++] = g_strdup(path);
module_path[n] = NULL;
g_free(path);
diff --git a/x11-toolkits/gtk30/files/patch-ae b/x11-toolkits/gtk30/files/patch-ae
index 854b0d4e5cc3..c241c2e075a6 100644
--- a/x11-toolkits/gtk30/files/patch-ae
+++ b/x11-toolkits/gtk30/files/patch-ae
@@ -1,6 +1,21 @@
---- configure.orig Thu Feb 25 13:02:28 1999
-+++ configure Tue Mar 2 11:11:14 1999
-@@ -3977,7 +3977,7 @@
+--- configure.orig Tue May 11 05:42:09 1999
++++ configure Mon May 17 22:59:13 1999
+@@ -606,10 +606,10 @@
+
+
+ # libtool versioning
+-LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION
+-LT_CURRENT=`expr $GTK_MICRO_VERSION - $GTK_INTERFACE_AGE`
+-LT_REVISION=$GTK_INTERFACE_AGE
+-LT_AGE=`expr $GTK_BINARY_AGE - $GTK_INTERFACE_AGE`
++LT_RELEASE=12
++LT_CURRENT=2
++LT_REVISION=0
++LT_AGE=0
+
+
+
+@@ -3689,7 +3689,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
@@ -9,3 +24,20 @@
fi
rm -f conftest*
INSTOBJEXT=.mo
+@@ -3699,7 +3699,7 @@
+ # Added by Martin Baulig 12/15/98 for libc5 systems
+ if test "$gt_cv_func_dgettext_libc" != "yes" \
+ && test "$gt_cv_func_dgettext_libintl" = "yes"; then
+- INTLLIBS=-lintl
++ INTLLIBS="-lintl -lxpg4"
+ LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+ fi
+
+@@ -4446,6 +4446,7 @@
+ glib_thread_cflags="$GLIB_CFLAGS"
+ glib_libs=`$GLIB_CONFIG glib gmodule --libs`
+ glib_thread_libs="$GLIB_LIBS"
++ GLIB_CFLAGS="$glib_cflags"
+ GLIB_LIBS="$glib_libs"
+ GLIB_DEPLIBS="$glib_libs"
+ else
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index eaa533417e51..3777b1036248 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -123,23 +123,24 @@ include/gtk12/gtk/gtkwindow.h
@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/gdk.info %D/info/dir
@exec install-info %D/info/gtk.info %D/info/dir
lib/libgdk12.a
-lib/libgdk12.la
lib/libgdk12.so
-lib/libgdk12.so.1
+lib/libgdk12.so.2
lib/libgtk12.a
-lib/libgtk12.la
lib/libgtk12.so
-lib/libgtk12.so.1
+lib/libgtk12.so.2
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+share/aclocal/gtk.m4
+share/locale/ca/LC_MESSAGES/gtk+.mo
share/locale/cs/LC_MESSAGES/gtk+.mo
share/locale/de/LC_MESSAGES/gtk+.mo
share/locale/es/LC_MESSAGES/gtk+.mo
+share/locale/fi/LC_MESSAGES/gtk+.mo
share/locale/fr/LC_MESSAGES/gtk+.mo
+share/locale/hr/LC_MESSAGES/gtk+.mo
share/locale/hu/LC_MESSAGES/gtk+.mo
share/locale/it/LC_MESSAGES/gtk+.mo
share/locale/ja/LC_MESSAGES/gtk+.mo
@@ -149,11 +150,22 @@ share/locale/no/LC_MESSAGES/gtk+.mo
share/locale/pl/LC_MESSAGES/gtk+.mo
share/locale/pt/LC_MESSAGES/gtk+.mo
share/locale/ru/LC_MESSAGES/gtk+.mo
+share/locale/sk/LC_MESSAGES/gtk+.mo
+share/locale/sl/LC_MESSAGES/gtk+.mo
share/locale/sv/LC_MESSAGES/gtk+.mo
+share/locale/wa/LC_MESSAGES/gtk+.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/gtk+.mo
share/themes/Default/gtk/gtkrc
+share/themes/Default/gtk/gtkrc.cs
+share/themes/Default/gtk/gtkrc.hr
+share/themes/Default/gtk/gtkrc.hu
+share/themes/Default/gtk/gtkrc.iso-8859-2
share/themes/Default/gtk/gtkrc.ja
share/themes/Default/gtk/gtkrc.ko
+share/themes/Default/gtk/gtkrc.pl
share/themes/Default/gtk/gtkrc.ru
+share/themes/Default/gtk/gtkrc.sk
+share/themes/Default/gtk/gtkrc.sl
@exec mkdir -p %D/share/themes/engines
@dirrm share/themes/Default/gtk
@dirrm share/themes/Default
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-15 15:54:43 +0000