From owner-svn-ports-head@FreeBSD.ORG  Wed Oct 23 08:03:25 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id E85C7192;
 Wed, 23 Oct 2013 08:03:25 +0000 (UTC)
 (envelope-from ehaupt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id BD33A2B34;
 Wed, 23 Oct 2013 08:03:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9N83Pp8075096;
 Wed, 23 Oct 2013 08:03:25 GMT (envelope-from ehaupt@svn.freebsd.org)
Received: (from ehaupt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9N83Pml075092;
 Wed, 23 Oct 2013 08:03:25 GMT (envelope-from ehaupt@svn.freebsd.org)
Message-Id: <201310230803.r9N83Pml075092@svn.freebsd.org>
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Wed, 23 Oct 2013 08:03:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r331358 - in head/audio: libxmp xmp
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Oct 2013 08:03:26 -0000

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