ports/98469: [MAINTAINER] news/inn: fix package

Shaun Amott shaun at inerd.com
Sat Jun 3 23:40:22 UTC 2006


>Number:         98469
>Category:       ports
>Synopsis:       [MAINTAINER] news/inn: fix package
>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:   Sat Jun 03 23:40:17 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Shaun Amott
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
>Environment:

>Description:

inn fails to package in a clean environment.

The patch below fixes the PLIST.

Thanks again to thierry@ for pointing this out.

>How-To-Repeat:

>Fix:

--- inn.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/news/inn/Makefile,v
retrieving revision 1.75
diff -u -r1.75 Makefile
--- Makefile	28 May 2006 19:38:52 -0000	1.75
+++ Makefile	3 Jun 2006 23:34:17 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	inn
 PORTVERSION=	2.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	news ipv6
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	${PORTNAME}
Index: pkg-install
===================================================================
RCS file: /home/ncvs/ports/news/inn/pkg-install,v
retrieving revision 1.7
diff -u -r1.7 pkg-install
--- pkg-install	28 May 2006 19:38:52 -0000	1.7
+++ pkg-install	3 Jun 2006 23:34:17 -0000
@@ -42,9 +42,16 @@
 	    ${NEWSBASE}/spool/overview \
 	    ${NEWSBASE}/spool/tmp
 
-	if [ -d ${NEWSBASE}/db.dist -a ! -f ${NEWSBASE}/db.dist/* ]; then
+	fc=`ls ${NEWSBASE}/db.dist/* | wc -l`
+
+	if [ -d ${NEWSBASE}/db.dist -a $fc -eq 0 ]; then
 		for f in ${NEWSBASE}/db/*; do
 			cp -pR ${f} ${NEWSBASE}/db.dist
+		done
+	else
+		mkdir -p ${NEWSBASE}/db.dist
+		for f in ${NEWSBASE}/db/*; do
+			touch ${NEWSBASE}/db.dist/${f##*/}
 		done
 	fi
 
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/news/inn/pkg-plist,v
retrieving revision 1.23
diff -u -r1.23 pkg-plist
--- pkg-plist	28 May 2006 19:38:52 -0000	1.23
+++ pkg-plist	3 Jun 2006 23:34:17 -0000
@@ -1,3 +1,4 @@
+ at exec mkdir -p %D/news/db
 news/bin/actmerge
 news/bin/actsync
 news/bin/actsyncd
@@ -105,11 +106,15 @@
 @unexec f=history;      if cmp -s %D/news/db/$f %D/news/db.dist/$f; then rm -f %D/news/db/$f; fi
 @unexec f=history.dir;  if cmp -s %D/news/db/$f %D/news/db.dist/$f; then rm -f %D/news/db/$f; fi
 @unexec f=newsgroups;   if cmp -s %D/news/db/$f %D/news/db.dist/$f; then rm -f %D/news/db/$f; fi
- at unexec rm -f %D/news/db.dist/active       2> /dev/null || true
- at unexec rm -f %D/news/db.dist/active.times 2> /dev/null || true
- at unexec rm -f %D/news/db.dist/history      2> /dev/null || true
- at unexec rm -f %D/news/db.dist/history.dir  2> /dev/null || true
- at unexec rm -f %D/news/db.dist/newsgroups   2> /dev/null || true
+news/db.dist/active
+news/db.dist/active.times
+news/db.dist/history
+news/db.dist/history.dir
+news/db.dist/newsgroups
+ at unexec rm -f %D/news/db.dist/active.old      || true
+ at unexec rm -f %D/news/db.dist/history.n.dir   || true
+ at unexec rm -f %D/news/db.dist/history.n.hash  || true
+ at unexec rm -f %D/news/db.dist/history.n.index || true
 %%SUB_WITHOUT_TAGGED_HASH%%@unexec f=history.hash;  if cmp -s %D/news/db/$f %D/news/db.dist/$f; then rm -f %D/news/db/$f; fi
 %%SUB_WITHOUT_TAGGED_HASH%%@unexec f=history.index; if cmp -s %D/news/db/$f %D/news/db.dist/$f; then rm -f %D/news/db/$f; fi
 %%SUB_WITHOUT_TAGGED_HASH%%@unexec rm -f %D/news/db.dist/history.hash  2> /dev/null || true
@@ -257,15 +262,15 @@
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry news/tmp
- at dirrm news/spool/overview
- at dirrm news/spool/outgoing
- at dirrm news/spool/innfeed
- at dirrm news/spool/incoming/bad
- at dirrm news/spool/incoming
- at dirrm news/spool/articles
- at dirrm news/spool/archive
- at dirrm news/spool/tmp
- at dirrm news/spool
+ at dirrmtry news/spool/overview
+ at dirrmtry news/spool/outgoing
+ at dirrmtry news/spool/innfeed
+ at dirrmtry news/spool/incoming/bad
+ at dirrmtry news/spool/incoming
+ at dirrmtry news/spool/articles
+ at dirrmtry news/spool/archive
+ at dirrmtry news/spool/tmp
+ at dirrmtry news/spool
 @dirrm news/run
 @dirrm news/lib
 @dirrm news/include/inn
--- inn.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list