svn commit: r359469 - in head/net/freenet6: . files

Jason E. Hale jhale at FreeBSD.org
Fri Jun 27 08:27:00 UTC 2014 

Author: jhale
Date: Fri Jun 27 08:26:58 2014
New Revision: 359469
URL: http://svnweb.freebsd.org/changeset/ports/359469
QAT: https://qat.redports.org/buildarchive/r359469/

Log:
  - Support staging
  - EXTRACT_SUFX -> USES=tar:tgz
  - Use @sample for sample config and remove note to copy it
    from pkg-message
  
  Approved by:	portmgr (blanket approval)

Added:
  head/net/freenet6/files/patch-Makefile   (contents, props changed)
  head/net/freenet6/files/patch-conf__Makefile   (contents, props changed)
  head/net/freenet6/files/patch-src__lib__config.c
     - copied unchanged from r359462, head/net/freenet6/files/patch-src_lib_config.c
  head/net/freenet6/files/patch-template__Makefile   (contents, props changed)
Deleted:
  head/net/freenet6/files/patch-Makefiles-etcdir.patch
  head/net/freenet6/files/patch-src_lib_config.c
Modified:
  head/net/freenet6/Makefile
  head/net/freenet6/files/pkg-message.in
  head/net/freenet6/pkg-plist

Modified: head/net/freenet6/Makefile
==============================================================================
--- head/net/freenet6/Makefile	Fri Jun 27 08:25:44 2014	(r359468)
+++ head/net/freenet6/Makefile	Fri Jun 27 08:26:58 2014	(r359469)
@@ -7,24 +7,19 @@ PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://go6.net/4105/file.asp?file_id=166&
 DISTNAME=	tspc-${PORTVERSION}-src
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	edwin at mavetju.org
 COMMENT=	Hexago Freenet6 Tunnel Setup Protocol Client - Free IPv6 tunnel
 
-USES=		gmake
+USES=		gmake tar:tgz
 MAKE_ARGS=	target=freebsd CC="${CC}" CXX="${CXX}" \
-		installdir="${PREFIX}" ETCDIR="${ETCDIR}"
+		installdir="${STAGEDIR}${PREFIX}" ETCDIR="${ETCDIR}"
 
 WRKSRC=		${WRKDIR}/gw6c-${DISTVERSION}/tspc-advanced
 
 USE_RC_SUBR=	freenet6
 SUB_FILES=	pkg-message
 
-MAN5=		gw6c.conf.5
-MAN8=		gw6c.8
-
-NO_STAGE=	yes
 MAKE_JOBS_UNSAFE=yes
 
 post-fetch:
@@ -33,9 +28,4 @@ post-fetch:
 			${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}; \
 	fi
 
-post-install:
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-
 .include <bsd.port.mk>

