From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Sep 9 10:50:13 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org 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 B683A16A41F for ; Fri, 9 Sep 2005 10:50:13 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E919243D48 for ; Fri, 9 Sep 2005 10:50:12 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j89AoCd4063844 for ; Fri, 9 Sep 2005 10:50:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j89AoCQ2063843; Fri, 9 Sep 2005 10:50:12 GMT (envelope-from gnats) Resent-Date: Fri, 9 Sep 2005 10:50:12 GMT Resent-Message-Id: <200509091050.j89AoCQ2063843@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, Yen-Ming Lee Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EDDCF16A41F for ; Fri, 9 Sep 2005 10:46:41 +0000 (GMT) (envelope-from leeym@utopia.leeym.com) Received: from msr25.hinet.net (msr25.hinet.net [168.95.4.125]) by mx1.FreeBSD.org (Postfix) with ESMTP id 38F4E43D46 for ; Fri, 9 Sep 2005 10:46:40 +0000 (GMT) (envelope-from leeym@utopia.leeym.com) Received: from utopia.leeym.com (utopia.leeym.com [211.21.137.52]) by msr25.hinet.net (8.9.3/8.9.3) with ESMTP id SAA16965; Fri, 9 Sep 2005 18:46:10 +0800 (CST) Received: from localhost (localhost [127.0.0.1]) by utopia.leeym.com (Postfix) with ESMTP id B521EB29CB5; Fri, 9 Sep 2005 18:46:32 +0800 (CST) Received: from utopia.leeym.com ([127.0.0.1]) by localhost (utopia.leeym.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 29481-09; Fri, 9 Sep 2005 18:46:24 +0800 (CST) Received: by utopia.leeym.com (Postfix, from userid 1000) id 03F86B29CE8; Fri, 9 Sep 2005 18:46:24 +0800 (CST) Message-Id: <20050909104624.03F86B29CE8@utopia.leeym.com> Date: Fri, 9 Sep 2005 18:46:24 +0800 (CST) From: Yen-Ming Lee To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: voland@catpipe.net Subject: ports/85903: [PATCH] misc/afbackup: [SUMMARIZE CHANGES] 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: Fri, 09 Sep 2005 10:50:13 -0000 >Number: 85903 >Category: ports >Synopsis: [PATCH] misc/afbackup: [SUMMARIZE CHANGES] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Sep 09 10:50:12 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Yen-Ming Lee >Release: FreeBSD 5.4-STABLE i386 >Organization: FreeBSD Taiwan >Environment: System: FreeBSD utopia.leeym.com 5.4-STABLE FreeBSD 5.4-STABLE #0: Wed Aug 31 08:25:05 CST 2005 >Description: - remove the file left after deinstalling, and unbreak this port Added file(s): - files/pkg-plist.autokey Port maintainer (voland@catpipe.net) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: http://pointyhat.freebsd.org/errorlogs/i386-5-latest-logs/afbackup-3.3.5_3.log http://pointyhat.freebsd.org/errorlogs/i386-5-latest-logs/afbackup-client-3.3.5_3.log http://pointyhat.freebsd.org/errorlogs/i386-5-latest-logs/afbackup-server-3.3.5_3.log >Fix: --- afbackup-3.3.5_3.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/misc/afbackup/Makefile,v retrieving revision 1.16 diff -u -u -r1.16 Makefile --- Makefile 14 Mar 2004 06:16:57 -0000 1.16 +++ Makefile 9 Sep 2005 10:44:35 -0000 @@ -21,7 +21,12 @@ WRKSRC= ${WRKDIR}/afbackup-3.3.5 PLIST= ${WRKSRC}/pkg-plist +.if !defined(WITHOUT_NLS) USE_GETTEXT= yes +.else +CONFIGURE_ARGS+= --disable-nls +.endif + .if ! defined(NO_DES) USE_OPENSSL= yes CONFIG_WITH_DES= --with-des --with-des-header=openssl/des.h \ @@ -157,8 +162,9 @@ @${CP} ${WRKSRC}/changer.conf.chio ${WRKSRC}/changer.conf .if !defined(NO_AUTOKEY) && !defined(NO_DES) +PLIST_SRC+= pkg-plist.autokey pre-build: - @perl -le 'print( ( "a".."z", "A".."Z", "0".."9")[ map { rand( 62)} 0..( rand( 10)+10)])' >${WRKSRC}/cryptkey + @${PERL} -le 'print( ( "a".."z", "A".."Z", "0".."9")[ map { rand( 62)} 0..( rand( 10)+10)])' >${WRKSRC}/cryptkey .endif pre-install: @@ -168,7 +174,7 @@ @for docfile in $(AFBACKUP_DOCS:S/^/share\/doc\/${PORTNAME}\//); do ${ECHO_CMD} $$docfile >>${PLIST}; done .endif @for plistfile in ${PLIST_SRC}; do ${CAT} ${FILESDIR}/$$plistfile >>${PLIST}; done - @${CAT} ${PLIST} | perl -nle 'print unless $$lines{$$_}++' >${PLIST}.tmp + @${CAT} ${PLIST} | ${PERL} -nle 'print unless $$lines{$$_}++' >${PLIST}.tmp @${CAT} ${PLIST}.tmp ${FILESDIR}/pkg-plist.fixedorder >${PLIST} .if !defined(NOPORTDOCS) @${ECHO_CMD} @cwd ${PREFIX} >>${PLIST} @@ -177,7 +183,7 @@ @${SETENV} ${PKGINSTALL_ENV} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: -.if !defined(NO_AUTOKEY) +.if !defined(NO_AUTOKEY) && !defined(NO_DES) ${INSTALL} ${COPY} -o afbackup -g operator -m 0400 ${WRKSRC}/cryptkey ${PREFIX}/etc/afbackup .endif .if !defined(NOPORTDOCS) Index: files/pkg-plist.autokey =================================================================== RCS file: files/pkg-plist.autokey diff -N files/pkg-plist.autokey --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/pkg-plist.autokey 9 Sep 2005 10:44:35 -0000 @@ -0,0 +1 @@ +etc/afbackup/cryptkey Index: files/pkg-plist.fixedorder =================================================================== RCS file: /home/pcvs/ports/misc/afbackup/files/pkg-plist.fixedorder,v retrieving revision 1.1 diff -u -u -r1.1 pkg-plist.fixedorder --- files/pkg-plist.fixedorder 2 Oct 2001 16:24:54 -0000 1.1 +++ files/pkg-plist.fixedorder 9 Sep 2005 10:44:35 -0000 @@ -6,3 +6,4 @@ @dirrm share/afbackup/locale/de @dirrm share/afbackup/locale @dirrm share/afbackup +@dirrm etc/afbackup --- afbackup-3.3.5_3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: