Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 20 Aug 2006 07:55:56 +0400 (MSD)
From:      Yar Tikhiy <yar@comp.chem.msu.su>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        asa@gascom.ru
Subject:   ports/102306: Update audio/madplay to 0.15.2b + port fixes
Message-ID:  <200608200355.k7K3tuJ8013135@bsd.chem.msu.ru>
Resent-Message-ID: <200608200400.k7K40bAd097634@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         102306
>Category:       ports
>Synopsis:       Update audio/madplay to 0.15.2b + port fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Aug 20 04:00:36 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Yar Tikhiy
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
None
>Environment:

	FreeBSD

>Description:

	madplay 0.15.2b has been there for quite a while.  While updating
	its port, I also noticed some suboptimal things in it and tried to
	fix them, too.  Here's a proposed commit message giving the details:

+ Update to madplay 0.15.2b.
+ Add support for WITHOUT_NLS.
+ In fact, this port installs no shlib.
+ 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 in BSD.local.dist
  or managed by the gettext port, so we needn't try to remove them.

	This PR is CC'd to the port maintainer.  Sergey, I'll be glad
	to commit this change if you have no reservations about it.

>How-To-Repeat:

	See http://sourceforge.net/project/showfiles.php?group_id=12349

>Fix:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/madplay/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile	23 Feb 2006 10:34:37 -0000	1.8
+++ Makefile	20 Aug 2006 03:36:30 -0000
@@ -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/lib
 
 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)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=		NLS="@comment "
+.else
+USE_GETTEXT=		yes
+PLIST_SUB+=		NLS=""
+.endif
+
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mesound}!=""
+.if ${HAVE_GNOME:Mesound} != ""
 USE_GNOME+=	esound
 PKGNAMESUFFIX=	-esound
 .else
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/audio/madplay/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo	22 Jan 2006 08:12:51 -0000	1.3
+++ distinfo	20 Aug 2006 03:36:30 -0000
@@ -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
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/audio/madplay/pkg-plist,v
retrieving revision 1.2
diff -u -p -r1.2 pkg-plist
--- pkg-plist	7 Dec 2003 03:32:10 -0000	1.2
+++ pkg-plist	20 Aug 2006 03:36:30 -0000
@@ -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
Index: files/patch-configure
===================================================================
RCS file: files/patch-configure
diff -N files/patch-configure
--- files/patch-configure	7 Dec 2003 01:05:38 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -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'
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608200355.k7K3tuJ8013135>