summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukem <lukem@pkgsrc.org>2003-02-27 23:26:11 +0000
committerlukem <lukem@pkgsrc.org>2003-02-27 23:26:11 +0000
commit763977cd8d64a881fb849a30d4eef460944eb27b (patch)
tree101e8fdced6ff193a38b520c56f6e13373b17c67
parent6d3aaab08dd2d0120a272ff781fee580e9a05849 (diff)
downloadpkgsrc-763977cd8d64a881fb849a30d4eef460944eb27b.tar.gz
Use ${PATCH} with ${PATCH_ARGS}, so that the install procedure doesn't
get confused by $VERSION_CONTROL=t in my environment. (This problem happens *all the time* when people add ${PATCH} to pkg makefiles; maybe there should be a big "NOTE HERE" in the pkg documentation about this...)
-rw-r--r--misc/openoffice-linux/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/misc/openoffice-linux/Makefile b/misc/openoffice-linux/Makefile
index 469c9da9f77..7af8c0a80fa 100644
--- a/misc/openoffice-linux/Makefile
+++ b/misc/openoffice-linux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/02/27 22:04:08 mrauch Exp $
+# $NetBSD: Makefile,v 1.7 2003/02/27 23:26:11 lukem Exp $
DISTNAME= OOo_1.0.2_LinuxIntel_install
PKGNAME= openoffice-linux-1.0.2
@@ -62,7 +62,7 @@ do-install:
${SED} -e "s|@@PREFIX@@|${PREFIX}|g" \
< ${FILESDIR}/soffice > ${PREFIX}/bin/soffice
${CHMOD} +x ${PREFIX}/bin/soffice
- ${PATCH} -t -s ${PREFIX}/OpenOffice.org1.0.2/program/soffice \
+ ${PATCH} ${PATCH_ARGS} ${PREFIX}/OpenOffice.org1.0.2/program/soffice \
< ${FILESDIR}/soffice.test.patch
# everything specific to your OS/Arch goes into it's own Makefile