From owner-svn-ports-all@FreeBSD.ORG Sat Feb 16 12:35:48 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 91D9586E; Sat, 16 Feb 2013 12:35:48 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 75E268F2; Sat, 16 Feb 2013 12:35:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1GCZmPn080444; Sat, 16 Feb 2013 12:35:48 GMT (envelope-from ehaupt@svn.freebsd.org) Received: (from ehaupt@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1GCZlG7080439; Sat, 16 Feb 2013 12:35:47 GMT (envelope-from ehaupt@svn.freebsd.org) Message-Id: <201302161235.r1GCZlG7080439@svn.freebsd.org> From: Emanuel Haupt Date: Sat, 16 Feb 2013 12:35:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r312345 - in head/audio/xmp: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Feb 2013 12:35:48 -0000 Author: ehaupt Date: Sat Feb 16 12:35:47 2013 New Revision: 312345 URL: http://svnweb.freebsd.org/changeset/ports/312345 Log: Update to 4.0.0 Deleted: head/audio/xmp/files/ Modified: head/audio/xmp/Makefile head/audio/xmp/distinfo head/audio/xmp/pkg-plist Modified: head/audio/xmp/Makefile ============================================================================== --- head/audio/xmp/Makefile Sat Feb 16 12:32:41 2013 (r312344) +++ head/audio/xmp/Makefile Sat Feb 16 12:35:47 2013 (r312345) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xmp -PORTVERSION= 3.5.0 +PORTVERSION= 4.0.0 PORTEPOCH= 1 CATEGORIES= audio MASTER_SITES= SF @@ -12,30 +12,25 @@ COMMENT= A player for many different Ami LICENSE= GPLv2 +LIB_DEPENDS= xmp:${PORTSDIR}/audio/libxmp + USE_GMAKE= yes WANT_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc --disable-arts \ - --disable-audacious-plugin - -MAN1= xmp.1 -OPTIONS_DEFINE= ALSA BMP ESOUND NAS PULSEAUDIO UNZIP XMMS DOCS +CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc -BMP_DESC= Beep media player plugin -XMMS_DESC= XMMS plugin +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFAULT=UNZIP +MAN1= xmp.1 -MAKE_JOBS_SAFE= yes +CONFIG_FILES= xmp.conf modules.conf -CFLAGS+= -I${LOCALBASE}/include +OPTIONS_DEFINE= ALSA PULSEAUDIO .include -PORTDOCS= * - .if ${PORT_OPTIONS:MALSA} LIB_DEPENDS+= asound:${PORTSDIR}/audio/alsa-lib RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins @@ -44,29 +39,6 @@ CONFIGURE_ARGS+= --enable-alsa CONFIGURE_ARGS+= --disable-alsa .endif -.if ${PORT_OPTIONS:MBMP} -LIB_DEPENDS+= beep:${PORTSDIR}/multimedia/beep-media-player -CONFIGURE_ARGS+= --enable-bmp-plugin -PLIST_SUB+= BMP="" -.else -CONFIGURE_ARGS+= --disable-bmp-plugin -PLIST_SUB+= BMP="@comment " -.endif - -.if ${PORT_OPTIONS:MESOUND} -USE_GNOME+= esound -CONFIGURE_ARGS+= --enable-esd -.else -CONFIGURE_ARGS+= --disable-esd -.endif - -.if ${PORT_OPTIONS:MNAS} -LIB_DEPENDS+= audio:${PORTSDIR}/audio/nas -CONFIGURE_ARGS+= --enable-nas -.else -CONFIGURE_ARGS+= --disable-nas -.endif - .if ${PORT_OPTIONS:MPULSEAUDIO} LIB_DEPENDS+= pulse-simple:${PORTSDIR}/audio/pulseaudio CONFIGURE_ARGS+= --enable-pulseaudio @@ -74,47 +46,17 @@ CONFIGURE_ARGS+= --enable-pulseaudio CONFIGURE_ARGS+= --disable-pulseaudio .endif -.if ${PORT_OPTIONS:MUNZIP} -RUN_DEPENDS+= ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip -.else -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-misc-load.c +post-patch: + @${REINPLACE_CMD} -e 's|\(pulseaudio\.o\)|sound_\1|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|\ install-conf||' ${WRKSRC}/Makefile.in + +post-install: + ${MKDIR} ${PREFIX}/etc/xmp +.for f in ${CONFIG_FILES} +.if !exists(${ETCDIR}/${f}) + ${INSTALL_DATA} ${WRKSRC}/src/${f} ${ETCDIR}/${f} .endif - -.if ${PORT_OPTIONS:MXMMS} -LIB_DEPENDS+= xmms:${PORTSDIR}/multimedia/xmms -CONFIGURE_ARGS+= --enable-xmms-plugin -PLIST_SUB+= XMMS="" -.else -CONFIGURE_ARGS+= --disable-xmms-plugin -PLIST_SUB+= XMMS="@comment " -.endif - -post-patch: .SILENT -.for f in docs/xmp.1 etc/xmp.conf etc/modules.conf - ${REINPLACE_CMD} -e "s|/etc/xmp|${ETCDIR}|g" ${WRKSRC}/${f} + ${INSTALL_DATA} ${WRKSRC}/src/${f} ${ETCDIR}/${f}.sample .endfor - ${REINPLACE_CMD} -e \ - '/$$(INSTALL_DATA)/s|\([[:alnum:]]*\.conf\).*$$|&\1.sample|' \ - ${WRKSRC}/etc/Makefile - @${REINPLACE_CMD} -e \ - 's|-Wno-unknown-warning-option -Wno-unused-but-set-variable||' \ - ${WRKSRC}/configure - -post-install: .SILENT - if [ ! -f ${ETCDIR}/${PORTNAME}.conf ]; then \ - ${INSTALL_DATA} ${ETCDIR}/${PORTNAME}.conf.sample \ - ${ETCDIR}/${PORTNAME}.conf; \ - fi - if [ ! -f ${ETCDIR}/modules.conf ]; then \ - ${INSTALL_DATA} ${ETCDIR}/modules.conf.sample \ - ${ETCDIR}/modules.conf; \ - fi - -.if ${PORT_OPTIONS:MDOCS} - ${ECHO_MSG} Installing documentation in ${DOCSDIR} - ( cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* \ - ${DOCSDIR} '! ( -name Makefile -or -name xmp.1 \ - -or -name *.bak -or -name *.orig )' ) -.endif .include Modified: head/audio/xmp/distinfo ============================================================================== --- head/audio/xmp/distinfo Sat Feb 16 12:32:41 2013 (r312344) +++ head/audio/xmp/distinfo Sat Feb 16 12:35:47 2013 (r312345) @@ -1,2 +1,2 @@ -SHA256 (xmp-3.5.0.tar.gz) = e1c7c7f9a59da7901f299e1b93b4ffb4ad17731cbb8f09df5c2d5eab2ef7e3a3 -SIZE (xmp-3.5.0.tar.gz) = 887671 +SHA256 (xmp-4.0.0.tar.gz) = 0a78728f8a108235360676af779ac5df1ab9e68f96d0a0ed5b1fa26c83764de1 +SIZE (xmp-4.0.0.tar.gz) = 127630 Modified: head/audio/xmp/pkg-plist ============================================================================== --- head/audio/xmp/pkg-plist Sat Feb 16 12:32:41 2013 (r312344) +++ head/audio/xmp/pkg-plist Sat Feb 16 12:35:47 2013 (r312345) @@ -1,10 +1,8 @@ +@unexec if cmp -s %D/etc/xmp/xmp.conf %D/etc/xmp/xmp.conf.sample; then rm -f %D/etc/xmp/xmp.conf; fi +etc/xmp/xmp.conf.sample +@exec [ -f %B/xmp.conf ] || cp %B/%f %B/xmp.conf bin/xmp -@unexec if cmp -s %D/%%ETCDIR%%/xmp.conf.sample %D/%%ETCDIR%%/xmp.conf; then rm -f %D/%%ETCDIR%%/xmp.conf; fi -%%ETCDIR%%/xmp.conf.sample -@exec if [ ! -f %D/%%ETCDIR%%/xmp.conf ]; then cp -p %D/%F %B/xmp.conf; fi -@unexec if cmp -s %D/%%ETCDIR%%/modules.conf.sample %D/%%ETCDIR%%/modules.conf; then rm -f %D/%%ETCDIR%%/modules.conf; fi -%%ETCDIR%%/modules.conf.sample -@exec if [ ! -f %D/%%ETCDIR%%/modules.conf ]; then cp -p %D/%F %B/modules.conf; fi -%%BMP%%lib/bmp/Input/xmp-bmp.so -%%XMMS%%lib/xmms/Input/xmp-xmms.so -@dirrmtry %%ETCDIR%% +@unexec if cmp -s %D/etc/xmp/modules.conf %D/etc/xmp/modules.conf.sample; then rm -f %D/etc/xmp/modules.conf; fi +etc/xmp/modules.conf.sample +@exec [ -f %B/modules.conf ] || cp %B/%f %B/modules.conf +@dirrmtry etc/xmp