Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 24 Apr 2014 11:02:35 +0900
From:      Takefu <takefu@airport.fm>
To:        freebsd-gnats-submit@freebsd.org, jmohacsi@bsd.hu
Subject:   ports/188936: [PATCH] www/www6to4: Stageing
Message-ID:  <535870BB.5040409@airport.fm>
Resent-Message-ID: <201404240210.s3O2A0vi002622@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         188936
>Category:       ports
>Synopsis:       [PATCH] www/www6to4: Fix StageDir
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 24 02:10:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Takefu
>Release:        FreeBSD 8.4-RELEASE-p8 i386
>Organization:
FOX Amateur Radio Club
>Environment:
System: FreeBSD RELENG84-ix86.localIPv4.airport.fm 8.4-RELEASE-p8 FreeBSD=
 8.4-RELEASE-p8 #0: Tue Apr 15 11:05:17 JST 2014
>Description:
-- 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)
>How-To-Repeat:
>Fix:

--- www6to4-1.6.patch begins here ---
diff -ruN /usr/ports/www/www6to4/Makefile ./Makefile
--- /usr/ports/www/www6to4/Makefile	2013-09-21 08:36:50.000000000 +0900
+++ ./Makefile	2014-04-24 10:58:49.000000000 +0900
@@ -10,27 +10,32 @@
 MAINTAINER=3D	jmohacsi@bsd.hu
 COMMENT=3D	Lightweight http proxy to help IPv4 only browsers

+LICENSE=3D	GPL2
+
 WRKSRC=3D		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/./-/}

 USE_RC_SUBR=3D	www6to4
+ALL_TARGET=3D	www6to4
+PORTDOCS=3D	README
+PLIST_FILES=3D	sbin/www6to4 \
+		etc/www6to4/www6to4.conf.sample \
+		etc/www6to4/www6to4_forward.conf.sample
+
+.include <bsd.port.pre.mk>

-NO_STAGE=3D	yes
 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}
+		${STAGEDIR}${ETCDIR}/www6to4_forward.conf.sample
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .endif

 .include <bsd.port.mk>
diff -ruN /usr/ports/www/www6to4/files/patch-Makefile ./files/patch-Makef=
ile
--- /usr/ports/www/www6to4/files/patch-Makefile	2014-01-23 02:40:44.00000=
0000 +0900
+++ ./files/patch-Makefile	1970-01-01 09:00:00.000000000 +0900
@@ -1,13 +0,0 @@
-*** Makefile.orig	Fri Mar 22 00:24:37 2002
---- Makefile	Fri Mar 22 00:25:17 2002
-***************
-*** 6,11 ****
---- 6,13 ----
-
-  OBJS =3D www6to4.o parsers.c loaders.o socket.o
-
-+ all: $(PROG)
-+
-  $(PROG): $(OBJS)
-  	$(CC) $(CFLAGS) -o $(PROG) $(OBJS) $(LDFLAGS)
-
diff -ruN /usr/ports/www/www6to4/pkg-plist ./pkg-plist
--- /usr/ports/www/www6to4/pkg-plist	2014-01-23 00:16:56.000000000 +0900
+++ ./pkg-plist	1970-01-01 09:00:00.000000000 +0900
@@ -1,6 +0,0 @@
-sbin/www6to4
-etc/www6to4/www6to4.conf.sample
-etc/www6to4/www6to4_forward.conf.sample
-%%PORTDOCS%%%%DOCSDIR%%/README
-@dirrm etc/www6to4
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- www6to4-1.6.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:



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