diff options
| author | rillig <rillig@pkgsrc.org> | 2005-12-05 20:49:47 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2005-12-05 20:49:47 +0000 |
| commit | b71a1d488b6b45e0a968a4c149990c25b6a09215 (patch) | |
| tree | dac5b1dd14794d86b061d26b9503adb2552ed3f8 /misc/openoffice | |
| parent | 624eed58928f83676fbd7ca01a5f6974bb2cce2a (diff) | |
| download | pkgsrc-b71a1d488b6b45e0a968a4c149990c25b6a09215.tar.gz | |
Fixed pkglint warnings. The warnings are mostly quoting issues, for
example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some
other changes are outlined in
http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html
Diffstat (limited to 'misc/openoffice')
| -rw-r--r-- | misc/openoffice/Makefile | 8 | ||||
| -rw-r--r-- | misc/openoffice/Makefile.NetBSD.i386 | 2 | ||||
| -rw-r--r-- | misc/openoffice/Makefile.i18n | 10 |
3 files changed, 11 insertions, 9 deletions
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile index 084ce42ac34..5cceaa393e4 100644 --- a/misc/openoffice/Makefile +++ b/misc/openoffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.71 2005/10/03 16:03:19 mrauch Exp $ +# $NetBSD: Makefile,v 1.72 2005/12/05 20:50:40 rillig Exp $ DISTNAME= openoffice-1.1.5 CATEGORIES= misc @@ -21,7 +21,7 @@ BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip WRKSRC= ${WRKDIR}/OOo_1.1.5/config_office -GCC_REQD= 3.0 +GCC_REQD+= 3.0 USE_LANGUAGES+= c c++ .include "../../mk/bsd.prefs.mk" @@ -45,8 +45,8 @@ TEMP?= ${WRKDIR} UNLIMIT_RESOURCES+= datasize PLIST_SRC+= PLIST.common -PLIST_SUBST+= OPENOFFICE_DLLSUFFIX=${OPENOFFICE_DLLSUFFIX} -PLIST_SUBST+= OPENOFFICE_VERSION=${OPENOFFICE_VERSION} +PLIST_SUBST+= OPENOFFICE_DLLSUFFIX=${OPENOFFICE_DLLSUFFIX:Q} +PLIST_SUBST+= OPENOFFICE_VERSION=${OPENOFFICE_VERSION:Q} .if exists(${PKGDIR}/PLIST.${OPSYS}) PLIST_SRC+= ${PKGDIR}/PLIST.${OPSYS} . endif diff --git a/misc/openoffice/Makefile.NetBSD.i386 b/misc/openoffice/Makefile.NetBSD.i386 index 57882025c8c..d71b76d48a7 100644 --- a/misc/openoffice/Makefile.NetBSD.i386 +++ b/misc/openoffice/Makefile.NetBSD.i386 @@ -1,3 +1,5 @@ +# $NetBSD: Makefile.NetBSD.i386,v 1.2 2005/12/05 20:50:40 rillig Exp $ + OPENOFFICE_DLLSUFFIX= bi OPENOFFICE_OUTPATH= unxbsdi2 OPENOFFICE_SETFILE= NetBSDIntel diff --git a/misc/openoffice/Makefile.i18n b/misc/openoffice/Makefile.i18n index 28e6edbcc53..1cf4b196789 100644 --- a/misc/openoffice/Makefile.i18n +++ b/misc/openoffice/Makefile.i18n @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.i18n,v 1.4 2005/10/03 16:03:19 mrauch Exp $ +# $NetBSD: Makefile.i18n,v 1.5 2005/12/05 20:50:40 rillig Exp $ .if ${PKG_LANG:C/_.*//} == "afrikaans" OPENOFFICE_ISOCODE= af @@ -180,7 +180,7 @@ SITES_helpcontent_${OPENOFFICE_LANGCODE}_unix.tgz=${MASTER_SITE_OPENOFFICE:=cont .endif PLIST_SRC+= PLIST.i18n.${OPENOFFICE_LANGCODE} -PLIST_SUBST+= OPENOFFICE_ISOCODE=${OPENOFFICE_ISOCODE} -PLIST_SUBST+= OPENOFFICE_LANG=${OPENOFFICE_LANG} -PLIST_SUBST+= OPENOFFICE_LANGCODE=${OPENOFFICE_LANGCODE} -PLIST_SUBST+= OPENOFFICE_HELPCODE=${OPENOFFICE_HELPCODE} +PLIST_SUBST+= OPENOFFICE_ISOCODE=${OPENOFFICE_ISOCODE:Q} +PLIST_SUBST+= OPENOFFICE_LANG=${OPENOFFICE_LANG:Q} +PLIST_SUBST+= OPENOFFICE_LANGCODE=${OPENOFFICE_LANGCODE:Q} +PLIST_SUBST+= OPENOFFICE_HELPCODE=${OPENOFFICE_HELPCODE:Q} |