Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the

new freetype2 where needed.

Submitted by:	mezz, ahze, pav, and many others
Approved by:	portmgr (implicit, kris)

2 files changed, 29 insertions, 32 deletions

diff --git a/net-mgmt/etherape/Makefile b/net-mgmt/etherape/Makefile
index c7b1436d2097..db0e278941c0 100644
--- a/net-mgmt/etherape/Makefile
+++ b/net-mgmt/etherape/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	etherape
 PORTVERSION=	0.9.6
+PORTREVISION=	1
 CATEGORIES=	net-mgmt gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,9 +16,9 @@ MAINTAINER=	sbahra@kerneled.org
 COMMENT=	A graphical network traffic visualization tool for gnome
 
 USE_GETTEXT=	yes
-USE_GNOME=	libglade2 libgnomeui gnomehack
+USE_GNOME=	libglade2 libgnomeui gnomehack gnomeprefix
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -25,7 +26,4 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 MAN1=		etherape.1
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|$$(datadir)/omf|$$(prefix)/share/gnome/omf|g' ${WRKSRC}/doc/C/Makefile.in
-
 .include <bsd.port.mk>
diff --git a/net-mgmt/etherape/pkg-plist b/net-mgmt/etherape/pkg-plist
index b855233c199a..0990c1762afa 100644
--- a/net-mgmt/etherape/pkg-plist
+++ b/net-mgmt/etherape/pkg-plist
@@ -1,35 +1,34 @@
 bin/etherape
 etc/etherape/services
-share/applications/etherape.desktop
-%%DATADIR%%/doc/etherape/C/etherape.xml
-%%DATADIR%%/doc/etherape/C/figures/appmain.png
-%%DATADIR%%/doc/etherape/C/figures/capture_file_dlg.png
-%%DATADIR%%/doc/etherape/C/figures/color_select_dlg.png
-%%DATADIR%%/doc/etherape/C/figures/eth_toolbar.png
-%%DATADIR%%/doc/etherape/C/figures/link_info.png
-%%DATADIR%%/doc/etherape/C/figures/node_info.png
-%%DATADIR%%/doc/etherape/C/figures/pref_colors_dlg.png
-%%DATADIR%%/doc/etherape/C/figures/pref_diagram_dlg.png
-%%DATADIR%%/doc/etherape/C/figures/pref_timings_dlg.png
-%%DATADIR%%/doc/etherape/C/figures/proto_info.png
-%%DATADIR%%/doc/etherape/C/figures/protocol_edit_dlg.png
-%%DATADIR%%/glade/etherape.glade2
-%%DATADIR%%/glade/etherape.png
-%%DATADIR%%/glade/pause.xpm
-%%DATADIR%%/glade/play.xpm
-%%DATADIR%%/glade/stop.xpm
+share/gnome/applications/etherape.desktop
+share/gnome/etherape/doc/etherape/C/etherape.xml
+share/gnome/etherape/doc/etherape/C/figures/appmain.png
+share/gnome/etherape/doc/etherape/C/figures/capture_file_dlg.png
+share/gnome/etherape/doc/etherape/C/figures/color_select_dlg.png
+share/gnome/etherape/doc/etherape/C/figures/eth_toolbar.png
+share/gnome/etherape/doc/etherape/C/figures/link_info.png
+share/gnome/etherape/doc/etherape/C/figures/node_info.png
+share/gnome/etherape/doc/etherape/C/figures/pref_colors_dlg.png
+share/gnome/etherape/doc/etherape/C/figures/pref_diagram_dlg.png
+share/gnome/etherape/doc/etherape/C/figures/pref_timings_dlg.png
+share/gnome/etherape/doc/etherape/C/figures/proto_info.png
+share/gnome/etherape/doc/etherape/C/figures/protocol_edit_dlg.png
+share/gnome/etherape/glade/etherape.glade2
+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/omf/etherape/etherape-C.omf
+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
 share/locale/tr/LC_MESSAGES/etherape.mo
-share/pixmaps/etherape.png
-@dirrm etc/etherape
 @dirrm share/gnome/omf/etherape
-@dirrm %%DATADIR%%/glade
-@dirrm %%DATADIR%%/doc/etherape/C/figures
-@dirrm %%DATADIR%%/doc/etherape/C
-@dirrm %%DATADIR%%/doc/etherape
-@dirrm %%DATADIR%%/doc
-@dirrm %%DATADIR%%
-@dirrmtry share/applications
+@dirrm share/gnome/etherape/glade
+@dirrm share/gnome/etherape/doc/etherape/C/figures
+@dirrm share/gnome/etherape/doc/etherape/C
+@dirrm share/gnome/etherape/doc/etherape
+@dirrm share/gnome/etherape/doc
+@dirrm share/gnome/etherape
+@dirrm etc/etherape