ports/75498: [MAINTAINER] comms/bforce-kst: fix removing dirs when port deinstalled

[Andrey Slusar]

>Number:         75498
>Category:       ports
>Synopsis:       [MAINTAINER] comms/bforce-kst: fix removing dirs when port deinstalled
>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:   Sun Dec 26 00:30:31 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Andrey Slusar
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
Santinel
>Environment:
System: FreeBSD santinel.home.ua 5.3-STABLE FreeBSD 5.3-STABLE #0: Tue Nov 30 13:06:39 EET 2004 anray at santinel.home.ua:/usr/obj/usr/src/sys/ANRAY i386
>Description:
	Fix removing ${PREFIX}/etc/fido dir when port deinstalled.
	Reported by pointyhat(via kris).
>How-To-Repeat:
	
>Fix:

--- bforce-kst.diff begins here ---
diff -ru /usr/ports/comms/bforce-kst/Makefile bforce-kst/Makefile
--- /usr/ports/comms/bforce-kst/Makefile	Sat Nov 20 22:35:43 2004
+++ bforce-kst/Makefile	Sun Dec 26 02:14:48 2004
@@ -21,8 +21,6 @@
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGDIR=	etc/fido/bforce
-
 CONTRIBS=	bfha/README bfha/bfha.pl bflan callout.sh outman timesync.tcl \
 		u-srif/conf/report.footer u-srif/conf/report.header u-srif/conf/u-srif.aliases \
 		u-srif/conf/u-srif.conf u-srif/conf/u-srif.dirs u-srif/lib/uconfig.py \
@@ -45,24 +43,23 @@
 		bforce/u_plock.c bfutil/bfindex.c
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
-PLIST_SUB+=	CONFIGDIR=${CONFIGDIR}
 
 pre-configure:
 	${MKDIR} ${WRKSRC}/bin
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,/etc/bforce,/${CONFIGDIR},g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's,/etc/bforce,/etc/fido/bforce,g' ${WRKSRC}/Makefile.in
 .for i in ${FIXME}
 	@${REINPLACE_CMD} -e 's,log(,bf_log(,g' ${WRKSRC}/${i}
 .endfor
 
 do-install:
-	${MKDIR} ${PREFIX}/${CONFIGDIR}
-	${INSTALL_DATA} ${WRKSRC}/../examples/bforce.conf ${PREFIX}/${CONFIGDIR}/bforce.conf.sample
-	${INSTALL_DATA} ${WRKSRC}/../examples/bforce.passwd ${PREFIX}/${CONFIGDIR}/bforce.passwd.sample
-	${INSTALL_DATA} ${WRKSRC}/../examples/bforce.subst ${PREFIX}/${CONFIGDIR}/bforce.subst.sample
-	${INSTALL_DATA} ${WRKSRC}/../examples/freq.aliases ${PREFIX}/${CONFIGDIR}/freq.aliases.sample
-	${INSTALL_DATA} ${WRKSRC}/../examples/freq.dirs ${PREFIX}/${CONFIGDIR}/freq.dirs.sample
+	${MKDIR} ${PREFIX}/etc/fido/bforce
+	${INSTALL_DATA} ${WRKSRC}/../examples/bforce.conf ${PREFIX}/etc/fido/bforce/bforce.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/../examples/bforce.passwd ${PREFIX}/etc/fido/bforce/bforce.passwd.sample
+	${INSTALL_DATA} ${WRKSRC}/../examples/bforce.subst ${PREFIX}/etc/fido/bforce/bforce.subst.sample
+	${INSTALL_DATA} ${WRKSRC}/../examples/freq.aliases ${PREFIX}/etc/fido/bforce/freq.aliases.sample
+	${INSTALL_DATA} ${WRKSRC}/../examples/freq.dirs ${PREFIX}/etc/fido/bforce/freq.dirs.sample
 
 	${MKDIR} ${DATADIR} ${DATADIR}/bfha ${DATADIR}/u-srif/conf ${DATADIR}/u-srif/lib
 .for i in ${CONTRIBS}
@@ -78,6 +75,6 @@
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/bfindex ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/bfstat ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/nlookup ${PREFIX}/bin
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|' -e 's|%%CONFIGDIR%%|${CONFIGDIR}|' ${PKGMESSAGE}
+	@${SED} -e 's|%%PREFIX%%|${PREFIX}|' -e 's|%%CONFIGDIR%%|etc/fido/bforce|' ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff -ru /usr/ports/comms/bforce-kst/pkg-plist bforce-kst/pkg-plist
--- /usr/ports/comms/bforce-kst/pkg-plist	Fri Jun  4 20:53:11 2004
+++ bforce-kst/pkg-plist	Sun Dec 26 02:14:12 2004
@@ -2,11 +2,11 @@
 bin/bfindex
 bin/bfstat
 bin/nlookup
-%%CONFIGDIR%%/bforce.conf.sample
-%%CONFIGDIR%%/bforce.passwd.sample
-%%CONFIGDIR%%/bforce.subst.sample
-%%CONFIGDIR%%/freq.aliases.sample
-%%CONFIGDIR%%/freq.dirs.sample
+etc/fido/bforce/bforce.conf.sample
+etc/fido/bforce/bforce.passwd.sample
+etc/fido/bforce/bforce.subst.sample
+etc/fido/bforce/freq.aliases.sample
+etc/fido/bforce/freq.dirs.sample
 %%DATADIR%%/bfha/README
 %%DATADIR%%/bfha/bfha.pl
 %%DATADIR%%/bflan
@@ -33,7 +33,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.kst
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm %%CONFIGDIR%%
+ at dirrm etc/fido/bforce
+ at dirrm etc/fido
 @dirrm %%DATADIR%%/u-srif/lib
 @dirrm %%DATADIR%%/u-srif/conf
 @dirrm %%DATADIR%%/u-srif
--- bforce-kst.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: