GNOME policy:

- Fix libintl detection;
- use ${PREFIX}/share/gnome properly.

4 files changed, 70 insertions, 70 deletions

diff --git a/net-mgmt/etherape/Makefile b/net-mgmt/etherape/Makefile
index ecbc4ac..e8ad67d 100644
--- a/net-mgmt/etherape/Makefile
+++ b/net-mgmt/etherape/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	etherape
 PORTVERSION=	0.8.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,15 +16,22 @@ MAINTAINER=	petef@FreeBSD.org
 
 LIB_DEPENDS=	intl.2:${PORTSDIR}/devel/gettext
 
-GNU_CONFIGURE=	yes
 USE_GNOME=	yes
 USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		etherape.1
 
 CFLAGS+=	`${X11BASE}/bin/libglade-config --cflags`
 
-post-patch:
+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 \
+		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
+		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 	@${PERL} -pi -e 's!^confdir = .*!confdir = ${PREFIX}/share/etherape!' \
 		${WRKSRC}/Makefile.in
 
diff --git a/net-mgmt/etherape/pkg-plist b/net-mgmt/etherape/pkg-plist
index 876de25..b938498 100644
--- a/net-mgmt/etherape/pkg-plist
+++ b/net-mgmt/etherape/pkg-plist
@@ -1,46 +1,39 @@
 bin/etherape
 share/etherape/services
+share/gnome/apps/Applications/etherape.desktop
 share/gnome/etherape/glade/etherape.glade
 share/gnome/etherape/glade/etherape.png
 share/gnome/etherape/glade/pause.xpm
 share/gnome/etherape/glade/play.xpm
 share/gnome/etherape/glade/stop.xpm
-share/gnome/gnome/apps/Applications/etherape.desktop
-share/gnome/gnome/help/etherape/C/authors.html
-share/gnome/gnome/help/etherape/C/bugs.html
-share/gnome/gnome/help/etherape/C/docbook.css
-share/gnome/gnome/help/etherape/C/index.html
-share/gnome/gnome/help/etherape/C/license.html
-share/gnome/gnome/help/etherape/C/ln7.html
-share/gnome/gnome/help/etherape/C/prefs.html
-share/gnome/gnome/help/etherape/C/stylesheet-images/caution.gif
-share/gnome/gnome/help/etherape/C/stylesheet-images/home.gif
-share/gnome/gnome/help/etherape/C/stylesheet-images/important.gif
-share/gnome/gnome/help/etherape/C/stylesheet-images/next.gif
-share/gnome/gnome/help/etherape/C/stylesheet-images/note.gif
-share/gnome/gnome/help/etherape/C/stylesheet-images/prev.gif
-share/gnome/gnome/help/etherape/C/stylesheet-images/tip.gif
-share/gnome/gnome/help/etherape/C/stylesheet-images/toc-blank.gif
-share/gnome/gnome/help/etherape/C/stylesheet-images/toc-minus.gif
-share/gnome/gnome/help/etherape/C/stylesheet-images/toc-plus.gif
-share/gnome/gnome/help/etherape/C/stylesheet-images/up.gif
-share/gnome/gnome/help/etherape/C/stylesheet-images/warning.gif
-share/gnome/gnome/help/etherape/C/topic.dat
-share/gnome/gnome/help/etherape/C/usage.html
+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
 share/gnome/pixmaps/etherape.png
 share/locale/es/LC_MESSAGES/etherape.mo
 share/locale/fr/LC_MESSAGES/etherape.mo
 share/locale/nl/LC_MESSAGES/etherape.mo
-@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/es 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
-@dirrm share/gnome/gnome/help/etherape/C/stylesheet-images
-@dirrm share/gnome/gnome/help/etherape/C
-@dirrm share/gnome/gnome/help/etherape
+@dirrm share/gnome/help/etherape/C/stylesheet-images
+@dirrm share/gnome/help/etherape/C
+@dirrm share/gnome/help/etherape
 @dirrm share/gnome/etherape/glade
 @dirrm share/gnome/etherape
 @dirrm share/etherape
