Date: Mon, 30 Dec 2013 16:10:01 GMT From: Frank Behrens <frank@pinky.sax.de> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/185275: [maintainer update] port www/polipo Message-ID: <201312301610.rBUGA1Su027906@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/185275; it has been noted by GNATS.
From: Frank Behrens <frank@pinky.sax.de>
To: bug-followup@FreeBSD.org
Cc: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Subject: Re: ports/185275: [maintainer update] port www/polipo
Date: Mon, 30 Dec 2013 17:04:16 +0100
This is a multi-part message in MIME format.
--------------080700060900060603010402
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Am 29.12.2013 22:52, schrieb Raphael Kubo da Costa:
> Hi,
>
> The port failed on Poudriere with the following error:
> ...
Thanks for your message. I believe I forgot to remove the pre-install
target from the Makefile. Please try with the new attached patch.
Regards,
Frank
--------------080700060900060603010402
Content-Type: text/plain; charset=windows-1252;
name="polipo-1.0.4.1-port.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="polipo-1.0.4.1-port.patch"
--- 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-30 16:35:22.803985971 +0100
@@ -10,20 +10,14 @@
MAINTAINER= frank@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= *
@@ -42,30 +36,17 @@
PLOGFILE?= /var/log/polipo
MAKE_ENV+= DISK_CACHE_ROOT=${PCACHEDIR}
-pre-install: apply-slist
- @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-30 16:45:48.873966866 +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 ug=rwx,o= "%%DESTDIR%%$POLIPOCACHE" || exit 1
fi
if [ ! -d "%%DESTDIR%%$PPIDDIR" ]; then
@@ -58,7 +60,7 @@
if [ ! -f "%%DESTDIR%%$POLIPOLOG" ]; then
touch "%%DESTDIR%%$POLIPOLOG" || exit 1
chown "$POLIPOUSER" "%%DESTDIR%%$POLIPOLOG" || exit 1
- chmod 0640 "%%DESTDIR%%$POLIPOLOG" || exit 1
+ chmod u=rw,g=r,o= "%%DESTDIR%%$POLIPOLOG" || exit 1
fi
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
+@dirrmtry %%DATADIR%%/www
+@dirrmtry %%DATADIR%%
+@dirrmtry etc/polipo
@dirrmtry etc/periodic/daily
@dirrmtry etc/periodic
--- polipo-1.0.4.1-port.patch ends here ---
--------------080700060900060603010402--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312301610.rBUGA1Su027906>