Added: head/net/freenet6/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/freenet6/files/patch-Makefile	Fri Jun 27 08:26:58 2014	(r359469)
@@ -0,0 +1,59 @@
+--- ./Makefile.orig	2009-05-19 12:51:11.000000000 -0400
++++ ./Makefile	2014-06-27 04:03:52.000000000 -0400
+@@ -74,7 +74,7 @@
+ #
+ .PHONY: all platform-check check-gw6c-pal check-gw6c-config check-gw6c-messaging build-gw6c check-gw6c-install install clean cleanall
+ 
+-all: platform-check check-gw6c-pal check-gw6c-config check-gw6c-messaging build-gw6c
++all: platform-check check-gw6c-config check-gw6c-messaging build-gw6c
+ 
+ 
+ # This makefile target will check the platform.
+@@ -117,7 +117,7 @@
+ # This makefile target will check and build the Gateway6 Client Configuration
+ # Subsystem if it is not built.
+ #
+-check-gw6c-config:
++check-gw6c-config:	check-gw6c-pal
+ 	@[ -d ${GW6CCFG_DIR} ] || { \
+ 	    echo "Gateway6 Client Configuration Subsystem module is not found. (${GW6CCFG_DIR})"; \
+ 	    exit 1 ; \
+@@ -131,7 +131,7 @@
+ # This makefile target will check and build the Gateway6 Client Messaging
+ # Subsystem if it is not built.
+ #
+-check-gw6c-messaging:
++check-gw6c-messaging:	check-gw6c-pal
+ 	@[ -d ${GW6CMSG_DIR} ] || { \
+ 	    echo "Gateway6 Client Messaging Subsystem module is not found. (${GW6CMSG_DIR})"; \
+ 	    exit 1 ; \
+@@ -144,7 +144,7 @@
+ 
+ # This makefile target will build the Gateway6 Client.
+ #
+-build-gw6c:
++build-gw6c:	check-gw6c-pal
+ 	mkdir -p $(OBJS_DIR)
+ 	mkdir -p $(BIN_DIR)
+ 	@for dir in ${SUBDIRS}; do \
+@@ -167,17 +167,14 @@
+ 	@mkdir -p $(INSTALL_DIR)
+ 	@mkdir -p $(INSTALL_BIN)
+ 	@mkdir -p $(INSTALL_MAN)
+-	@mkdir -p $(INSTALL_TEMPL)
+ 
+ 	@for dir in ${SUBDIRS}; do \
+ 	    $(MAKE) -C $$dir install || exit 1; \
+ 	done
+ 
+-	@cp $(TARGET) $(INSTALL_BIN)
+-	@cp $(BIN_DIR)/gw6c.conf.sample $(INSTALL_BIN)
+-	@[ -f $(INSTALL_BIN)/gw6c.conf ] || { \
+-	    cp $(INSTALL_BIN)/gw6c.conf.sample $(INSTALL_BIN)/gw6c.conf; \
+-	}
++	${BSD_INSTALL_PROGRAM} $(TARGET) $(INSTALL_BIN)
++	@mkdir -p $(DESTDIR)$(ETCDIR)
++	${BSD_INSTALL_DATA} $(BIN_DIR)/gw6c.conf.sample $(DESTDIR)$(ETCDIR)
+ 
+ 
+ # This makefile target will clean the build tree of the Gateway6 Client.

Added: head/net/freenet6/files/patch-conf__Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/freenet6/files/patch-conf__Makefile	Fri Jun 27 08:26:58 2014	(r359469)
@@ -0,0 +1,11 @@
+--- ./conf/Makefile.orig	2009-05-19 12:50:14.000000000 -0400
++++ ./conf/Makefile	2014-06-27 03:51:00.000000000 -0400
+@@ -32,7 +32,7 @@
+ 	     -e "s+ at ifname_v6udpv4@+$(PLATFORM_V6UDPV4)+" \
+ 	     -e "s+ at ifname_v6v4@+$(PLATFORM_V6V4)+" \
+ 	     -e "s+ at conf_template@+$(PLATFORM)+" \
+-	     -e "s+ at conf_gw6_dir@+$(INSTALL_DIR)+" \
++	     -e "s+ at conf_gw6_dir@+$(PREFIX)+" \
+ 	     gw6c.conf.in > $(BIN_DIR)/gw6c.conf.sample
+ 	@chmod 700 $(BIN_DIR)/gw6c.conf.sample
+ 

Copied: head/net/freenet6/files/patch-src__lib__config.c (from r359462, head/net/freenet6/files/patch-src_lib_config.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/freenet6/files/patch-src__lib__config.c	Fri Jun 27 08:26:58 2014	(r359469, copy of r359462, head/net/freenet6/files/patch-src_lib_config.c)
@@ -0,0 +1,11 @@
+--- src/lib/config.c.orig	2009-05-19 18:22:06.000000000 +0200
++++ src/lib/config.c	2009-11-15 17:57:52.000000000 +0100
+@@ -264,7 +264,7 @@
+ {
+   tConf CmdLine;
+   gw6c_status status = STATUS_SUCCESS_INIT;
+-  const char* cszTemplDir = "template";
++  const char* cszTemplDir = "bin";
+ 
+ 
+   // Hard-coded parameters. Not configurable anymore.

Added: head/net/freenet6/files/patch-template__Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/freenet6/files/patch-template__Makefile	Fri Jun 27 08:26:58 2014	(r359469)
@@ -0,0 +1,15 @@
+--- ./template/Makefile.orig	2008-01-09 10:09:18.000000000 -0500
++++ ./template/Makefile	2014-06-27 03:51:00.000000000 -0400
+@@ -17,8 +17,10 @@
+ 
+ install:
+ 	@echo "Installing templates ..."
+-	@for template_var in README $(PLATFORM).sh; do \
+-            cp $${template_var} $(INSTALL_TEMPL)/$${template_var}; \
++	@for template_var in $(PLATFORM).sh; do \
++            cp $${template_var} $(INSTALL_BIN)/gw6c-$${template_var}; \
+         done
++	@mkdir -p $(DESTDIR)$(ETCDIR)
++	${BSD_INSTALL_DATA} README $(DESTDIR)$(ETCDIR)
+ 
+ clean: 

Modified: head/net/freenet6/files/pkg-message.in
==============================================================================
--- head/net/freenet6/files/pkg-message.in	Fri Jun 27 08:25:44 2014	(r359468)
+++ head/net/freenet6/files/pkg-message.in	Fri Jun 27 08:26:58 2014	(r359469)
@@ -1,6 +1,5 @@
 Now that the package is installed, please finish it with the following steps:
 
-- Copy %%PREFIX%%/etc/gw6c.conf.example to %%PREFIX%%/etc/gw6c.conf
 - Check the values of %%PREFIX%%/etc/gw6c.conf. If you have registered at
   the website, fill in your userid and password there.
 - Add 'freenet6_enable="YES"' to your /etc/rc.conf to make it start

Modified: head/net/freenet6/pkg-plist
==============================================================================
--- head/net/freenet6/pkg-plist	Fri Jun 27 08:25:44 2014	(r359468)
+++ head/net/freenet6/pkg-plist	Fri Jun 27 08:26:58 2014	(r359469)
@@ -1,5 +1,7 @@
 bin/gw6c
 bin/gw6c-freebsd.sh
 etc/freenet6/README
-etc/freenet6/gw6c.conf.sample
+ at sample etc/freenet6/gw6c.conf.sample
+man/man5/gw6c.conf.5.gz
+man/man8/gw6c.8.gz
 @dirrmtry etc/freenet6

More information about the svn-ports-all mailing list