From 298ab1c5a7113eae2b7049c2160ec52c50243a78 Mon Sep 17 00:00:00 2001 From: marcus Date: Thu, 12 Dec 2002 19:53:10 +0000 Subject: Update to 2.1.4. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@286 df743ca5-7f9a-e211-a948-0013205c9059 --- x11-toolkits/gtk20/Makefile | 6 +++++- x11-toolkits/gtk20/distinfo | 2 +- x11-toolkits/gtk20/files/patch-ae | 18 +++--------------- x11-toolkits/gtk20/files/patch-ag | 11 ++++------- x11-toolkits/gtk20/pkg-plist | 1 + 5 files changed, 14 insertions(+), 24 deletions(-) (limited to 'x11-toolkits') diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index fbb753d29..86fcb8183 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gtk -PORTVERSION= 2.1.3 +PORTVERSION= 2.1.4 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.1,} \ ftp://ftp.gtk.org/pub/gtk/v2.0/ \ @@ -51,6 +51,10 @@ post-patch: xargs ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g' @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \ 's|Xft\.h|Xft2.h|g' + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \ + ${WRKSRC}/po/Makefile.in.in pre-build: ${RM} -rf ${WRKSRC}/docs/gtk.info* diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo index 593ed13c0..8c8de20f6 100644 --- a/x11-toolkits/gtk20/distinfo +++ b/x11-toolkits/gtk20/distinfo @@ -1 +1 @@ -MD5 (gnome2/gtk+-2.1.3.tar.bz2) = ada2fd5c11d36e112f545c2e52c48c90 +MD5 (gnome2/gtk+-2.1.4.tar.bz2) = a0ea534c391c649aef1b690ce5ad8b0c diff --git a/x11-toolkits/gtk20/files/patch-ae b/x11-toolkits/gtk20/files/patch-ae index 63b7a8f0f..f195f07b4 100644 --- a/x11-toolkits/gtk20/files/patch-ae +++ b/x11-toolkits/gtk20/files/patch-ae @@ -1,9 +1,6 @@ - -$FreeBSD: ports/x11-toolkits/gtk20/files/patch-ae,v 1.11 2002/06/01 19:00:46 marcus Exp $ - ---- configure.orig Thu May 23 17:20:40 2002 -+++ configure Sat Jun 1 14:26:00 2002 -@@ -7192,6 +7192,7 @@ +--- configure.orig Wed Dec 11 18:31:51 2002 ++++ configure Thu Dec 12 12:07:17 2002 +@@ -7414,6 +7414,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -11,12 +8,3 @@ $FreeBSD: ports/x11-toolkits/gtk20/files/patch-ae,v 1.11 2002/06/01 19:00:46 mar # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -10107,7 +10108,7 @@ - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=share - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - INSTOBJEXT=.mo diff --git a/x11-toolkits/gtk20/files/patch-ag b/x11-toolkits/gtk20/files/patch-ag index 71a49c0e7..b0be15779 100644 --- a/x11-toolkits/gtk20/files/patch-ag +++ b/x11-toolkits/gtk20/files/patch-ag @@ -1,14 +1,11 @@ - -$FreeBSD: ports/x11-toolkits/gtk20/files/patch-ag,v 1.9 2002/06/01 19:00:46 marcus Exp $ - ---- gtk/Makefile.in.orig Sat Jun 1 14:27:02 2002 -+++ gtk/Makefile.in Sat Jun 1 14:29:10 2002 -@@ -182,7 +182,7 @@ +--- gtk/Makefile.in.orig Thu Dec 12 12:07:53 2002 ++++ gtk/Makefile.in Thu Dec 12 12:08:43 2002 +@@ -183,7 +183,7 @@ -DG_LOG_DOMAIN=\"Gtk\" \ -DGTK_LIBDIR=\"$(libdir)\" \ -DGTK_DATA_PREFIX=\"$(prefix)\" \ - -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ + -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" \ - -DGTK_LOCALEDIR=\"$(gtklocaledir)\" \ -DGTK_VERSION=\"@GTK_VERSION@\" \ -DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\" \ + -DGTK_HOST=\"@host@\" \ diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index 0d576fea1..80c45dd27 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -258,6 +258,7 @@ share/locale/it/LC_MESSAGES/gtk20.mo share/locale/ja/LC_MESSAGES/gtk20.mo share/locale/ko/LC_MESSAGES/gtk20.mo share/locale/lt/LC_MESSAGES/gtk20.mo +share/locale/lv/LC_MESSAGES/gtk20.mo share/locale/ms/LC_MESSAGES/gtk20.mo share/locale/nl/LC_MESSAGES/gtk20.mo share/locale/nn/LC_MESSAGES/gtk20.mo -- cgit v1.2.3