From 11c45a96af0c555572d7f1d409322a51d24201b9 Mon Sep 17 00:00:00 2001 From: Maxim Sobolev Date: Sun, 13 Jan 2002 19:21:34 +0000 Subject: [PATCH] Update to 0.19. PR: 33831 Submitted by: Joe Marcus Clarke --- x11-toolkits/gal/Makefile | 4 ++-- x11-toolkits/gal/distinfo | 2 +- x11-toolkits/gal/files/patch-aa | 20 +++++++++---------- .../gal/files/patch-po::Makefile.in.in | 14 +++++++++++++ x11-toolkits/gal/pkg-plist | 3 ++- x11-toolkits/gal2/Makefile | 4 ++-- x11-toolkits/gal2/distinfo | 2 +- x11-toolkits/gal2/files/patch-aa | 20 +++++++++---------- .../gal2/files/patch-po::Makefile.in.in | 14 +++++++++++++ x11-toolkits/gal2/pkg-plist | 3 ++- 10 files changed, 58 insertions(+), 28 deletions(-) create mode 100644 x11-toolkits/gal/files/patch-po::Makefile.in.in create mode 100644 x11-toolkits/gal2/files/patch-po::Makefile.in.in diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile index 18e11274be17..c3625f8249a6 100644 --- a/x11-toolkits/gal/Makefile +++ b/x11-toolkits/gal/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gal -PORTVERSION= 0.18.1 +PORTVERSION= 0.19 CATEGORIES?= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= unstable/sources/gal @@ -32,7 +32,7 @@ PLIST_SUB= VERSION=${PORTVERSION} pre-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' @find ${WRKSRC}/gal/widgets -name '*.[ch]' | xargs ${PERL} -pi -e \ diff --git a/x11-toolkits/gal/distinfo b/x11-toolkits/gal/distinfo index c1a247bc801a..e8824ddecb63 100644 --- a/x11-toolkits/gal/distinfo +++ b/x11-toolkits/gal/distinfo @@ -1 +1 @@ -MD5 (gal-0.18.1.tar.gz) = c7bc647a9cbc92350fb65de524bf1259 +MD5 (gal-0.19.tar.gz) = 8c854f2532e434de6ea99382abe5fc35 diff --git a/x11-toolkits/gal/files/patch-aa b/x11-toolkits/gal/files/patch-aa index f649c3b27f83..6051ab181d24 100644 --- a/x11-toolkits/gal/files/patch-aa +++ b/x11-toolkits/gal/files/patch-aa @@ -1,23 +1,23 @@ $FreeBSD$ ---- configure.orig Wed Sep 26 11:16:25 2001 -+++ configure Wed Sep 26 11:16:25 2001 -@@ -5075,9 +5075,9 @@ +--- configure.orig Sun Jan 13 17:23:41 2002 ++++ configure Sun Jan 13 17:24:34 2002 +@@ -4890,9 +4890,9 @@ save_CFLAGS="$CFLAGS" save_LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS $ICONV_CFLAGS" -LDFLAGS="$LDFLAGS $ICONV_LIBS -liconv" -echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 --echo "configure:5081: checking for iconv in -liconv" >&5 +-echo "configure:4896: checking for iconv in -liconv" >&5 +LDFLAGS="$LDFLAGS $ICONV_LIBS -lgiconv" +echo $ac_n "checking for iconv in -lgiconv""... $ac_c" 1>&6 -+echo "configure:5081: checking for iconv in -lgiconv" >&5 ++echo "configure:4896: checking for iconv in -lgiconv" >&5 if eval "test \"`echo '$''{'ac_cv_libiconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -5085,7 +5085,7 @@ - #line 5086 "configure" +@@ -4900,7 +4900,7 @@ + #line 4901 "configure" #include "confdefs.h" -#include @@ -25,7 +25,7 @@ $FreeBSD$ int main() { -@@ -5108,7 +5108,7 @@ +@@ -4923,7 +4923,7 @@ echo "$ac_t""$ac_cv_libiconv" 1>&6 if test $ac_cv_libiconv = yes; then @@ -34,8 +34,8 @@ $FreeBSD$ have_iconv=yes else CFLAGS="$save_CFLAGS" -@@ -5234,7 +5234,7 @@ - #line 5235 "configure" +@@ -5049,7 +5049,7 @@ + #line 5050 "configure" #include "confdefs.h" -#include diff --git a/x11-toolkits/gal/files/patch-po::Makefile.in.in b/x11-toolkits/gal/files/patch-po::Makefile.in.in new file mode 100644 index 000000000000..4b62b94bc987 --- /dev/null +++ b/x11-toolkits/gal/files/patch-po::Makefile.in.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- po/Makefile.in.in 2002/01/13 15:56:57 1.1 ++++ po/Makefile.in.in 2002/01/13 15:57:15 +@@ -106,7 +106,7 @@ + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ +- lang=`echo $$cat | sed 's/\.gmo$$//'`; \ ++ lang=`echo $$cat | sed 's/\.mo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkinstalldirs) $(DESTDIR)$$dir; \ + if test -r $$cat; then \ diff --git a/x11-toolkits/gal/pkg-plist b/x11-toolkits/gal/pkg-plist index 7af6c0af0512..1acf200a5b21 100644 --- a/x11-toolkits/gal/pkg-plist +++ b/x11-toolkits/gal/pkg-plist @@ -98,6 +98,7 @@ include/gal/util/e-util.h include/gal/util/e-xml-utils.h include/gal/widgets/color-group.h include/gal/widgets/color-palette.h +include/gal/widgets/e-canvas-background.h include/gal/widgets/e-canvas-utils.h include/gal/widgets/e-canvas-vbox.h include/gal/widgets/e-canvas.h @@ -130,7 +131,7 @@ include/gal/widgets/widget-color-combo.h include/gal/widgets/widget-pixmap-combo.h lib/libgal.a lib/libgal.so -lib/libgal.so.18 +lib/libgal.so.19 share/gnome/etable/%%VERSION%%/glade/e-table-config-no-group.glade share/gnome/etable/%%VERSION%%/glade/e-table-config.glade share/gnome/etable/%%VERSION%%/glade/e-table-field-chooser.glade diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile index 18e11274be17..c3625f8249a6 100644 --- a/x11-toolkits/gal2/Makefile +++ b/x11-toolkits/gal2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gal -PORTVERSION= 0.18.1 +PORTVERSION= 0.19 CATEGORIES?= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= unstable/sources/gal @@ -32,7 +32,7 @@ PLIST_SUB= VERSION=${PORTVERSION} pre-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' @find ${WRKSRC}/gal/widgets -name '*.[ch]' | xargs ${PERL} -pi -e \ diff --git a/x11-toolkits/gal2/distinfo b/x11-toolkits/gal2/distinfo index c1a247bc801a..e8824ddecb63 100644 --- a/x11-toolkits/gal2/distinfo +++ b/x11-toolkits/gal2/distinfo @@ -1 +1 @@ -MD5 (gal-0.18.1.tar.gz) = c7bc647a9cbc92350fb65de524bf1259 +MD5 (gal-0.19.tar.gz) = 8c854f2532e434de6ea99382abe5fc35 diff --git a/x11-toolkits/gal2/files/patch-aa b/x11-toolkits/gal2/files/patch-aa index f649c3b27f83..6051ab181d24 100644 --- a/x11-toolkits/gal2/files/patch-aa +++ b/x11-toolkits/gal2/files/patch-aa @@ -1,23 +1,23 @@ $FreeBSD$ ---- configure.orig Wed Sep 26 11:16:25 2001 -+++ configure Wed Sep 26 11:16:25 2001 -@@ -5075,9 +5075,9 @@ +--- configure.orig Sun Jan 13 17:23:41 2002 ++++ configure Sun Jan 13 17:24:34 2002 +@@ -4890,9 +4890,9 @@ save_CFLAGS="$CFLAGS" save_LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS $ICONV_CFLAGS" -LDFLAGS="$LDFLAGS $ICONV_LIBS -liconv" -echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 --echo "configure:5081: checking for iconv in -liconv" >&5 +-echo "configure:4896: checking for iconv in -liconv" >&5 +LDFLAGS="$LDFLAGS $ICONV_LIBS -lgiconv" +echo $ac_n "checking for iconv in -lgiconv""... $ac_c" 1>&6 -+echo "configure:5081: checking for iconv in -lgiconv" >&5 ++echo "configure:4896: checking for iconv in -lgiconv" >&5 if eval "test \"`echo '$''{'ac_cv_libiconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -5085,7 +5085,7 @@ - #line 5086 "configure" +@@ -4900,7 +4900,7 @@ + #line 4901 "configure" #include "confdefs.h" -#include @@ -25,7 +25,7 @@ $FreeBSD$ int main() { -@@ -5108,7 +5108,7 @@ +@@ -4923,7 +4923,7 @@ echo "$ac_t""$ac_cv_libiconv" 1>&6 if test $ac_cv_libiconv = yes; then @@ -34,8 +34,8 @@ $FreeBSD$ have_iconv=yes else CFLAGS="$save_CFLAGS" -@@ -5234,7 +5234,7 @@ - #line 5235 "configure" +@@ -5049,7 +5049,7 @@ + #line 5050 "configure" #include "confdefs.h" -#include diff --git a/x11-toolkits/gal2/files/patch-po::Makefile.in.in b/x11-toolkits/gal2/files/patch-po::Makefile.in.in new file mode 100644 index 000000000000..4b62b94bc987 --- /dev/null +++ b/x11-toolkits/gal2/files/patch-po::Makefile.in.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- po/Makefile.in.in 2002/01/13 15:56:57 1.1 ++++ po/Makefile.in.in 2002/01/13 15:57:15 +@@ -106,7 +106,7 @@ + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ +- lang=`echo $$cat | sed 's/\.gmo$$//'`; \ ++ lang=`echo $$cat | sed 's/\.mo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkinstalldirs) $(DESTDIR)$$dir; \ + if test -r $$cat; then \ diff --git a/x11-toolkits/gal2/pkg-plist b/x11-toolkits/gal2/pkg-plist index 7af6c0af0512..1acf200a5b21 100644 --- a/x11-toolkits/gal2/pkg-plist +++ b/x11-toolkits/gal2/pkg-plist @@ -98,6 +98,7 @@ include/gal/util/e-util.h include/gal/util/e-xml-utils.h include/gal/widgets/color-group.h include/gal/widgets/color-palette.h +include/gal/widgets/e-canvas-background.h include/gal/widgets/e-canvas-utils.h include/gal/widgets/e-canvas-vbox.h include/gal/widgets/e-canvas.h @@ -130,7 +131,7 @@ include/gal/widgets/widget-color-combo.h include/gal/widgets/widget-pixmap-combo.h lib/libgal.a lib/libgal.so -lib/libgal.so.18 +lib/libgal.so.19 share/gnome/etable/%%VERSION%%/glade/e-table-config-no-group.glade share/gnome/etable/%%VERSION%%/glade/e-table-config.glade share/gnome/etable/%%VERSION%%/glade/e-table-field-chooser.glade