pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/misc/openoffice2-bin Check defined() before empty() to...
details: https://anonhg.NetBSD.org/pkgsrc/rev/a19f739017f2
branches: trunk
changeset: 501701:a19f739017f2
user: tv <tv%pkgsrc.org@localhost>
date: Wed Oct 26 11:56:12 2005 +0000
description:
Check defined() before empty() to satisfy older NetBSD make / bmake.
diffstat:
misc/openoffice2-bin/Makefile | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diffs (18 lines):
diff -r 178b60c5c540 -r a19f739017f2 misc/openoffice2-bin/Makefile
--- a/misc/openoffice2-bin/Makefile Wed Oct 26 11:45:30 2005 +0000
+++ b/misc/openoffice2-bin/Makefile Wed Oct 26 11:56:12 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/10/23 14:38:30 mrauch Exp $
+# $NetBSD: Makefile,v 1.7 2005/10/26 11:56:12 tv Exp $
PKGNAME= openoffice-bin-2.0.0
PKGREVISION= 1
@@ -93,7 +93,7 @@
${RM} -f ${WRKDIR}/PLIST.nouniq
${RPM2PKG} ${RPM2PKGARGS} ${WRKSRC}/*.rpm
uniq ${WRKDIR}/PLIST.nouniq >${WRKDIR}/PLIST
-.if !empty(PKG_JVM)
+.if defined(PKG_JVM) && !empty(PKG_JVM)
${RM} -f ${PREFIX}/bin/soffice
${SED} -e "s|@@PREFIX@@|${PREFIX}|g" -e "s|@@OO_VER@@|${OO_VER}|g" \
-e "s|@@JAVA_HOME@@|${PKG_JAVA_HOME}|g" \
Home |
Main Index |
Thread Index |
Old Index