--- audio/easytag/Makefile	Thu Jul 19 01:22:54 2001
+++ audio/easytag/Makefile	Mon Mar 11 02:52:30 2002
@@ -7,21 +7,26 @@ 
 #
 
 PORTNAME=	easytag
-PORTVERSION=	0.15
+PORTVERSION=	0.17
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext \
-		id3:${PORTSDIR}/audio/id3lib
+LIB_DEPENDS=	id3-3.7.13:${PORTSDIR}/audio/id3lib \
+		vorbis.1:${PORTSDIR}/audio/libvorbis
 
 USE_GTK=	yes
-USE_GMAKE=	yes
-MAKE_ENV=	CFLAGS="${CFLAGS}"
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
-	@${PERL} -pi -e "s,gtk-config,${GTK_CONFIG},g" ${WRKSRC}/Makefile
+	@${PERL} -pi -e 's|`gtk-config |`\$$GTK_CONFIG |g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
+		's|^gnome_menu|#gnome_menu|g ; \
+		 s|^icon|#icon|g'
 
 .include <bsd.port.mk>
--- audio/easytag/distinfo	Mon Sep  3 18:53:29 2001
+++ audio/easytag/distinfo	Fri Mar  8 01:53:18 2002
@@ -1, +1, @@ 
-MD5 (easytag-0.15.tar.gz) = 39f1bd9a6054d742fba0bd877017f1e7
+MD5 (easytag-0.17.tar.gz) = 74726c0f6db4ea7cc110bc60547362ce
--- audio/easytag/files/patch-Makefile	Thu May 17 03:14:57 2001
+++ audio/easytag/files/patch-Makefile	Thu Jan  1 09:00:00 1970
@@ -1,39 +0,0 @@ 
---- Makefile.orig	Mon Apr 16 17:13:01 2001
-+++ Makefile	Thu May 17 01:48:41 2001
-@@ -14,14 +14,12 @@
- 
- 
- # Installation prefix dirctory:
--PREFIX	= /usr
- BINDIR	= $(PREFIX)/bin
- 
- 
--CC        = gcc
- GLIBS     = `gtk-config --libs`
- GFLAGS    = `gtk-config --cflags` $(NLS) -DLOCALE=\"${LOCALEDIR}\" $(DATA_DIR)
--OPT       = -g -Wall -O2 #-mpentium #-pedantic
-+OPT       = ${CFLAGS}
- MAKE      = make
- LOCALEDIR = $(PREFIX)/share/locale
- 
-@@ -33,14 +31,14 @@
- 
- 
- all:
--	$(MAKE) -C src all
--	[ -z "$(NLS)" ] || $(MAKE) -C po all
-+	(cd src ; $(MAKE) all)
-+	[ -z "$(NLS)" ] || (cd po ; $(MAKE) all)
- 
- install:
--	$(MAKE) install -C src
--	[ -z "$(NLS)" ] || $(MAKE) install -C po
--	cp -f easytag.desktop $(PREFIX)/share/gnome/apps/Multimedia/
--	cp -f pixmaps/EasyTAG_icon.xpm $(PREFIX)/share/pixmaps/EasyTAG.xpm
-+	(cd src ; $(MAKE) install)
-+	[ -z "$(NLS)" ] || (cd po ; $(MAKE) install)
-+#	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/
- 	@echo "------"
--- audio/easytag/files/patch-ltmain.sh	Thu Jan  1 09:00:00 1970
+++ audio/easytag/files/patch-ltmain.sh	Fri Mar  8 01:59:15 2002
@@ -0,0 +1,12 @@ 
+--- ltmain.sh.orig	Sun Mar  3 07:38:00 2002
++++ ltmain.sh	Fri Mar  8 01:58:58 2002
+@@ -2408,6 +2408,9 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test "$build_libtool_need_lc" = "yes"; then
--- audio/easytag/files/patch-src::Makefile	Thu May 17 03:14:57 2001
+++ audio/easytag/files/patch-src::Makefile	Thu Jan  1 09:00:00 1970
@@ -1,11 +0,0 @@ 
---- src/Makefile.orig	Thu May 17 01:52:53 2001
-+++ src/Makefile	Thu May 17 01:51:43 2001
-@@ -23,7 +23,7 @@
- 	$(CC) $(GFLAGS) $(OPT) -c $<
- 
- $(BINARY): $(OBJS)
--	$(CC) $(OBJS) $(GLIBS) $(ID3_LIB) $(OPT) -o $(BINARY)
-+	$(CXX) $(OBJS) $(GLIBS) $(ID3_LIB) $(OPT) -o $(BINARY)
- 
- 
- 
--- audio/easytag/pkg-plist	Thu May 17 03:14:57 2001
+++ audio/easytag/pkg-plist	Fri Mar  8 03:09:25 2002
@@ -8,4 +8,5 @@ 
 share/locale/nl/LC_MESSAGES/easytag.mo
 share/locale/ru/LC_MESSAGES/easytag.mo
 share/locale/sv/LC_MESSAGES/easytag.mo
+share/locale/uk/LC_MESSAGES/easytag.mo
 @dirrm share/easytag