Bug 188936

Summary: [PATCH] www/www6to4: Fix StageDir
Product: Ports & Packages Reporter: takefu
Component: Individual Port(s)Assignee: Alex Kozlov <ak>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
www6to4-1.6.patch none

Description takefu 2014-04-24 03:10:00 UTC 
-- Fix
 StageDir
 conf file

--=E3=80=80Add
 LICENSE

-- delete
 files/patch-Makefile
 pkg-plist

Port maintainer (jmohacsi@bsd.hu) is cc'd.

Generated with FreeBSD Port Tools 1.01 (mode: change, diff: ports)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2014-04-24 03:10:30 UTC 
Maintainer of www/www6to4,

Please note that PR ports/188936 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/188936

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2014-04-24 03:10:31 UTC 
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Janos Mohacsi 2014-04-24 16:28:41 UTC 
Approved. Thanks for submission.
        Janos Mohacsi
Comment 4 Mark Linimon freebsd_committer freebsd_triage 2014-04-25 04:38:18 UTC 
State Changed
From-To: feedback->open
Comment 5 Alex Kozlov freebsd_committer freebsd_triage 2014-05-07 18:07:48 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->ak

I'll take it.
Comment 6 Alex Kozlov freebsd_committer freebsd_triage 2014-05-07 18:07:57 UTC 
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!
Comment 7 dfilter service freebsd_committer freebsd_triage 2014-05-07 18:09:01 UTC 
Author: ak
Date: Wed May  7 17:08:56 2014
New Revision: 353178
URL: http://svnweb.freebsd.org/changeset/ports/353178
QAT: https://qat.redports.org/buildarchive/r353178/

Log:
  - Support STAGEDIR [1]
  - Add license [1]
  - Use @sample to handle config files
  
  PR:	ports/188936 (based on) [1]
  Submitted by:	Takefu <takefu@airport.fm> [1]
  Approved by:	Janos Mohacsi <jmohacsi@bsd.hu> (maintainer)

Deleted:
  head/www/www6to4/files/patch-Makefile
Modified:
  head/www/www6to4/Makefile
  head/www/www6to4/pkg-plist

Modified: head/www/www6to4/Makefile
==============================================================================
--- head/www/www6to4/Makefile	Wed May  7 17:02:36 2014	(r353177)
+++ head/www/www6to4/Makefile	Wed May  7 17:08:56 2014	(r353178)
@@ -10,27 +10,28 @@ MASTER_SITES=	ftp://ftp.pasta.cs.uit.no/
 MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Lightweight http proxy to help IPv4 only browsers
 
+LICENSE=	GPLv2
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/./-/}
 
 USE_RC_SUBR=	www6to4
 
-NO_STAGE=	yes
+PORTDOCS=	README
+
+ALL_TARGET=	www6to4
+
 post-patch:
-	@${REINPLACE_CMD} -e 's,/etc,${PREFIX}/etc,' \
-		${WRKSRC}/www6to4.c
+	@${REINPLACE_CMD} -e 's,/etc,${ETCDIR},' \
+		${WRKSRC}/www6to4.c ${WRKSRC}/www6to4.conf
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/www6to4 ${PREFIX}/sbin
-	@if [ ! -d ${PREFIX}/etc/www6to4 ]; then \
-		${MKDIR} ${PREFIX}/etc/www6to4; fi
+	${INSTALL_PROGRAM} ${WRKSRC}/www6to4 ${STAGEDIR}${PREFIX}/sbin
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/www6to4.conf \
-		${PREFIX}/etc/www6to4/www6to4.conf.sample
+		${STAGEDIR}${ETCDIR}/www6to4.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/www6to4_forward.conf \
-		${PREFIX}/etc/www6to4/www6to4_forward.conf.sample
-.if !defined(NOPORTDOCS)
-	if [ ! -d ${DOCSDIR} ]; then \
-		${MKDIR} ${DOCSDIR}; fi
-	${INSTALL_DATA} ${WRKSRC}/README \
-		${DOCSDIR}
-.endif
+		${STAGEDIR}${ETCDIR}/www6to4_forward.conf.sample
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/www/www6to4/pkg-plist
==============================================================================
--- head/www/www6to4/pkg-plist	Wed May  7 17:02:36 2014	(r353177)
+++ head/www/www6to4/pkg-plist	Wed May  7 17:08:56 2014	(r353178)
@@ -1,6 +1,4 @@
 sbin/www6to4
-etc/www6to4/www6to4.conf.sample
-etc/www6to4/www6to4_forward.conf.sample
-%%PORTDOCS%%%%DOCSDIR%%/README
-@dirrm etc/www6to4
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@sample %%ETCDIR%%/www6to4.conf.sample
+@sample %%ETCDIR%%/www6to4_forward.conf.sample
+@dirrmtry %%ETCDIR%%
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"