+ Update to madplay 0.15.2b.

+ Add support for WITHOUT_NLS.
+ Remove patch-configure as it doesn't seem to affect the build any
  longer, with or without libtool in the system -- tested with diff.
+ Fix pkg-plist: The locale dirs used here are either standard,
  listed in BSD.local.dist, or managed by the gettext port, so
  we needn't try to remove them.

Approved by:	maintainer (timeout)

4 files changed, 18 insertions, 33 deletions

diff --git a/audio/madplay/Makefile b/audio/madplay/Makefile
index 051047a7afc0..e141fc5a6e55 100644
--- a/audio/madplay/Makefile
+++ b/audio/madplay/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	madplay
-PORTVERSION=	0.15.0b
-PORTREVISION=	3
+PORTVERSION=	0.15.2b
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.mars.org/pub/mpeg/
@@ -21,17 +20,23 @@ LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/libmad \
 
 WANT_GNOME=	yes
 
-USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 ALL_TARGET=	all madtime
 
 MAN1=		abxtest.1 madplay.1
 
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=		yes
+PLIST_SUB+=		NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=		NLS="@comment "
+.endif
+
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mesound}!=""
+.if ${HAVE_GNOME:Mesound} != ""
 USE_GNOME+=	esound
 PKGNAMESUFFIX=	-esound
 .else
diff --git a/audio/madplay/distinfo b/audio/madplay/distinfo
index a92806bcda2d..896d45897dfc 100644
--- a/audio/madplay/distinfo
+++ b/audio/madplay/distinfo
@@ -1,3 +1,3 @@
-MD5 (madplay-0.15.0b.tar.gz) = 35762ddeb46fba8bbf0a260b6c425e82
-SHA256 (madplay-0.15.0b.tar.gz) = ebc28a85f5eb4132c684aa607f88ea1f485cec572a8b8de431b442c3bcac0591
-SIZE (madplay-0.15.0b.tar.gz) = 459074
+MD5 (madplay-0.15.2b.tar.gz) = 6814b47ceaa99880c754c5195aa1aac1
+SHA256 (madplay-0.15.2b.tar.gz) = 5a79c7516ff7560dffc6a14399a389432bc619c905b13d3b73da22fa65acede0
+SIZE (madplay-0.15.2b.tar.gz) = 590929
diff --git a/audio/madplay/files/patch-configure b/audio/madplay/files/patch-configure
deleted file mode 100644
index f195f07b43c6..000000000000
--- a/audio/madplay/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Wed Dec 11 18:31:51 2002
-+++ configure	Thu Dec 12 12:07:17 2002
-@@ -7414,6 +7414,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/audio/madplay/pkg-plist b/audio/madplay/pkg-plist
index c2f54147ef13..a9ac9d3c8d50 100644
--- a/audio/madplay/pkg-plist
+++ b/audio/madplay/pkg-plist
@@ -1,18 +1,8 @@
 bin/abxtest
 bin/madplay
 bin/madtime
-share/locale/en/LC_MESSAGES/madplay.mo
-share/locale/es/LC_MESSAGES/madplay.mo
-share/locale/fr/LC_MESSAGES/madplay.mo
-share/locale/hr/LC_MESSAGES/madplay.mo
-share/locale/no/LC_MESSAGES/madplay.mo
-@exec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
-@exec rmdir %D/share/locale/no 2>/dev/null || true
-@exec rmdir %D/share/locale/hr/LC_MESSAGES 2>/dev/null || true
-@exec rmdir %D/share/locale/hr 2>/dev/null || true
-@exec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@exec rmdir %D/share/locale/fr 2>/dev/null || true
-@exec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@exec rmdir %D/share/locale/es 2>/dev/null || true
-@exec rmdir %D/share/locale/en/LC_MESSAGES 2>/dev/null || true
-@exec rmdir %D/share/locale/en 2>/dev/null || true
+%%NLS%%share/locale/en/LC_MESSAGES/madplay.mo
+%%NLS%%share/locale/es/LC_MESSAGES/madplay.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/madplay.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/madplay.mo
+%%NLS%%share/locale/no/LC_MESSAGES/madplay.mo