[Midnightbsd-cvs] mports [15955] U trunk/audio/libmad/files/patch-configure: refactor

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Feb 28 20:04:51 EST 2014


Revision: 15955
          http://svnweb.midnightbsd.org/mports/?rev=15955
Author:   laffer1
Date:     2014-02-28 20:04:50 -0500 (Fri, 28 Feb 2014)
Log Message:
-----------
refactor

Modified Paths:
--------------
    trunk/audio/libmad/Makefile
    trunk/audio/libmad/distinfo
    trunk/audio/libmad/files/mad.pc.in
    trunk/audio/libmad/files/patch-configure

Property Changed:
----------------
    trunk/audio/libmad/files/mad.pc.in
    trunk/audio/libmad/files/patch-configure

Modified: trunk/audio/libmad/Makefile
===================================================================
--- trunk/audio/libmad/Makefile	2014-03-01 01:00:56 UTC (rev 15954)
+++ trunk/audio/libmad/Makefile	2014-03-01 01:04:50 UTC (rev 15955)
@@ -1,40 +1,39 @@
-# New ports collection makefile for:  libmad
-# Date created:        26 November 2003
-# Whom:                Sergey Akifyev <asa at gascom.ru>
-#
 # $MidnightBSD$
-# $FreeBSD: ports/audio/libmad/Makefile,v 1.9 2006/02/23 10:34:34 ade Exp $
-#
 
 PORTNAME=	libmad
 PORTVERSION=	0.15.1b
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
-MASTER_SITES=	SF/mad/${PORTNAME}/${PORTVERSION} \
-		ftp://ftp.mars.org/pub/mpeg/
+MASTER_SITES=	SF/mad/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Libmad library (part of MAD project)
+
 LICENSE=	gpl2
 
-USE_AUTOTOOLS=	libtool
+OPTIONS_DEFINE=	SPEED
+SPEED_DESC=	Optimize for speed over accuracy
+
+CONFIGURE_ARGS=	--disable-debugging --enable-sso
 GNU_CONFIGURE=	yes
-USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--disable-debugging \
-		--enable-sso
-.if defined(WITH_SPEED)
-CONFIGURE_ARGS+=	--enable-speed
-.else
-CONFIGURE_ARGS+=	--enable-accuracy
-.endif
+USES=		libtool:oldver
 
+SUB_LIST=	VERSION=${PORTVERSION}
+SUB_FILES=	mad.pc
+
+SPEED_CONFIGURE_ON=	--enable-speed
+SPEED_CONFIGURE_OFF=	--enable-accuracy
+
 post-patch:
-	@${SED} -e 's|%PREFIX%|${PREFIX}|g ; s|%VERSION%|${PORTVERSION}|g' \
-		${FILESDIR}/mad.pc.in > ${WRKDIR}/mad.pc
+	@${REINPLACE_CMD} -e 's| -fforce-mem||' ${WRKSRC}/configure
 
+post-build:
+	@${STRIP_CMD} ${WRKSRC}/.libs/libmad.so.2.1
+
 post-install:
-	${MKDIR} ${PREFIX}/libdata/pkgconfig
-	${INSTALL_DATA} ${WRKDIR}/mad.pc ${PREFIX}/libdata/pkgconfig
+	${INSTALL_DATA} ${WRKDIR}/mad.pc ${PREFIX}/libdata/pkgconfig/
+	@${CP} ${PREFIX}/lib/libmad.so.2.1 ${PREFIX}/lib/libmad.so.2
+	(cd ${PREFIX}/lib && ln -sf libmad.so.2 libmad.so)
 
 .include <bsd.port.mk>

Modified: trunk/audio/libmad/distinfo
===================================================================
--- trunk/audio/libmad/distinfo	2014-03-01 01:00:56 UTC (rev 15954)
+++ trunk/audio/libmad/distinfo	2014-03-01 01:04:50 UTC (rev 15955)
@@ -1,3 +1,2 @@
 SHA256 (libmad-0.15.1b.tar.gz) = bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690
-RMD160 (libmad-0.15.1b.tar.gz) = 0f3415ee10b188681e282ca69dec74c46ca73b0f
 SIZE (libmad-0.15.1b.tar.gz) = 502379

Modified: trunk/audio/libmad/files/mad.pc.in
===================================================================
--- trunk/audio/libmad/files/mad.pc.in	2014-03-01 01:00:56 UTC (rev 15954)
+++ trunk/audio/libmad/files/mad.pc.in	2014-03-01 01:04:50 UTC (rev 15955)
@@ -1,4 +1,4 @@
-prefix=%PREFIX%
+prefix=%%PREFIX%%
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
@@ -6,6 +6,6 @@
 Name: mad
 Description: MPEG Audio Decoder
 Requires:
-Version: %VERSION%
+Version: %%VERSION%%
 Libs: -L${libdir} -lmad -lm
 Cflags: -I${includedir}


Property changes on: trunk/audio/libmad/files/mad.pc.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/audio/libmad/files/patch-configure
===================================================================
--- trunk/audio/libmad/files/patch-configure	2014-03-01 01:00:56 UTC (rev 15954)
+++ trunk/audio/libmad/files/patch-configure	2014-03-01 01:04:50 UTC (rev 15955)
@@ -1,10 +1,39 @@
---- configure.orig	Wed Dec 11 18:31:51 2002
-+++ configure	Thu Dec 12 12:07:17 2002
-@@ -7414,6 +7414,7 @@
+--- configure.orig	2014-02-11 23:45:49.000000000 +0100
++++ configure	2014-02-11 23:50:50.000000000 +0100
+@@ -19096,24 +19096,30 @@
+ 	esac
+     fi
  
- # 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'
++    if $CC -v 2>&1 | grep clang > /dev/null; then
++	CLANG=yes
++    else
++	CLANG=no
++    fi
++
+     case "$optimize" in
+ 	-O|"-O "*)
+ 	    optimize="-O"
+ 	    optimize="$optimize -fforce-mem"
+-	    optimize="$optimize -fforce-addr"
++	    test $CLANG = no && optimize="$optimize -fforce-addr"
+ 	    : #x optimize="$optimize -finline-functions"
+ 	    : #- optimize="$optimize -fstrength-reduce"
+-	    optimize="$optimize -fthread-jumps"
+-	    optimize="$optimize -fcse-follow-jumps"
+-	    optimize="$optimize -fcse-skip-blocks"
++	    test $CLANG = no && optimize="$optimize -fthread-jumps"
++	    test $CLANG = no && optimize="$optimize -fcse-follow-jumps"
++	    test $CLANG = no && optimize="$optimize -fcse-skip-blocks"
+ 	    : #x optimize="$optimize -frerun-cse-after-loop"
+ 	    : #x optimize="$optimize -frerun-loop-opt"
+ 	    : #x optimize="$optimize -fgcse"
+ 	    optimize="$optimize -fexpensive-optimizations"
+-	    optimize="$optimize -fregmove"
++	    test $CLANG = no && optimize="$optimize -fregmove"
+ 	    : #* optimize="$optimize -fdelayed-branch"
+ 	    : #x optimize="$optimize -fschedule-insns"
+-	    optimize="$optimize -fschedule-insns2"
++	    test $CLANG = no && optimize="$optimize -fschedule-insns2"
+ 	    : #? optimize="$optimize -ffunction-sections"
+ 	    : #? optimize="$optimize -fcaller-saves"
+ 	    : #> optimize="$optimize -funroll-loops"


Property changes on: trunk/audio/libmad/files/patch-configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property


More information about the Midnightbsd-cvs mailing list