svn commit: r357274 - in head/net/vtun: . files

[Cy Schubert]

Author: cy
Date: Tue Jun 10 06:34:08 2014
New Revision: 357274
URL: http://svnweb.freebsd.org/changeset/ports/357274
QAT: https://qat.redports.org/buildarchive/r357274/

Log:
  Stagify.

Modified:
  head/net/vtun/Makefile
  head/net/vtun/files/patch-Makefile.in
  head/net/vtun/pkg-plist

Modified: head/net/vtun/Makefile
==============================================================================
--- head/net/vtun/Makefile	Tue Jun 10 06:31:43 2014	(r357273)
+++ head/net/vtun/Makefile	Tue Jun 10 06:34:08 2014	(r357274)
@@ -9,11 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	cy at FreeBSD.org
 COMMENT=	Virtual Tunnels over TCP/IP networks with traffic shaping
 
-LIB_DEPENDS=	lzo2.2:${PORTSDIR}/archivers/lzo2
-
-MAN5=		vtund.conf.5
-MAN8=		vtund.8
-MLINKS=		vtund.8 vtun.8
+LIB_DEPENDS=	liblzo2.so:${PORTSDIR}/archivers/lzo2
 
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
@@ -30,7 +26,6 @@ ALL_TARGET=	vtund
 DOCS=		ChangeLog Credits FAQ README README.LZO README.Setup \
 		README.Shaper TODO
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${CC} == "clang" || ${CXX} == "clang++" || ${OSVERSION} >= 1000026
@@ -43,13 +38,14 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-tun_de
 .endif
 
 post-install:
-	@${STRIP_CMD} ${PREFIX}/sbin/vtund
-	@${INSTALL_DATA} ${WRKSRC}/vtund.conf ${PREFIX}/etc/vtund.conf.example
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/vtund
+	@${INSTALL_DATA} ${WRKSRC}/vtund.conf ${STAGEDIR}${PREFIX}/etc/vtund.conf.example
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
+	@${LN} -s ${STAGEDIR}${PREFIX}/man/man8/vtund.8 ${STAGEDIR}${PREFIX}/man/man1/vtun.1
 
 .include <bsd.port.post.mk>

Modified: head/net/vtun/files/patch-Makefile.in
==============================================================================
--- head/net/vtun/files/patch-Makefile.in	Tue Jun 10 06:31:43 2014	(r357273)
+++ head/net/vtun/files/patch-Makefile.in	Tue Jun 10 06:34:08 2014	(r357274)
@@ -1,5 +1,14 @@
 --- Makefile.in.orig	2012-07-08 21:55:38.000000000 -0700
-+++ Makefile.in	2012-10-01 12:36:55.710386405 -0700
++++ Makefile.in	2014-06-09 23:06:38.000000000 -0700
+@@ -28,7 +28,7 @@
+ LEXFLAGS = -t 
+ 
+ INSTALL = @INSTALL@
+-INSTALL_OWNER = -o root -g 0
++INSTALL_OWNER =
+ 
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
 @@ -55,7 +55,7 @@
  
  CONFIGURE_FILES = Makefile config.status config.cache config.h config.log 

Modified: head/net/vtun/pkg-plist
==============================================================================
--- head/net/vtun/pkg-plist	Tue Jun 10 06:31:43 2014	(r357273)
+++ head/net/vtun/pkg-plist	Tue Jun 10 06:34:08 2014	(r357274)
@@ -1,6 +1,12 @@
+ at owner root
+ at group wheel
 @unexec if cmp -s %D/etc/vtund.conf.example %D/etc/vtund.conf; then rm -f %D/etc/vtund.conf; fi
 etc/vtund.conf.example
 sbin/vtund
+man/man5/vtund.conf.5.gz
+man/man8/vtund.8.gz
+man/man8/vtun.8.gz
+man/man1/vtun.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/Credits
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
@@ -10,5 +16,8 @@ sbin/vtund
 %%PORTDOCS%%%%DOCSDIR%%/README.Shaper
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
- at exec rm -rf /var/log/vtund
- at exec rm -rf /var/lock/vtund
+ at unexec rm -rf "/var/log/vtund"
+ at unexec rm -rf "/var/lock/vtund"
+ at unexec rmdir "/var/lock/vtund" >/dev/null 2>&1 || :
+ at unexec rmdir "/var/lock" >/dev/null 2>&1 || :
+ at unexec rmdir "/var/log/vtund" >/dev/null 2>&1 || :