Skip site navigation (1)Skip section navigation (2)
Date:      Fri,  9 Sep 2005 18:46:24 +0800 (CST)
From:      Yen-Ming Lee <leeym@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        voland@catpipe.net
Subject:   ports/85903: [PATCH] misc/afbackup: [SUMMARIZE CHANGES]
Message-ID:  <20050909104624.03F86B29CE8@utopia.leeym.com>
Resent-Message-ID: <200509091050.j89AoCQ2063843@freefall.freebsd.org>

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

>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:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050909104624.03F86B29CE8>