diff --git a/net/etherape/Makefile b/net/etherape/Makefile
index ecbc4ac..e8ad67d 100644
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	etherape
 PORTVERSION=	0.8.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,15 +16,22 @@ MAINTAINER=	petef@FreeBSD.org
 
 LIB_DEPENDS=	intl.2:${PORTSDIR}/devel/gettext
 
-GNU_CONFIGURE=	yes
 USE_GNOME=	yes
 USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		etherape.1
 
 CFLAGS+=	`${X11BASE}/bin/libglade-config --cflags`
 
-post-patch:
+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 \
+		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
+		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 	@${PERL} -pi -e 's!^confdir = .*!confdir = ${PREFIX}/share/etherape!' \
 		${WRKSRC}/Makefile.in
 
diff --git a/net/etherape/pkg-plist b/net/etherape/pkg-plist
index 876de25..b938498 100644
--- a/net/etherape/pkg-plist
+++ b/net/etherape/pkg-plist
@@ -1,46 +1,39 @@
 bin/etherape
 share/etherape/services
+share/gnome/apps/Applications/etherape.desktop
 share/gnome/etherape/glade/etherape.glade
 share/gnome/etherape/glade/etherape.png
 share/gnome/etherape/glade/pause.xpm
 share/gnome/etherape/glade/play.xpm
 share/gnome/etherape/glade/stop.xpm
-share/gnome/gnome/apps/Applications/etherape.desktop
-share/gnome/gnome/help/etherape/C/authors.html
-share/gnome/gnome/help/etherape/C/bugs.html
-share/gnome/gnome/help/etherape/C/docbook.css
-share/gnome/gnome/help/etherape/C/index.html
-share/gnome/gnome/help/etherape/C/license.html
-share/gnome/gnome/help/etherape/C/ln7.html
-share/gnome/gnome/help/etherape/C/prefs.html
-share/gnome/gnome/help/etherape/C/stylesheet-images/caution.gif
-share/gnome/gnome/help/etherape/C/stylesheet-images/home.gif
-share/gnome/gnome/help/etherape/C/stylesheet-images/important.gif
-share/gnome/gnome/help/etherape/C/stylesheet-images/next.gif
-share/gnome/gnome/help/etherape/C/stylesheet-images/note.gif
-share/gnome/gnome/help/etherape/C/stylesheet-images/prev.gif
-share/gnome/gnome/help/etherape/C/stylesheet-images/tip.gif
-share/gnome/gnome/help/etherape/C/stylesheet-images/toc-blank.gif
-share/gnome/gnome/help/etherape/C/stylesheet-images/toc-minus.gif
-share/gnome/gnome/help/etherape/C/stylesheet-images/toc-plus.gif
-share/gnome/gnome/help/etherape/C/stylesheet-images/up.gif
-share/gnome/gnome/help/etherape/C/stylesheet-images/warning.gif
-share/gnome/gnome/help/etherape/C/topic.dat
-share/gnome/gnome/help/etherape/C/usage.html
+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
 share/gnome/pixmaps/etherape.png
 share/locale/es/LC_MESSAGES/etherape.mo
 share/locale/fr/LC_MESSAGES/etherape.mo
 share/locale/nl/LC_MESSAGES/etherape.mo
-@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/es 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
-@dirrm share/gnome/gnome/help/etherape/C/stylesheet-images
-@dirrm share/gnome/gnome/help/etherape/C
-@dirrm share/gnome/gnome/help/etherape
+@dirrm share/gnome/help/etherape/C/stylesheet-images
+@dirrm share/gnome/help/etherape/C
+@dirrm share/gnome/help/etherape
 @dirrm share/gnome/etherape/glade
 @dirrm share/gnome/etherape
 @dirrm share/etherape