Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 26 May 2014 17:03:58 +0200 (CEST)
From:      freebsd@nagilum.org
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        ports@FreeBSD.org
Subject:   ports/190271: Stagify www/wwwoffle
Message-ID:  <20140526150359.E4C612D51FC@cakebox.homeunix.net>
Resent-Message-ID: <201405261510.s4QFA07f043776@freefall.freebsd.org>

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

>Number:         190271
>Category:       ports
>Synopsis:       Stagify www/wwwoffle
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 26 15:10:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     freebsd@nagilum.org
>Release:        FreeBSD 9.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD cakebox.tis 9.2-STABLE FreeBSD 9.2-STABLE #0 r264294M: Fri Apr 11 10:19:25 CEST 2014 root@cakebox.tis:/usr/obj/export/src/sys/net5501 i386


>Description:
	www/wwwoffle does not support staging

>How-To-Repeat:
>Fix:

	Apply the patch below.

--- wwwoffle.patch begins here ---
diff -Naur wwwoffle.orig/Makefile wwwoffle/Makefile
--- wwwoffle.orig/Makefile	2014-03-15 09:12:20.000000000 +0100
+++ wwwoffle/Makefile	2014-05-26 16:52:12.000000000 +0200
@@ -12,7 +12,7 @@
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls
+TLS_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls
 
 USES=		perl5 gmake
 
@@ -35,13 +35,12 @@
 SUB_FILES=	pkg-message
 SUB_LIST=	WWWOFFLE_SPOOL="${WWWOFFLE_SPOOL}"
 
-MAN1=		wwwoffle.1
-MAN5=		wwwoffle.conf.5
-MAN8=		wwwoffled.8
-
-NO_STAGE=	yes
 post-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/conf/upgrade-config.pl ${WWWOFFLE_SPOOL}
+	${INSTALL_SCRIPT} ${WRKSRC}/conf/upgrade-config.pl ${WWWOFFLE_SPOOL}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}* ${STAGEDIR}${PREFIX}/sbin/${PORTNAME}d
 	@${CAT} ${PKGMESSAGE}
 
+post-stage:
+	@${RM} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf
+
 .include <bsd.port.mk>
diff -Naur wwwoffle.orig/pkg-plist wwwoffle/pkg-plist
--- wwwoffle.orig/pkg-plist	2014-01-22 16:16:56.000000000 +0100
+++ wwwoffle/pkg-plist	2014-05-26 11:42:37.000000000 +0200
@@ -9,8 +9,11 @@
 bin/wwwoffle-rm
 bin/wwwoffle-tools
 bin/wwwoffle-write
-@unexec if cmp -s %D/etc/wwwoffle.conf.install %D/etc/wwwoffle.conf; then rm -f %D/etc/wwwoffle.conf; fi
+@unexec if cmp -s %D/etc/wwwoffle.conf %D/etc/wwwoffle.conf.install; then rm -f %D/etc/wwwoffle.conf; fi
 etc/wwwoffle.conf.install
+man/man1/wwwoffle.1.gz
+man/man5/wwwoffle.conf.5.gz
+man/man8/wwwoffled.8.gz
 sbin/wwwoffled
 share/doc/wwwoffle/CHANGES.CONF
 share/doc/wwwoffle/COPYING
@@ -838,7 +841,6 @@
 search/namazu/scripts/wwwoffle-mknmz-lasttime
 search/namazu/scripts/wwwoffle-namazu
 search/udmsearch
-upgrade-config.pl
 @dirrm search/namazu/scripts
 @dirrm search/namazu/db
 @dirrm search/namazu/conf
--- wwwoffle.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?20140526150359.E4C612D51FC>