Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 24 Jun 2014 07:17:28 +0000 (UTC)
From:      "Vanilla I. Shu" <vanilla@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r359050 - head/net/vortex
Message-ID:  <201406240717.s5O7HSas046291@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: vanilla
Date: Tue Jun 24 07:17:28 2014
New Revision: 359050
URL: http://svnweb.freebsd.org/changeset/ports/359050
QAT: https://qat.redports.org/buildarchive/r359050/

Log:
  1: Stagify.
  2: use @sample on pkg-plist.
  
  Approved by:	portmgr@ (blanket approval)

Modified:
  head/net/vortex/Makefile
  head/net/vortex/pkg-plist

Modified: head/net/vortex/Makefile
==============================================================================
--- head/net/vortex/Makefile	Tue Jun 24 07:12:00 2014	(r359049)
+++ head/net/vortex/Makefile	Tue Jun 24 07:17:28 2014	(r359050)
@@ -19,19 +19,14 @@ LIBNET_CONFIG=	${LOCALBASE}/bin/libnet11
 WRKSRC=		${WRKDIR}/${PORTNAME}-2.9.0
 USE_GNOME=	glib20
 
-NO_STAGE=	yes
-
 do-build:
 	cd ${WRKSRC} && ${CC} -c vortex.c -I${LOCALBASE}/include
 	cd ${WRKSRC} && ${CC} -v -o vortex vortex.o -L${LOCALBASE}/lib ${LOCALBASE}/lib/libnids.a `${LIBNET_CONFIG} --libs` -lglib-2.0 -lgthread-2.0 -lpcap
 	cd ${WRKSRC} && ${CC} -o xpipes xpipes.c ${PTHREAD_LIBS}
 
 do-install:
-	${INSTALL_DATA}	${WRKSRC}/vortex.conf ${PREFIX}/etc/vortex.conf.sample
-	if [ ! -f ${PREFIX}/etc/vortex.conf ]; then \
-		${CP} -p ${PREFIX}/etc/vortex.conf.sample ${PREFIX}/etc/vortex.conf; \
-	fi
-	${INSTALL_PROGRAM} ${WRKSRC}/vortex ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/xpipes ${PREFIX}/bin
+	${INSTALL_DATA}	${WRKSRC}/vortex.conf ${STAGEDIR}${PREFIX}/etc/vortex.conf.sample
+	${INSTALL_PROGRAM} ${WRKSRC}/vortex ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/xpipes ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>

Modified: head/net/vortex/pkg-plist
==============================================================================
--- head/net/vortex/pkg-plist	Tue Jun 24 07:12:00 2014	(r359049)
+++ head/net/vortex/pkg-plist	Tue Jun 24 07:17:28 2014	(r359050)
@@ -1,5 +1,3 @@
 bin/vortex
 bin/xpipes
-@unexec if cmp -s %D/etc/vortex.conf.sample %D/etc/vortex.conf; then rm -f %D/etc/vortex.conf; fi
-etc/vortex.conf.sample
-@exec if [ ! -f %D/etc/vortex.conf ]; then cp -p %D/%F %B/vortex.conf; fi
+@sample etc/vortex.conf.sample



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