From e9059b83d060bddd59ed75a051c83e463b94f05e Mon Sep 17 00:00:00 2001 From: naddy Date: Fri, 25 Oct 2002 16:00:11 +0000 Subject: [PATCH] Update to 0.9.0; mostly from Bjorn Sandell . --- x11/xtraceroute/Makefile | 11 ++++++----- x11/xtraceroute/distinfo | 6 +++--- x11/xtraceroute/patches/patch-aclocal_m4 | 16 ++++++++++++++++ x11/xtraceroute/patches/patch-glstuff_c | 11 +++++++++++ .../{patch-aa => patch-po_Makefile_in_in} | 18 +++++------------- x11/xtraceroute/patches/patch-po_es_po | 10 +++++----- x11/xtraceroute/patches/patch-po_fr_po | 10 +++++----- x11/xtraceroute/patches/patch-po_ja_po | 8 ++++---- .../patches/patch-po_xtraceroute_pot | 8 ++++---- x11/xtraceroute/pkg/PLIST | 4 ++-- 10 files changed, 61 insertions(+), 41 deletions(-) create mode 100644 x11/xtraceroute/patches/patch-aclocal_m4 create mode 100644 x11/xtraceroute/patches/patch-glstuff_c rename x11/xtraceroute/patches/{patch-aa => patch-po_Makefile_in_in} (77%) diff --git a/x11/xtraceroute/Makefile b/x11/xtraceroute/Makefile index 98cd48e94ef..d218505fcee 100644 --- a/x11/xtraceroute/Makefile +++ b/x11/xtraceroute/Makefile @@ -1,17 +1,18 @@ -# $OpenBSD: Makefile,v 1.19 2002/07/30 14:36:50 brad Exp $ +# $OpenBSD: Makefile,v 1.20 2002/10/25 16:00:11 naddy Exp $ # $NetBSD: Makefile,v 1.4 1999/03/04 08:58:42 tron Exp $ COMMENT= "graphical version of traceroute" -DISTNAME= xtraceroute-0.8.14 +DISTNAME= xtraceroute-0.9.0 CATEGORIES= net x11 MASTER_SITES= http://www.dtek.chalmers.se/~d3august/xt/dl/ -DISTFILES= xtraceroute-0.8.14.tar.gz ndg_files.tar.gz +DISTFILES= xtraceroute-0.9.0.tar.gz ndg_files.tar.gz HOMEPAGE= http://www.dtek.chalmers.se/~d3august/xt/ LIB_DEPENDS= gtkgl.1.2::x11/gtkglarea \ - tiff.35::graphics/tiff + png::graphics/png \ + gdk_pixbuf.2::graphics/gdk-pixbuf,no_gnome PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes @@ -19,7 +20,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes USE_X11= Yes -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE= autoconf CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/xtraceroute/distinfo b/x11/xtraceroute/distinfo index 1a58323edc2..11caf78120e 100644 --- a/x11/xtraceroute/distinfo +++ b/x11/xtraceroute/distinfo @@ -1,6 +1,6 @@ MD5 (ndg_files.tar.gz) = 0e2d6ab6a780b49acbd8f706840380d9 -MD5 (xtraceroute-0.8.14.tar.gz) = c4f16fecae49b8bfa2a9bc9b036aa442 +MD5 (xtraceroute-0.9.0.tar.gz) = f201a563948e3debe214dc17f762dab7 RMD160 (ndg_files.tar.gz) = a86ab4ab5c981f8f53910dd816e4dcac9896628f -RMD160 (xtraceroute-0.8.14.tar.gz) = b468783f00afdc9e346dabcb9ccc4b4ecdba1536 +RMD160 (xtraceroute-0.9.0.tar.gz) = b595dd4f59b16fae7b81ba17428212113edac50b SHA1 (ndg_files.tar.gz) = 994aeb804dd063f6fd2bf499addd4b5e8aca81cc -SHA1 (xtraceroute-0.8.14.tar.gz) = f7e21072fb653842aaed7ae2be5a0d33573bb654 +SHA1 (xtraceroute-0.9.0.tar.gz) = 59b49b783121050946b7a27da49a5f756916d79f diff --git a/x11/xtraceroute/patches/patch-aclocal_m4 b/x11/xtraceroute/patches/patch-aclocal_m4 new file mode 100644 index 00000000000..0da39034920 --- /dev/null +++ b/x11/xtraceroute/patches/patch-aclocal_m4 @@ -0,0 +1,16 @@ +$OpenBSD: patch-aclocal_m4,v 1.1 2002/10/25 16:00:11 naddy Exp $ +--- aclocal.m4.orig Wed Apr 18 16:26:32 2001 ++++ aclocal.m4 Fri Oct 25 17:44:03 2002 +@@ -173,10 +173,9 @@ AC_DEFUN(AM_WITH_NLS, + + if test "$gt_cv_func_gettext_libc" != "yes"; then + AC_CHECK_LIB(intl, bindtextdomain, +- [AC_CACHE_CHECK([for gettext in libintl], +- gt_cv_func_gettext_libintl, ++ [AC_CACHE_VAL(gt_cv_func_gettext_libintl, + [AC_CHECK_LIB(intl, gettext, +- gt_cv_func_gettext_libintl=yes, ++ [gt_cv_func_gettext_libintl=yes; LIBS="$LIBS -lintl"], + gt_cv_func_gettext_libintl=no)], + gt_cv_func_gettext_libintl=no)]) + fi diff --git a/x11/xtraceroute/patches/patch-glstuff_c b/x11/xtraceroute/patches/patch-glstuff_c new file mode 100644 index 00000000000..7ae1cfbb149 --- /dev/null +++ b/x11/xtraceroute/patches/patch-glstuff_c @@ -0,0 +1,11 @@ +$OpenBSD: patch-glstuff_c,v 1.1 2002/10/25 16:00:11 naddy Exp $ +--- glstuff.c.orig Wed Oct 23 18:30:35 2002 ++++ glstuff.c Wed Oct 23 18:33:10 2002 +@@ -16,7 +16,6 @@ + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +-#include + #include + #include + #include diff --git a/x11/xtraceroute/patches/patch-aa b/x11/xtraceroute/patches/patch-po_Makefile_in_in similarity index 77% rename from x11/xtraceroute/patches/patch-aa rename to x11/xtraceroute/patches/patch-po_Makefile_in_in index 1ffeef5d8f7..9df13b809e2 100644 --- a/x11/xtraceroute/patches/patch-aa +++ b/x11/xtraceroute/patches/patch-po_Makefile_in_in @@ -1,15 +1,7 @@ +$OpenBSD: patch-po_Makefile_in_in,v 1.1 2002/10/25 16:00:11 naddy Exp $ --- po/Makefile.in.in.orig Mon Feb 22 22:42:10 1999 -+++ po/Makefile.in.in Mon Apr 3 23:52:12 2000 -@@ -18,7 +18,7 @@ - - prefix = @prefix@ - exec_prefix = @exec_prefix@ --datadir = $(prefix)/@DATADIRNAME@ -+datadir = $(prefix)/share - localedir = $(datadir)/locale - gnulocaledir = $(prefix)/share/locale - gettextsrcdir = $(prefix)/share/gettext/po -@@ -111,9 +111,9 @@ ++++ po/Makefile.in.in Wed Oct 23 18:29:28 2002 +@@ -111,9 +111,9 @@ install-data: install-data-@USE_NLS@ install-data-no: all install-data-yes: all if test -r "$(MKINSTALLDIRS)"; then \ @@ -21,7 +13,7 @@ fi @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ -@@ -123,7 +123,7 @@ +@@ -123,7 +123,7 @@ install-data-yes: all *) destdir=$(localedir);; \ esac; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ @@ -30,7 +22,7 @@ if test -r "$(MKINSTALLDIRS)"; then \ $(MKINSTALLDIRS) $$dir; \ else \ -@@ -153,12 +153,12 @@ +@@ -153,12 +153,12 @@ install-data-yes: all done if test "$(PACKAGE)" = "gettext"; then \ if test -r "$(MKINSTALLDIRS)"; then \ diff --git a/x11/xtraceroute/patches/patch-po_es_po b/x11/xtraceroute/patches/patch-po_es_po index f4498e4e36f..47aa1f68f7b 100644 --- a/x11/xtraceroute/patches/patch-po_es_po +++ b/x11/xtraceroute/patches/patch-po_es_po @@ -1,8 +1,8 @@ -$OpenBSD: patch-po_es_po,v 1.1 2001/05/14 22:32:38 brad Exp $ ---- po/es.po.orig Mon May 14 22:33:51 2001 -+++ po/es.po Mon May 14 22:34:15 2001 -@@ -1250,7 +1250,7 @@ msgstr "Traceroute" - #, fuzzy, c-format +$OpenBSD: patch-po_es_po,v 1.2 2002/10/25 16:00:11 naddy Exp $ +--- po/es.po.orig Thu Jun 28 19:03:43 2001 ++++ po/es.po Wed Oct 23 18:29:28 2002 +@@ -1258,7 +1258,7 @@ msgstr "xtraceroute: hostal desconocido + #, c-format msgid "" "%s%s\n" -"By Björn Augustsson (d3august@dtek.chalmers.se)\n" diff --git a/x11/xtraceroute/patches/patch-po_fr_po b/x11/xtraceroute/patches/patch-po_fr_po index b1fc077cafe..71f10a8652e 100644 --- a/x11/xtraceroute/patches/patch-po_fr_po +++ b/x11/xtraceroute/patches/patch-po_fr_po @@ -1,8 +1,8 @@ -$OpenBSD: patch-po_fr_po,v 1.1 2001/05/14 22:32:38 brad Exp $ ---- po/fr.po.orig Mon May 14 22:33:51 2001 -+++ po/fr.po Mon May 14 22:34:20 2001 -@@ -1249,7 +1249,7 @@ msgstr "Traceroute" - #, fuzzy, c-format +$OpenBSD: patch-po_fr_po,v 1.2 2002/10/25 16:00:11 naddy Exp $ +--- po/fr.po.orig Thu Jun 28 19:03:44 2001 ++++ po/fr.po Wed Oct 23 18:29:28 2002 +@@ -1253,7 +1253,7 @@ msgstr "xtraceroute: hôte inconnu " + #, c-format msgid "" "%s%s\n" -"By Björn Augustsson (d3august@dtek.chalmers.se)\n" diff --git a/x11/xtraceroute/patches/patch-po_ja_po b/x11/xtraceroute/patches/patch-po_ja_po index 1204c275069..fa3c5dfd0c1 100644 --- a/x11/xtraceroute/patches/patch-po_ja_po +++ b/x11/xtraceroute/patches/patch-po_ja_po @@ -1,7 +1,7 @@ -$OpenBSD: patch-po_ja_po,v 1.1 2001/05/14 22:32:39 brad Exp $ ---- po/ja.po.orig Mon May 14 22:33:51 2001 -+++ po/ja.po Mon May 14 22:34:26 2001 -@@ -1236,7 +1236,7 @@ msgstr "" +$OpenBSD: patch-po_ja_po,v 1.2 2002/10/25 16:00:11 naddy Exp $ +--- po/ja.po.orig Thu Jun 28 19:03:43 2001 ++++ po/ja.po Wed Oct 23 18:29:28 2002 +@@ -1244,7 +1244,7 @@ msgstr "" #, c-format msgid "" "%s%s\n" diff --git a/x11/xtraceroute/patches/patch-po_xtraceroute_pot b/x11/xtraceroute/patches/patch-po_xtraceroute_pot index 9119a881fa1..711de9a0680 100644 --- a/x11/xtraceroute/patches/patch-po_xtraceroute_pot +++ b/x11/xtraceroute/patches/patch-po_xtraceroute_pot @@ -1,7 +1,7 @@ -$OpenBSD: patch-po_xtraceroute_pot,v 1.1 2001/05/14 22:32:39 brad Exp $ ---- po/xtraceroute.pot.orig Mon May 14 22:33:51 2001 -+++ po/xtraceroute.pot Mon May 14 22:34:02 2001 -@@ -1233,7 +1233,7 @@ msgstr "" +$OpenBSD: patch-po_xtraceroute_pot,v 1.2 2002/10/25 16:00:11 naddy Exp $ +--- po/xtraceroute.pot.orig Mon Sep 25 22:53:14 2000 ++++ po/xtraceroute.pot Wed Oct 23 18:29:28 2002 +@@ -1239,7 +1239,7 @@ msgstr "" #, c-format msgid "" "%s%s\n" diff --git a/x11/xtraceroute/pkg/PLIST b/x11/xtraceroute/pkg/PLIST index d59851a5d77..87294835a3c 100644 --- a/x11/xtraceroute/pkg/PLIST +++ b/x11/xtraceroute/pkg/PLIST @@ -1,7 +1,7 @@ -@comment $OpenBSD: PLIST,v 1.4 2000/07/26 23:52:39 brad Exp $ +@comment $OpenBSD: PLIST,v 1.5 2002/10/25 16:00:11 naddy Exp $ bin/xtraceroute man/man1/xtraceroute.1 -share/xtraceroute/earth.tif +share/xtraceroute/earth.png share/xtraceroute/hosts.cache share/xtraceroute/networks.cache share/locale/es/LC_MESSAGES/xtraceroute.mo