Attachment 115390 Details for Bug 157160 – file.diff

[patch] file.diff

file.diff (text/plain), 1.65 KB, created by Chris Rees on 2011-05-18 20:50:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Rees

Created: 2011-05-18 20:50:11 UTC

Size: 1.65 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /exports/cvsroot-freebsd/ports/security/amap/Makefile,v
>retrieving revision 1.18
>diff -u -r1.18 Makefile
>--- Makefile	7 Aug 2006 12:55:51 -0000	1.18
>+++ Makefile	18 May 2011 18:30:38 -0000
>@@ -29,7 +29,7 @@
> LOCAL_CONF_FILES=	appdefs.resp appdefs.rpc appdefs.trig
> 
> SUB_FILES=	pkg-install pkg-deinstall
>-SUB_LIST=	CONF_FILES="${LOCAL_CONF_FILES}" CONF_DIR="${CONF_DIR}"
>+SUB_LIST=	LOCAL_CONF_FILES="${LOCAL_CONF_FILES}" CONF_DIR="${CONF_DIR}"
> 
> post-patch:
> 	@${REINPLACE_CMD} -e \
>Index: files/pkg-deinstall.in
>===================================================================
>RCS file: /exports/cvsroot-freebsd/ports/security/amap/files/pkg-deinstall.in,v
>retrieving revision 1.1
>diff -u -r1.1 pkg-deinstall.in
>--- files/pkg-deinstall.in	22 May 2005 15:16:46 -0000	1.1
>+++ files/pkg-deinstall.in	18 May 2011 18:31:39 -0000
>@@ -2,7 +2,7 @@
> 
> [ "$2" != "DEINSTALL" ] && exit 0
> 
>-for f in %%CONF_FILES%%; do
>+for f in %%LOCAL_CONF_FILES%%; do
>     if cmp -s "%%CONF_DIR%%/$f" "%%CONF_DIR%%/$f.default"; then
> 	rm -f "%%CONF_DIR%%/$f"
>     fi
>Index: files/pkg-install.in
>===================================================================
>RCS file: /exports/cvsroot-freebsd/ports/security/amap/files/pkg-install.in,v
>retrieving revision 1.1
>diff -u -r1.1 pkg-install.in
>--- files/pkg-install.in	22 May 2005 15:16:46 -0000	1.1
>+++ files/pkg-install.in	18 May 2011 18:31:04 -0000
>@@ -2,6 +2,6 @@
> 
> [ "$2" != "POST-INSTALL" ] && exit 0
> 
>-for f in %%CONF_FILES%%; do
>+for f in %%LOCAL_CONF_FILES%%; do
>     [ -f "%%CONF_DIR%%/$f" ] || cp -p "%%CONF_DIR%%/$f.default" "%%CONF_DIR%%/$f"
> done

Actions: View | Diff

Attachments on bug 157160: 115390