Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Jun 2014 15:43:42 +0000 (UTC)
From:      William Grzybowski <wg@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r359378 - in head/security/hamachi: . files
Message-ID:  <201406261543.s5QFhgBp059101@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: wg
Date: Thu Jun 26 15:43:41 2014
New Revision: 359378
URL: http://svnweb.freebsd.org/changeset/ports/359378
QAT: https://qat.redports.org/buildarchive/r359378/

Log:
  security/hamachi: support stage
  
  Approved by:	portmgr (stage blanket)

Modified:
  head/security/hamachi/Makefile
  head/security/hamachi/files/patch-Makefile

Modified: head/security/hamachi/Makefile
==============================================================================
--- head/security/hamachi/Makefile	Thu Jun 26 15:43:00 2014	(r359377)
+++ head/security/hamachi/Makefile	Thu Jun 26 15:43:41 2014	(r359378)
@@ -19,9 +19,8 @@ USE_LINUX=	yes
 USE_RC_SUBR=	hamachi
 PLIST_FILES=	bin/hamachi bin/hamachi-init sbin/hamachi-tuncfg
 PORTDOCS=	README CHANGES
-MAKE_ENV=	HAMACHI_DST=${PREFIX}/bin TUNCFG_DST=${PREFIX}/sbin
+MAKE_ENV=	HAMACHI_DST=${STAGEDIR}${PREFIX}/bin TUNCFG_DST=${STAGEDIR}${PREFIX}/sbin
 
-NO_STAGE=	yes
 post-patch:
 	${RM} -f ${WRKSRC}/tuncfg/tuncfg
 	${LOCALBASE}/bin/upx -d ${WRKSRC}/hamachi
@@ -30,9 +29,7 @@ do-build:
 	${CC} ${CFLAGS} -o ${WRKSRC}/tuncfg/tuncfg ${WRKSRC}/tuncfg/tuncfg.c
 
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/security/hamachi/files/patch-Makefile
==============================================================================
--- head/security/hamachi/files/patch-Makefile	Thu Jun 26 15:43:00 2014	(r359377)
+++ head/security/hamachi/files/patch-Makefile	Thu Jun 26 15:43:41 2014	(r359378)
@@ -1,5 +1,5 @@
---- Makefile.orig	Tue Jun 20 21:47:28 2006
-+++ Makefile	Thu Mar 22 14:02:01 2007
+--- Makefile.orig	2006-06-20 16:47:28.000000000 -0300
++++ Makefile	2014-06-26 12:42:55.695423898 -0300
 @@ -2,12 +2,12 @@
  #
  #	Where hamachi and its symbolic link hamachi-init goes
@@ -15,6 +15,15 @@
  
  .phony: install
  
+@@ -18,7 +18,7 @@
+ 	@install -m 755 hamachi $(HAMACHI_DST)
+ 
+ 	@echo Creating hamachi-init symlink ..
+-	@ln -sf $(HAMACHI_DST)/hamachi $(HAMACHI_DST)/hamachi-init
++	@ln -sf hamachi $(HAMACHI_DST)/hamachi-init
+ 
+ 	@if which gcc > /dev/null 2>&1; then \
+ 		echo "Compiling tuncfg .."; \
 @@ -26,7 +26,7 @@
  	fi;
  	



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