From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jul 31 05:20:20 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 924A037B40A for ; Thu, 31 Jul 2003 05:20:20 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 038FD43FCB for ; Thu, 31 Jul 2003 05:20:15 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h6VCKFUp035294 for ; Thu, 31 Jul 2003 05:20:15 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h6VCKFrT035293; Thu, 31 Jul 2003 05:20:15 -0700 (PDT) Resent-Date: Thu, 31 Jul 2003 05:20:15 -0700 (PDT) Resent-Message-Id: <200307311220.h6VCKFrT035293@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, Clement Laforet Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 05C6C37B401 for ; Thu, 31 Jul 2003 05:11:54 -0700 (PDT) Received: from cultdeadsheep.org (charon.cultdeadsheep.org [80.65.226.72]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5611943FBD for ; Thu, 31 Jul 2003 05:11:49 -0700 (PDT) (envelope-from sheepkiller@cultdeadsheep.org) Received: (qmail 46881 invoked from network); 31 Jul 2003 12:11:42 -0000 Received: from unknown (HELO ?HOSTNAME?) (192.168.0.12) by goofy.cultdeadsheep.org with SMTP; 31 Jul 2003 12:11:42 -0000 Received: by _HOSTNAME_ (sSMTP sendmail emulation); Thu, 31 Jul 2003 14:11:40 +0200 Message-Id: <20030731121149.5611943FBD@mx1.FreeBSD.org> Date: Thu, 31 Jul 2003 14:11:40 +0200 From: "Clement Laforet" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: Clement Laforet Subject: ports/55108: [update] news/inn: misc changes: X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Clement Laforet List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jul 2003 12:20:20 -0000 >Number: 55108 >Category: ports >Synopsis: [update] news/inn: misc changes: >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: Thu Jul 31 05:20:14 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Clement Laforet >Release: FreeBSD 5.1-CURRENT i386 >Organization: cotds.org >Environment: System: FreeBSD chuck.cultdeadsheep.org 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Thu Jul 31 03:00:20 CEST 2003 clement@chuck.cultdeadsheep.org:/usr/obj/usr/src/sys/CHUCK i386 >Description: Changelog : - Add python knob - Add WITH_TAGGED_HASH (from PR 36587 (thanks to Thomas Seck) - clean/move stuff from do-install: to post-install: - make "portlint -A" happy >How-To-Repeat: N/A. >Fix: --- inn.diff begins here --- diff -Nru inn.orig/Makefile inn/Makefile --- inn.orig/Makefile Thu Jul 31 13:53:08 2003 +++ inn/Makefile Thu Jul 31 14:00:17 2003 @@ -7,6 +7,7 @@ PORTNAME= inn PORTVERSION= 2.4.0 +PORTREVISION= 1 CATEGORIES= news ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= inn @@ -29,18 +30,34 @@ INN_NEWSLOG?=/var/log/news HAS_CONFIGURE= yes -CONFIGURE_ARGS+= --mandir=${PREFIX}/man -CONFIGURE_ARGS+= --prefix=${PREFIX}/news -CONFIGURE_ARGS+= --with-spool-dir=${INN_NEWSSPOOL} -CONFIGURE_ARGS+= --with-log-dir=${INN_NEWSLOG} -CONFIGURE_ARGS+= --with-perl -CONFIGURE_ARGS+= --with-tmp-path=${INN_NEWSSPOOL}/tmp +CONFIGURE_ARGS+= --mandir=${PREFIX}/man \ + --prefix=${PREFIX}/news \ + --with-spool-dir=${INN_NEWSSPOOL} \ + --with-log-dir=${INN_NEWSLOG} \ + --with-perl \ + --with-tmp-path=${INN_NEWSSPOOL}/tmp \ + --with-openssl \ + --enable-ipv6 + +.if defined(WITH_PYTHON) +USE_PYTHON= YES +CONFIGURE_ARGS+= --with-python +.endif + +.if defined(WITH_TAGGED_HASH) +CONFIGURE_ARGS+= --enable-tagged-hash +DBZ_FILES= dir pag +PLIST_SUB= SUB_WITH_TAGGED_HASH="" +PLIST_SUB+= SUB_WITHOUT_TAGGED_HASH="@comment " +.else CONFIGURE_ARGS+= --enable-largefiles -CONFIGURE_ARGS+= --with-openssl -CONFIGURE_ARGS+= --enable-ipv6 +DBZ_FILES= dir hash index +PLIST_SUB= SUB_WITH_TAGGED_HASH="@comment " +PLIST_SUB+= SUB_WITHOUT_TAGGED_HASH="" +.endif -EXTRA= CONTRIBUTORS HACKING INSTALL LICENSE MANIFEST NEWS README TODO -HEADERS=clibrary.h config.h dbz.h libinn.h storage.h +EXTRA= CONTRIBUTORS HACKING INSTALL LICENSE MANIFEST NEWS README TODO +HEADERS= clibrary.h config.h dbz.h libinn.h storage.h MAN1= convdate.1 fastrm.1 getlist.1 grephistory.1 inews.1 innconfval.1 \ innfeed.1 innmail.1 nntpget.1 pgpverify.1 rnews.1 shlock.1 \ @@ -64,9 +81,8 @@ radius.8 rc.news.8 scanlogs.8 send-nntp.8 send-uucp.8 sendinpaths.8 \ tally.control.8 tdx-util.8 writelog.8 -do-install: +post-install: ${MKDIR} ${INN_NEWSSPOOL} - (cd ${WRKSRC} && ${GMAKE} install) .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} .for FILE in ${EXTRA} @@ -79,8 +95,6 @@ .endfor @${SED} <${FILESDIR}/innd.sh >${PREFIX}/etc/rc.d/innd.sh \ s+!!PREFIX!!+${PREFIX}+g && ${CHMOD} +x ${PREFIX}/etc/rc.d/innd.sh - -post-install: @${CHOWN} root:news ${PREFIX}/news/bin/auth/passwd/ckpasswd @${CHMOD} 4755 ${PREFIX}/news/bin/auth/passwd/ckpasswd @(if [ ! -f ${PREFIX}/news/db/history ] ; then \ @@ -90,7 +104,7 @@ ${CHMOD} 644 history ; \ ${CHOWN} news:news history ; \ su -fm news -c "../bin/makedbz -i" ; \ - for s in dir hash index ; do \ + for s in ${DBZ_FILES} ; do \ ${MV} history.n.$${s} history.$${s} ; \ done ; \ fi) diff -Nru inn.orig/pkg-install inn/pkg-install --- inn.orig/pkg-install Thu Jul 31 13:53:08 2003 +++ inn/pkg-install Thu Jul 31 12:56:04 2003 @@ -1,12 +1,13 @@ #!/bin/sh PKGNAME=$1 +[ ! -n PKG_PREFIX ] && exit 1 case $2 in PRE-INSTALL) ;; POST-INSTALL) - NEWSBASE=${PKG_PREFIX:-/usr/local}/news + NEWSBASE=${PKG_PREFIX}/news install -d -o news -g news -m 755 \ ${NEWSBASE}/run \ ${NEWSBASE}/spool \ @@ -25,4 +26,3 @@ ;; esac exit 0 - diff -Nru inn.orig/pkg-plist inn/pkg-plist --- inn.orig/pkg-plist Thu Jul 31 13:53:08 2003 +++ inn/pkg-plist Thu Jul 31 12:31:51 2003 @@ -104,8 +104,9 @@ news/db/active.times news/db/history news/db/history.dir -news/db/history.hash -news/db/history.index +%%SUB_WITHOUT_TAGGED_HASH%%news/db/history.hash +%%SUB_WITHOUT_TAGGED_HASH%%news/db/history.index +%%SUB_WITH_TAGGED_HASH%%news/db/history.pag news/db/newsgroups news/doc/CONTRIBUTORS news/doc/GPL @@ -186,15 +187,15 @@ news/lib/libinn.a news/lib/libinnhist.a news/lib/libstorage.a -%%PORTDOCS%%share/doc/inn/CONTRIBUTORS -%%PORTDOCS%%share/doc/inn/HACKING -%%PORTDOCS%%share/doc/inn/INSTALL -%%PORTDOCS%%share/doc/inn/LICENSE -%%PORTDOCS%%share/doc/inn/MANIFEST -%%PORTDOCS%%share/doc/inn/NEWS -%%PORTDOCS%%share/doc/inn/README -%%PORTDOCS%%share/doc/inn/TODO -%%PORTDOCS%%@dirrm share/doc/inn +%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS +%%PORTDOCS%%%%DOCSDIR%%/HACKING +%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/LICENSE +%%PORTDOCS%%%%DOCSDIR%%/MANIFEST +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm news/tmp @dirrm news/spool/overview @dirrm news/spool/outgoing --- inn.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: