From owner-svn-ports-all@FreeBSD.ORG  Thu Jun 26 15:43:42 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D709547D;
 Thu, 26 Jun 2014 15:43:42 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AA3C326F2;
 Thu, 26 Jun 2014 15:43:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5QFhgJ1059103;
 Thu, 26 Jun 2014 15:43:42 GMT (envelope-from wg@svn.freebsd.org)
Received: (from wg@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5QFhgBp059101;
 Thu, 26 Jun 2014 15:43:42 GMT (envelope-from wg@svn.freebsd.org)
Message-Id: <201406261543.s5QFhgBp059101@svn.freebsd.org>
From: William Grzybowski <wg@FreeBSD.org>
Date: Thu, 26 Jun 2014 15:43:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r359378 - in head/security/hamachi: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Jun 2014 15:43:42 -0000

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;