summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/etherape/Makefile34
-rw-r--r--net/etherape/PLIST49
-rw-r--r--net/etherape/distinfo7
-rw-r--r--net/etherape/patches/patch-aa22
4 files changed, 59 insertions, 53 deletions
diff --git a/net/etherape/Makefile b/net/etherape/Makefile
index 8fd49aafb75..0807d884b67 100644
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2002/10/06 03:02:07 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/11 03:07:36 salo Exp $
+#
-DISTNAME= etherape-0.8.2
-PKGREVISION= 1
+DISTNAME= etherape-0.9.0
CATEGORIES= gnome net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=etherape/}
@@ -9,12 +9,26 @@ MAINTAINER= damon@netbsd.org
HOMEPAGE= http://etherape.sourceforge.net/
COMMENT= graphical network monitor
-USE_GMAKE= #defined
-USE_X11BASE= #defined
-USE_BUILDLINK2= #defined
-HAS_CONFIGURE= #defined
-CONFIGURE_ARGS+= --prefix ${PREFIX}
-PLIST_SUBST+= MKDIR='${MKDIR}'
+USE_GMAKE= YES
+USE_X11= YES
+USE_BUILDLINK2= YES
+USE_PKGINSTALL= YES
+GNU_CONFIGURE= YES
-.include "../../devel/libglade/buildlink2.mk"
+PKG_SYSCONFSUBDIR= etherape
+
+# XXX: $localedir defaults to $libdir/locale
+CONFIGURE_ARGS+= --libdir=${PREFIX}/${PKGLOCALEDIR}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+
+EGDIR= ${PREFIX}/share/examples/etherape
+
+CONF_FILES= ${EGDIR}/services ${PKG_SYSCONFDIR}/services
+
+post-install:
+ ${INSTALL_DATA_DIR} ${EGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/services ${EGDIR}
+
+.include "../../devel/libglade2/buildlink2.mk"
+.include "../../devel/libgnomeui/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/etherape/PLIST b/net/etherape/PLIST
index f202396e92c..a2e477735eb 100644
--- a/net/etherape/PLIST
+++ b/net/etherape/PLIST
@@ -1,50 +1,19 @@
-@comment $NetBSD: PLIST,v 1.2 2002/10/06 03:00:41 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/03/11 03:07:36 salo Exp $
bin/etherape
-etc/etherape/services
-lib/locale/es/LC_MESSAGES/etherape.mo
-lib/locale/fr/LC_MESSAGES/etherape.mo
-lib/locale/nl/LC_MESSAGES/etherape.mo
man/man1/etherape.1
-share/etherape/glade/etherape.glade
+share/etherape/glade/etherape.glade2
share/etherape/glade/etherape.png
share/etherape/glade/pause.xpm
share/etherape/glade/play.xpm
share/etherape/glade/stop.xpm
+@exec ${MKDIR} %D/share/examples/etherape
+share/examples/etherape/services
share/gnome/apps/Applications/etherape.desktop
-share/gnome/help/etherape/C/authors.html
-share/gnome/help/etherape/C/bugs.html
-share/gnome/help/etherape/C/docbook.css
-share/gnome/help/etherape/C/index.html
-share/gnome/help/etherape/C/license.html
-share/gnome/help/etherape/C/ln7.html
-share/gnome/help/etherape/C/prefs.html
-share/gnome/help/etherape/C/stylesheet-images/caution.gif
-share/gnome/help/etherape/C/stylesheet-images/home.gif
-share/gnome/help/etherape/C/stylesheet-images/important.gif
-share/gnome/help/etherape/C/stylesheet-images/next.gif
-share/gnome/help/etherape/C/stylesheet-images/note.gif
-share/gnome/help/etherape/C/stylesheet-images/prev.gif
-share/gnome/help/etherape/C/stylesheet-images/tip.gif
-share/gnome/help/etherape/C/stylesheet-images/toc-blank.gif
-share/gnome/help/etherape/C/stylesheet-images/toc-minus.gif
-share/gnome/help/etherape/C/stylesheet-images/toc-plus.gif
-share/gnome/help/etherape/C/stylesheet-images/up.gif
-share/gnome/help/etherape/C/stylesheet-images/warning.gif
-share/gnome/help/etherape/C/topic.dat
-share/gnome/help/etherape/C/usage.html
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/etherape.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/etherape.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/etherape.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/etherape.mo
share/pixmaps/etherape.png
-@dirrm share/gnome/help/etherape/C/stylesheet-images
-@dirrm share/gnome/help/etherape/C
-@dirrm share/gnome/help/etherape
-@unexec ${RMDIR} %D/share/gnome/help 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gnome/apps/Applications 2>/dev/null || ${TRUE}
+@dirrm share/examples/etherape
@dirrm share/etherape/glade
@dirrm share/etherape
-@dirrm lib/locale/nl/LC_MESSAGES
-@dirrm lib/locale/nl
-@dirrm lib/locale/fr/LC_MESSAGES
-@dirrm lib/locale/fr
-@dirrm lib/locale/es/LC_MESSAGES
-@dirrm lib/locale/es
-@dirrm lib/locale
-@dirrm etc/etherape
diff --git a/net/etherape/distinfo b/net/etherape/distinfo
index 17101d6ecf6..77b1effe43f 100644
--- a/net/etherape/distinfo
+++ b/net/etherape/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/11/11 22:06:45 damon Exp $
+$NetBSD: distinfo,v 1.2 2003/03/11 03:07:36 salo Exp $
-SHA1 (etherape-0.8.2.tar.gz) = bbcaf88da3784dc5fbdeca577113d20438fa1dab
-Size (etherape-0.8.2.tar.gz) = 421861 bytes
+SHA1 (etherape-0.9.0.tar.gz) = f47a9289464b3bca15d8ea09e20fb5f632da416d
+Size (etherape-0.9.0.tar.gz) = 406667 bytes
+SHA1 (patch-aa) = 5e0e19dc07ba2f0cb0e49f90624c13f0fa49ed66
diff --git a/net/etherape/patches/patch-aa b/net/etherape/patches/patch-aa
new file mode 100644
index 00000000000..7c8d0c81e85
--- /dev/null
+++ b/net/etherape/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.1 2003/03/11 03:07:37 salo Exp $
+
+--- Makefile.in.orig 2003-03-11 03:13:01.000000000 +0100
++++ Makefile.in 2003-03-11 03:25:09.000000000 +0100
+@@ -142,7 +142,7 @@
+
+ man_MANS = etherape.1
+
+-confdir = $(sysconfdir)/etherape
++confdir = $(sysconfdir)
+ conf_DATA = \
+ services
+
+@@ -643,7 +643,7 @@
+
+ info-am:
+
+-install-data-am: install-DevelopmentDATA install-confDATA install-man \
++install-data-am: install-DevelopmentDATA install-man \
+ install-pixmapsDATA
+
+ install-exec-am: