Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Oct 2013 08:03:25 +0000 (UTC)
From:      Emanuel Haupt <ehaupt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r331358 - in head/audio: libxmp xmp
Message-ID:  <201310230803.r9N83Pml075092@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ehaupt
Date: Wed Oct 23 08:03:24 2013
New Revision: 331358
URL: http://svnweb.freebsd.org/changeset/ports/331358

Log:
  Support staging.

Modified:
  head/audio/libxmp/Makefile
  head/audio/xmp/Makefile
  head/audio/xmp/pkg-plist

Modified: head/audio/libxmp/Makefile
==============================================================================
--- head/audio/libxmp/Makefile	Wed Oct 23 07:40:52 2013	(r331357)
+++ head/audio/libxmp/Makefile	Wed Oct 23 08:03:24 2013	(r331358)
@@ -10,7 +10,6 @@ MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Module rendering library for xmp
 
 USES=		gmake
-NO_STAGE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 

Modified: head/audio/xmp/Makefile
==============================================================================
--- head/audio/xmp/Makefile	Wed Oct 23 07:40:52 2013	(r331357)
+++ head/audio/xmp/Makefile	Wed Oct 23 08:03:24 2013	(r331358)
@@ -15,7 +15,6 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	xmp:${PORTSDIR}/audio/libxmp
 
 USES=		pkgconfig gmake
-NO_STAGE=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 
@@ -24,8 +23,6 @@ CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN1=		xmp.1
-
 CONFIG_FILES=	xmp.conf modules.conf
 
 OPTIONS_DEFINE=	ALSA PULSEAUDIO
@@ -51,10 +48,10 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|\ install-conf||' ${WRKSRC}/Makefile.in
 
 post-install:
-	${MKDIR} ${ETCDIR}
+	${MKDIR} ${STAGEDIR}${ETCDIR}
 .for f in ${CONFIG_FILES}
-	@test -f ${ETCDIR}/${f} || ${INSTALL_DATA} ${WRKSRC}/src/${f} ${ETCDIR}/${f}
-	${INSTALL_DATA} ${WRKSRC}/src/${f} ${ETCDIR}/${f}.sample
+	@test -f ${ETCDIR}/${f} || ${INSTALL_DATA} ${WRKSRC}/src/${f} ${STAGEDIR}${ETCDIR}/${f}
+	${INSTALL_DATA} ${WRKSRC}/src/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
 .endfor
 
 .include <bsd.port.mk>

Modified: head/audio/xmp/pkg-plist
==============================================================================
--- head/audio/xmp/pkg-plist	Wed Oct 23 07:40:52 2013	(r331357)
+++ head/audio/xmp/pkg-plist	Wed Oct 23 08:03:24 2013	(r331358)
@@ -1,3 +1,4 @@
+man/man1/xmp.1.gz
 @unexec if cmp -s %D/%%ETCDIR%%/xmp.conf %D/%%ETCDIR%%/xmp.conf.sample; then rm -f %D/%%ETCDIR%%/xmp.conf; fi
 %%ETCDIR%%/xmp.conf.sample
 @exec [ -f %B/xmp.conf ] || cp %B/%f %B/xmp.conf



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