ports/185275: [maintainer update] port www/polipo

[Frank Behrens]

>Number:         185275
>Category:       ports
>Synopsis:       [maintainer update] port www/polipo
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 29 19:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Frank Behrens
>Release:        FreeBSD 9.2-STABLE i386
>Organization:
>Environment:
>Description:
minor maintainer update of port www/polipo (no version change required)
1. support staging
2. support LICENSE framework
3. minor cleanup

>How-To-Repeat:
>Fix:
--- polipo-1.0.4.1-port.patch begins here ---
diff -urwN /usr/ports/www/polipo/Makefile /usr/local/src/polipo/port/Makefile
--- /usr/ports/www/polipo/Makefile	2013-09-21 01:36:50.000000000 +0200
+++ /usr/local/src/polipo/port/Makefile	2013-12-29 18:59:19.513960626 +0100
@@ -10,20 +10,15 @@
 MAINTAINER=	frank at pinky.sax.de
 COMMENT=	A small and fast caching web proxy
 
-MAN1=		polipo.1
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 
 USE_RC_SUBR=	polipo
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
-.if defined(NO_PTEXINFO)
-ALL_TARGET=	polipo
-NOPORTDOCS=	yes
-.else
 INFO=		polipo
-.endif
-
 DOCSDIR=	${DATADIR}/www/doc
 PORTDOCS=	*
 
@@ -46,26 +41,16 @@
 	@PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/polipo ${PREFIX}/bin/
-	${MKDIR} ${PREFIX}/etc/periodic/daily/
-	${INSTALL_SCRIPT} ${WRKDIR}/400.polipo ${PREFIX}/etc/periodic/daily/
-	${INSTALL_MAN} ${WRKSRC}/polipo.man ${PREFIX}/man/man1/polipo.1
-	${MKDIR} ${PCONFIGDIR}
-	${INSTALL_DATA} ${WRKSRC}/config.sample ${PCONFIGDIR}
-	${INSTALL_DATA} ${WRKSRC}/forbidden.sample ${PCONFIGDIR}
-	${CHGRP} -R ${PGRP} ${PCONFIGDIR}
-.if !defined(NO_PTEXINFO)
-	${INSTALL_DATA} ${WRKSRC}/polipo.info ${PREFIX}/info/
-.endif
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/html/* ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/localindex.html ${DATADIR}/www/index.html
-	${CHGRP} -R ${PGRP} ${DATADIR}
-.endif
-
-post-install:
-	@PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${CAT} ${PKGMESSAGE}
+	${INSTALL_PROGRAM} ${WRKSRC}/polipo ${STAGEDIR}${PREFIX}/bin/
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily/
+	${INSTALL_SCRIPT} ${WRKDIR}/400.polipo ${STAGEDIR}${PREFIX}/etc/periodic/daily/
+	${INSTALL_MAN} ${WRKSRC}/polipo.man ${STAGEDIR}${PREFIX}/man/man1/polipo.1
+	${MKDIR} ${STAGEDIR}${PCONFIGDIR}
+	${INSTALL_DATA} ${WRKSRC}/config.sample ${STAGEDIR}${PCONFIGDIR}
+	${INSTALL_DATA} ${WRKSRC}/forbidden.sample ${STAGEDIR}${PCONFIGDIR}
+	${INSTALL_DATA} ${WRKSRC}/polipo.info ${STAGEDIR}${PREFIX}/info/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/html/* ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/localindex.html ${STAGEDIR}${DATADIR}/www/index.html
 
 .include <bsd.port.post.mk>
diff -urwN /usr/ports/www/polipo/files/pkg-install.in /usr/local/src/polipo/port/files/pkg-install.in
--- /usr/ports/www/polipo/files/pkg-install.in	2012-07-14 16:29:18.000000000 +0200
+++ /usr/local/src/polipo/port/files/pkg-install.in	2013-12-29 19:50:00.863963842 +0100
@@ -44,9 +44,11 @@
 elif [ "$2" = "POST-INSTALL" ]; then
 
 	if [ ! -d "%%DESTDIR%%$POLIPOCACHE" ]; then
+		CACHEPARENT=`dirname ${POLIPOCACHE}`
 		mkdir -p "%%DESTDIR%%$POLIPOCACHE" || exit 1
 		chown "$POLIPOUSER:$POLIPOGROUP" "%%DESTDIR%%$POLIPOCACHE" || exit 1
-		chmod 0770 "%%DESTDIR%%$POLIPOCACHE" || exit 1
+		chmod o+x "%%DESTDIR%%$CACHEPARENT" || exit 1
+		chmod u=rwx "%%DESTDIR%%$POLIPOCACHE" || exit 1
 	fi
 
 	if [ ! -d "%%DESTDIR%%$PPIDDIR" ]; then
diff -urwN /usr/ports/www/polipo/pkg-plist /usr/local/src/polipo/port/pkg-plist
--- /usr/ports/www/polipo/pkg-plist	2012-07-14 16:29:18.000000000 +0200
+++ /usr/local/src/polipo/port/pkg-plist	2013-12-29 20:09:28.993967398 +0100
@@ -2,6 +2,10 @@
 etc/polipo/config.sample
 etc/polipo/forbidden.sample
 etc/periodic/daily/400.polipo
-%%PORTDOCS%%%%DATADIR%%/www/index.html
+man/man1/polipo.1.gz
+%%DATADIR%%/www/index.html
+ at dirrmtry %%DATADIR%%/www
+ at dirrmtry %%DATADIR%%
+ at dirrmtry etc/polipo
 @dirrmtry etc/periodic/daily
 @dirrmtry etc/periodic
--- polipo-1.0.4.1-port.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: