From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Oct 8 02:10:01 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D5ACA16A41A for ; Mon, 8 Oct 2007 02:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id AC99013C474 for ; Mon, 8 Oct 2007 02:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l982A1lG054426 for ; Mon, 8 Oct 2007 02:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l982A1aD054425; Mon, 8 Oct 2007 02:10:01 GMT (envelope-from gnats) Resent-Date: Mon, 8 Oct 2007 02:10:01 GMT Resent-Message-Id: <200710080210.l982A1aD054425@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dan Voisine Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 61EA516A417 for ; Mon, 8 Oct 2007 02:09:40 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 299F013C46A for ; Mon, 8 Oct 2007 02:09:40 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.1/8.14.1) with ESMTP id l9829dpk088809 for ; Mon, 8 Oct 2007 02:09:39 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.1/8.14.1/Submit) id l9829dUm088808; Mon, 8 Oct 2007 02:09:39 GMT (envelope-from nobody) Message-Id: <200710080209.l9829dUm088808@www.freebsd.org> Date: Mon, 8 Oct 2007 02:09:39 GMT From: Dan Voisine To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/117003: [MAINTAINER] www/abyssws - Some fixes X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Oct 2007 02:10:02 -0000 >Number: 117003 >Category: ports >Synopsis: [MAINTAINER] www/abyssws - Some fixes >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Oct 08 02:10:01 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Dan Voisine >Release: FreeBSD 6.2-RELEASE-p4 >Organization: >Environment: FreeBSD dan.voisine.private 6.2-RELEASE-p4 FreeBSD 6.2-RELEASE-p4 #0: Thu Apr 26 17:40:53 UTC 2007 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: -Correctly define dependency -For FreeBSD 6.X and later -Correctly preserve index.html -Remove user and group left behind at deinstall (thanks to pointyhat error log) >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ru /usr/ports/www/abyssws/Makefile /home/voisined/abyssws/Makefile --- /usr/ports/www/abyssws/Makefile Sat Sep 15 05:16:59 2007 +++ /home/voisined/abyssws/Makefile Sun Oct 7 21:46:47 2007 @@ -15,17 +15,30 @@ MAINTAINER= voisined@wit.edu COMMENT= Abyss Web Server is a compact and easy to use web server -LIB_DEPENDS= c.6:${PORTSDIR}/misc/compat6x - WRKSRC= ${WRKDIR}/abyssws ONLY_FOR_ARCHS= i386 NO_BUILD= yes +PKGDEINSTALL= ${PKGINSTALL} USE_RC_SUBR= abyssws.sh +.include + +.if ${OSVERSION} < 600000 +IGNORE= is for FreeBSD 6.x and newer +.endif + +.if ${OSVERSION} >= 700043 +LIB_DEPENDS+= c.6:${PORTSDIR}/misc/compat6x +.endif + pre-install: @${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL + @if [ -f ${WRKSRC}/htdocs/index.html ]; then \ + ${MV} -f ${WRKSRC}/htdocs/index.html \ + ${WRKSRC}/htdocs/index.html-dist ; \ + fi do-install: @${INSTALL} -d ${PREFIX}/lib/abyssws @@ -35,7 +48,15 @@ ${PREFIX}/lib/abyssws' >> ${TMPPLIST} post-install: + @if [ ! -f ${PREFIX}/lib/abyssws/htdocs/index.html ]; then \ + ${CP} -p ${PREFIX}/lib/abyssws/htdocs/index.html-dist \ + ${PREFIX}/lib/abyssws/htdocs/index.html ; \ + fi @${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL -.include +post-deinstall: + @${SETENV} PKG_PREFIX=${PREFIX} \ + ${SH} ${PKGDEINSTALL} ${PORTNAME} POST-DEINSTALL + +.include Only in /home/voisined/abyssws: diff diff -ru /usr/ports/www/abyssws/pkg-install /home/voisined/abyssws/pkg-install --- /usr/ports/www/abyssws/pkg-install Sat Sep 15 05:16:59 2007 +++ /home/voisined/abyssws/pkg-install Sun Oct 7 21:51:03 2007 @@ -39,10 +39,7 @@ chown ${USER}:${GROUP} ${WSHOME} fi - if [ -r ${WSHOME}/htdocs/index.html ] ; then - mv ${WSHOME}/htdocs/index.html ${WSHOME}/htdocs/index.html.bak - fi - + ;; POST-INSTALL) @@ -50,11 +47,32 @@ chmod -R u+w,o-rx ${WSHOME} chmod u+s ${WSHOME}/abyssws - if [ -r ${WSHOME}/htdocs/index.html.bak ] ; then - mv ${WSHOME}/htdocs/index.html.bak ${WSHOME}/htdocs/index.html - fi - + ;; +POST-DEINSTALL) + if ! [ -x ${WSHOME} ] ; then + if pw group show "${GROUP}" 2>/dev/null; then + if pw groupdel ${GROUP}; then + echo "Removed group \"${GROUP}\"." + else + echo "Removing group \"${GROUP}\" failed..." + exit 1 + fi + else + echo "Group \"${GROUP}\" doesn't exist!" + fi + if pw user show "${USER}" 2>/dev/null; then + if pw userdel ${USER}; then + echo "Removed user \"${USER}\"." + else + echo "Removing user \"${USER}\" failed..." + exit 1 + fi + else + echo "User \"${USER}\" doesn't exist!" + fi + fi + ;; esac diff -ru /usr/ports/www/abyssws/pkg-plist /home/voisined/abyssws/pkg-plist --- /usr/ports/www/abyssws/pkg-plist Sat Sep 15 05:16:59 2007 +++ /home/voisined/abyssws/pkg-plist Sun Oct 7 21:46:47 2007 @@ -98,7 +98,9 @@ lib/abyssws/lang/fr.lng lib/abyssws/license.txt lib/abyssws/htdocs/pwrabyss.gif -lib/abyssws/htdocs/index.html +@unexec if cmp -s %D/lib/abyssws/htdocs/index.html-dist %D/lib/abyssws/htdocs/index.html; then rm -f %D/lib/abyssws/htdocs/index.html; fi +lib/abyssws/htdocs/index.html-dist +@exec if [ ! -f %D/lib/abyssws/htdocs/index.html ] ; then cp -p %D/%F %B/index.html; fi @dirrm lib/abyssws/console @dirrm lib/abyssws/doc @dirrmtry lib/abyssws/htdocs >Release-Note: >Audit-Trail: >Unformatted: