summaryrefslogtreecommitdiff
path: root/x11-toolkits/gtk20
diff options
context:
space:
mode:
authorSteve Price <steve@FreeBSD.org>1999-05-29 03:49:46 +0000
committerSteve Price <steve@FreeBSD.org>1999-05-29 03:49:46 +0000
commitf888af4cee6cadfee7f9f29b44eb27b2868f4a5e (patch)
treebf9fc6cad39248865b457112bb366b50081a0fcd /x11-toolkits/gtk20
parentUse glib version 1.2.3. (diff)
Update to version 1.2.3.
PR: 11842 Submitted by: Jeremy Lea <reg@shale.csir.co.za>
Diffstat (limited to 'x11-toolkits/gtk20')
-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
5 files changed, 67 insertions, 31 deletions
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 03:27:15 +0000