- Honor CFLAGS passed in from environment during build.

- Use PKGLOCALEDIR instead of assuming locale files are in
  ${PREFIX}/share/locale.
- Use BSD_INSTALL_* macros instead of mkdir/cp.
- Use devel/gettext-lib/buildlink.mk instead of USE_LIBINTL.

4 files changed, 39 insertions, 25 deletions

diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index a9a8725dcb9..dae38af5a68 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 13:30:34 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/16 14:52:43 jlam Exp $
 #
 
 DISTNAME=	easytag-0.11
@@ -12,7 +12,11 @@ COMMENT=	Tool to view, edit and write ID3 v1 TAGs with a GTK+ interface
 DEPENDS+=	gtk+>=1.2.8:../../x11/gtk
 
 USE_GMAKE=	yes
-USE_LIBINTL=	yes
+#USE_LIBINTL=	yes
 USE_X11BASE=	yes
 
+.include "../../devel/gettext-lib/buildlink.mk"
+
+MAKE_ENV+=	PKGLOCALEDIR=${PKGLOCALEDIR}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/easytag/distinfo b/audio/easytag/distinfo
index a5f604f36bf..170ad1fe681 100644
--- a/audio/easytag/distinfo
+++ b/audio/easytag/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 13:04:20 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/06/16 14:52:43 jlam Exp $
 
 SHA1 (easytag-0.11.tar.gz) = b111566c7642ce692217c0f80a1ccea91944a632
 Size (easytag-0.11.tar.gz) = 284140 bytes
-SHA1 (patch-aa) = fff44172118fe2542bccc9badd96fec182e76e2a
+SHA1 (patch-aa) = b5e866b0eeb365b2319b2fdf60495cb90a85b903
diff --git a/audio/easytag/patches/patch-aa b/audio/easytag/patches/patch-aa
index f74e151d87a..db1b69a9fa2 100644
--- a/audio/easytag/patches/patch-aa
+++ b/audio/easytag/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2000/11/30 00:03:12 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2001/06/16 14:52:44 jlam Exp $
 
---- Makefile.orig	Thu Oct 26 21:18:35 2000
-+++ Makefile
-@@ -11,16 +11,13 @@
+--- Makefile.orig	Thu Oct 26 15:18:35 2000
++++ Makefile	Fri Jun 15 02:04:42 2001
+@@ -11,17 +11,14 @@
  
  
  # Installation prefix dirctory:
@@ -12,22 +12,32 @@ $NetBSD: patch-aa,v 1.3 2000/11/30 00:03:12 wiz Exp $
  
 -CC	= gcc
 -GLIBS	= `gtk-config --libs`
-+GLIBS = `gtk-config --libs` -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -lintl
- GFLAGS	= `gtk-config --cflags` $(NLS) -DLOCALE=\"${LOCALEDIR}\" $(DATA_DIR)
+-GFLAGS	= `gtk-config --cflags` $(NLS) -DLOCALE=\"${LOCALEDIR}\" $(DATA_DIR)
 -OPT	= -g -Wall -O2
-+OPT   = -g -Wall -I${LOCALBASE}/include
++GLIBS = ${LDFLAGS} `gtk-config --libs` -lintl
++GFLAGS	= ${CFLAGS} `gtk-config --cflags` $(NLS) -DLOCALE=\"${LOCALEDIR}\" $(DATA_DIR)
++OPT   = -Wall
  #ID3_LIB = -lid3
 -MAKE	= make
- LOCALEDIR = $(PREFIX)/share/locale
+-LOCALEDIR = $(PREFIX)/share/locale
++LOCALEDIR = $(PREFIX)/${PKGLOCALEDIR}/locale
  
  # The dir where are located pixmaps, logo
-@@ -37,7 +34,9 @@
+ DATA_DIR = -DPACKAGE_DATA_DIR=\"${PACKAGE_DATA_DIR}\"
+@@ -37,10 +34,12 @@
  install:
  	$(MAKE) install -C src
  	[ -z "$(NLS)" ] || $(MAKE) install -C po
-+	mkdir -p $(PREFIX)/share/gnome/apps/Multimedia
- 	cp -f easytag.desktop $(PREFIX)/share/gnome/apps/Multimedia/
-+	mkdir -p $(PREFIX)/share/pixmaps
- 	cp -f pixmaps/EasyTAG_icon.xpm $(PREFIX)/share/pixmaps/EasyTAG.xpm
- 	mkdir -p $(PREFIX)/share/easytag
- 	cp -f pixmaps/EasyTAG_logo.xpm $(PREFIX)/share/easytag/
+-	cp -f easytag.desktop $(PREFIX)/share/gnome/apps/Multimedia/
+-	cp -f pixmaps/EasyTAG_icon.xpm $(PREFIX)/share/pixmaps/EasyTAG.xpm
+-	mkdir -p $(PREFIX)/share/easytag
+-	cp -f pixmaps/EasyTAG_logo.xpm $(PREFIX)/share/easytag/
++	${BSD_INSTALL_DATA_DIR} $(PREFIX)/share/gnome/apps/Multimedia
++	${BSD_INSTALL_DATA} easytag.desktop $(PREFIX)/share/gnome/apps/Multimedia/
++	${BSD_INSTALL_DATA_DIR} $(PREFIX)/share/pixmaps
++	${BSD_INSTALL_DATA} pixmaps/EasyTAG_icon.xpm $(PREFIX)/share/pixmaps/EasyTAG.xpm
++	${BSD_INSTALL_DATA_DIR} $(PREFIX)/share/easytag
++	${BSD_INSTALL_DATA} pixmaps/EasyTAG_logo.xpm $(PREFIX)/share/easytag/
+ 	@echo "------"
+ 	@echo "EasyTAG is installed, to uninstall it, type 'make uninstall'!"
+ 	@echo "------"
diff --git a/audio/easytag/pkg/PLIST b/audio/easytag/pkg/PLIST
index 2a0cabb5d20..5d1196d8d2b 100644
--- a/audio/easytag/pkg/PLIST
+++ b/audio/easytag/pkg/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.4 2000/11/30 00:03:12 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/06/16 14:52:44 jlam Exp $
 bin/easytag
 share/easytag/EasyTAG_logo.xpm
 share/gnome/apps/Multimedia/easytag.desktop
-share/locale/de/LC_MESSAGES/easytag.mo
-share/locale/fr/LC_MESSAGES/easytag.mo
-share/locale/nl/LC_MESSAGES/easytag.mo
-share/locale/ru/LC_MESSAGES/easytag.mo
-share/locale/sv/LC_MESSAGES/easytag.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/easytag.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/easytag.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/easytag.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/easytag.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/easytag.mo
 share/pixmaps/EasyTAG.xpm
 @unexec rmdir -p %D/share/pixmaps 2>/dev/null || true
 @unexec rmdir -p %D/share/gnome/apps/Multimedia 2>/dev/null || true