Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 18 Feb 2014 00:25:53 +0000 (UTC)
From:      Martin Wilke <miwi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r344831 - head/mail/faces
Message-ID:  <201402180025.s1I0Prxb029875@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: miwi
Date: Tue Feb 18 00:25:53 2014
New Revision: 344831
URL: http://svnweb.freebsd.org/changeset/ports/344831
QAT: https://qat.redports.org/buildarchive/r344831/

Log:
  - Stage support

Modified:
  head/mail/faces/Makefile
  head/mail/faces/pkg-plist

Modified: head/mail/faces/Makefile
==============================================================================
--- head/mail/faces/Makefile	Mon Feb 17 23:10:39 2014	(r344830)
+++ head/mail/faces/Makefile	Tue Feb 18 00:25:53 2014	(r344831)
@@ -19,13 +19,8 @@ SOX_DESC=	Sox audio support
 WANT_GNOME=	yes
 USE_LDCONFIG=	yes
 
-MAN1=		compface.1
-MAN3=		compface.3
-MLINKS=		compface.1 uncompface.1 \
-		compface.3 uncompface.3
 PORTDOCS=	README
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ! ${PORT_OPTIONS:MX11}
@@ -40,7 +35,6 @@ LDFLAGS+=	-L../compface -L${LOCALBASE}/l
 CONFIGURE_ARGS=	--enable-imap --enable-pop \
 		--enable-name-unknown --with-spooldir=/var/mail \
 		--with-facedir=${DATADIR}
-MAN1+=		faces.1
 .endif
 
 .if ! ${PORT_OPTIONS:MNLS}
@@ -84,26 +78,24 @@ do-build:
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/compface/compface ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/compface/uncompface ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/compface/compface.h ${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/compface/libcompface.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/compface/libcompface.so.1 ${PREFIX}/lib
-	${LN} -sf libcompface.so.1 ${PREFIX}/lib/libcompface.so
-	${INSTALL_MAN} ${WRKSRC}/compface/compface.1 ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/compface/compface.3 ${MANPREFIX}/man/man3
-	${INSTALL_SCRIPT} ${FILESDIR}/ikon2xbm ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${FILESDIR}/xbm2ikon ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${FILESDIR}/xbmcut48 ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${FILESDIR}/xbmsize48 ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/compface/compface ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/compface/uncompface ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/compface/compface.h ${STAGEDIR}${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/compface/libcompface.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/compface/libcompface.so.1 ${STAGEDIR}${PREFIX}/lib
+	${LN} -sf libcompface.so.1 ${STAGEDIR}${PREFIX}/lib/libcompface.so
+	${INSTALL_MAN} ${WRKSRC}/compface/compface.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/compface/compface.3 ${STAGEDIR}${MANPREFIX}/man/man3
+	${INSTALL_SCRIPT} ${FILESDIR}/ikon2xbm ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${FILESDIR}/xbm2ikon ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${FILESDIR}/xbmcut48 ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${FILESDIR}/xbmsize48 ${STAGEDIR}${PREFIX}/bin
 .if ${PORT_OPTIONS:MX11}
-	${INSTALL_PROGRAM} ${WRKSRC}/faces/faces ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/faces/faces.1 ${MANPREFIX}/man/man1
-	${INSTALL_DATA} ${WRKSRC}/faces/Faces.ad ${LOCALBASE}/lib/X11/app-defaults/Faces
-.endif
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/faces/faces ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/faces/faces.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/faces/Faces.ad ${STAGEDIR}${LOCALBASE}/lib/X11/app-defaults/Faces
 .endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>

Modified: head/mail/faces/pkg-plist
==============================================================================
--- head/mail/faces/pkg-plist	Mon Feb 17 23:10:39 2014	(r344830)
+++ head/mail/faces/pkg-plist	Tue Feb 18 00:25:53 2014	(r344831)
@@ -10,3 +10,6 @@ lib/libcompface.a
 lib/libcompface.so
 lib/libcompface.so.1
 %%X11%%lib/X11/app-defaults/Faces
+man/man1/compface.1.gz
+%%X11%%man/man1/faces.1.gz
+man/man3/compface.3.gz



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