diff options
| author | rillig <rillig> | 2005-12-05 20:49:47 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2005-12-05 20:49:47 +0000 |
| commit | b4f920543059af038598712771c3211999ef42a6 (patch) | |
| tree | dac5b1dd14794d86b061d26b9503adb2552ed3f8 /misc | |
| parent | 5bf026ec112f405b514a2d69a72e10fa92c4c524 (diff) | |
| download | pkgsrc-b4f920543059af038598712771c3211999ef42a6.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')
64 files changed, 136 insertions, 147 deletions
diff --git a/misc/XFree86-dirs/dirs.mk b/misc/XFree86-dirs/dirs.mk index 194d5fa8a54..b37e3fbfd57 100644 --- a/misc/XFree86-dirs/dirs.mk +++ b/misc/XFree86-dirs/dirs.mk @@ -1,4 +1,4 @@ -# $NetBSD: dirs.mk,v 1.5 2005/06/04 11:20:22 jmmv Exp $ +# $NetBSD: dirs.mk,v 1.6 2005/12/05 20:50:38 rillig Exp $ # .if !defined(DIRS_XFREE86_MK) @@ -35,7 +35,6 @@ PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; } PRINT_PLIST_AWK+= /^@dirrm ${dir:S|/|\\/|g}$$/ \ { print "@comment in XFree86-dirs: "$$0; next; } . endfor -. undef dir .endif .endif # !defined(DIRS_XFREE86_MK) diff --git a/misc/XFree86-docs/Makefile b/misc/XFree86-docs/Makefile index ba8e025055e..4ff12d642db 100644 --- a/misc/XFree86-docs/Makefile +++ b/misc/XFree86-docs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/10/10 17:22:05 reed Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:38 rillig Exp $ DISTNAME= ${DISTFILES} PKGNAME= XFree86-docs-${XF_VER} @@ -10,7 +10,7 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.xfree86.org/ COMMENT= XFree86 Documentation -DEPENDS= XFree86-imake>=${XF_VER}:../../x11/XFree86-imake +DEPENDS+= XFree86-imake>=${XF_VER}:../../x11/XFree86-imake USE_LANGUAGES= # empty NO_XFREE86_TARGETS= yes diff --git a/misc/XFree86-man/Makefile b/misc/XFree86-man/Makefile index 3551452abc7..030082ebdd9 100644 --- a/misc/XFree86-man/Makefile +++ b/misc/XFree86-man/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/10/10 17:22:05 reed Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:38 rillig Exp $ DISTNAME= XFree86-${XF_VER}-src-1 PKGNAME= XFree86-man-${XF_VER} @@ -10,7 +10,7 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.xfree86.org/ COMMENT= XFree86 Manuals -DEPENDS= XFree86-imake>=${XF_VER}:../../x11/XFree86-imake +DEPENDS+= XFree86-imake>=${XF_VER}:../../x11/XFree86-imake USE_LANGUAGES= # empty NO_XFREE86_TARGETS= yes @@ -28,7 +28,6 @@ pre-configure: .for F in general X11 GL GL/gl GL/glx GLU GLw Xv Xau Xt Xext Xext/dbe Xi @${LN} -sf ${WRKSRC}/host.def ${WRKSRC}/${F}/ .endfor -.undef F do-configure: (cd ${WRKSRC} ; \ diff --git a/misc/asr-manpages/Makefile b/misc/asr-manpages/Makefile index f8afaf014f7..da32db02bc9 100644 --- a/misc/asr-manpages/Makefile +++ b/misc/asr-manpages/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/03/31 20:53:15 reed Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:38 rillig Exp $ # DISTNAME= asr.pages @@ -13,7 +13,7 @@ COMMENT= alt.sysadmin.recovery man page distribution NO_CONFIGURE= yes NO_BUILD= yes -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${PKGNAME_NOREV} INSTALLATION_DIRS= man/man1 man/man2 man/man3 man5 man/man8 do-install: diff --git a/misc/bbdb/Makefile b/misc/bbdb/Makefile index 5eeebed8d08..5475ec81f98 100644 --- a/misc/bbdb/Makefile +++ b/misc/bbdb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/08/28 04:25:30 uebayasi Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:38 rillig Exp $ # DISTNAME= bbdb-2.34 @@ -20,7 +20,7 @@ BUILD_TARGET= all mhe USE_MAKEINFO= yes INFO_FILES= bbdb.info INFO_DIR= ${INFODIR} -PLIST_SUBST+= INFODIR=${INFODIR} +PLIST_SUBST+= INFODIR=${INFODIR:Q} .include "../../mk/emacs.mk" diff --git a/misc/buffer/Makefile b/misc/buffer/Makefile index 2b258961ba5..5089537f50d 100644 --- a/misc/buffer/Makefile +++ b/misc/buffer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/03/24 21:12:57 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:38 rillig Exp $ DISTNAME= buffer-1.17 CATEGORIES= misc @@ -12,7 +12,7 @@ COMMENT= Buffer sporadic binary I/O for faster tape use .if ${OPSYS} == "SunOS" CPPFLAGS+= -DSYS5 -MAKE_ENV+= CC="${CC}" +MAKE_ENV+= CC=${CC:Q} .endif .include "../../mk/bsd.pkg.mk" diff --git a/misc/buffer/distinfo b/misc/buffer/distinfo index 924febe5302..0c5665195b9 100644 --- a/misc/buffer/distinfo +++ b/misc/buffer/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.5 2005/11/10 17:31:47 joerg Exp $ +$NetBSD: distinfo,v 1.6 2005/12/05 20:50:38 rillig Exp $ SHA1 (buffer-1.17.tar.gz) = 88201f677485880cd508430015b7ce7d9663b6e7 RMD160 (buffer-1.17.tar.gz) = c7f87873f8f74b900609ef495ebabc8596729fb8 Size (buffer-1.17.tar.gz) = 17131 bytes SHA1 (patch-aa) = 8b1a563728b6a67e49123e2c48d9d39d55a91476 SHA1 (patch-ab) = 70c28daab40f6c5ab2fae5d19fc0e98fdefbdf69 -SHA1 (patch-ac) = 53a3f7730e62a244109243b1262e26dd5687c223 +SHA1 (patch-ac) = 2edead52c6a79a04e11ddabef1e140ac24d7d379 diff --git a/misc/buffer/patches/patch-ac b/misc/buffer/patches/patch-ac index 91abd3fdd5f..86668613e7e 100644 --- a/misc/buffer/patches/patch-ac +++ b/misc/buffer/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.2 2005/08/27 20:43:40 minskim Exp $ +$NetBSD: patch-ac,v 1.3 2005/12/05 20:50:38 rillig Exp $ --- buffer.c.orig 1994-10-04 09:44:53.000000000 -0700 +++ buffer.c -@@ -118,6 +118,4 @@ static char *rcsid = "$Header: /a/swan/h +@@ -118,6 +118,4 @@ #endif -extern char *shmat(); diff --git a/misc/celestia-gnome/Makefile b/misc/celestia-gnome/Makefile index 26db4b3a3de..2527cb2824e 100644 --- a/misc/celestia-gnome/Makefile +++ b/misc/celestia-gnome/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.12 2005/09/04 05:00:36 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:38 rillig Exp $ PKGNAME= ${DISTNAME:S/-/-gnome-/} PKGREVISION= 2 COMMENT= GNOME frontend for free real-time 3D space simulator -DEPENDS= celestia-${CELESTIA_VERS}*:../../misc/celestia +DEPENDS+= celestia-${CELESTIA_VERS}*:../../misc/celestia CELESTIA_PROGPREFIX= g diff --git a/misc/celestia-gtk/Makefile b/misc/celestia-gtk/Makefile index abb193902c4..cfd368dd905 100644 --- a/misc/celestia-gtk/Makefile +++ b/misc/celestia-gtk/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.5 2005/09/04 05:00:36 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:38 rillig Exp $ PKGNAME= ${DISTNAME:S/-/-gtk-/} PKGREVISION= 1 COMMENT= GTK frontend for free real-time 3D space simulator -DEPENDS= celestia-${CELESTIA_VERS}*:../../misc/celestia +DEPENDS+= celestia-${CELESTIA_VERS}*:../../misc/celestia CONFIGURE_ARGS+= --with-gtk diff --git a/misc/celestia-kde/Makefile b/misc/celestia-kde/Makefile index 0fb8556ad90..6c6302e94bf 100644 --- a/misc/celestia-kde/Makefile +++ b/misc/celestia-kde/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.17 2005/09/28 14:31:08 rillig Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:38 rillig Exp $ PKGNAME= ${DISTNAME:S/-/-kde-/} PKGREVISION= 1 COMMENT= KDE frontend for free real-time 3D space simulator -DEPENDS= celestia-${CELESTIA_VERS}*:../../misc/celestia +DEPENDS+= celestia-${CELESTIA_VERS}*:../../misc/celestia CONFIGURE_ARGS+= --with-kde diff --git a/misc/celestia/Makefile.common b/misc/celestia/Makefile.common index f005ace56d8..80f40dda62e 100644 --- a/misc/celestia/Makefile.common +++ b/misc/celestia/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.19 2005/06/20 06:02:30 hira Exp $ +# $NetBSD: Makefile.common,v 1.20 2005/12/05 20:50:38 rillig Exp $ DISTNAME= celestia-${CELESTIA_VERS} CATEGORIES= misc x11 @@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --with-lua --with-glut CONFIGURE_ARGS+= --program-prefix=${CELESTIA_PROGPREFIX} .endif -GCC_REQD= 3.0 +GCC_REQD+= 3.0 CXXFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\"" diff --git a/misc/chipmunk/Makefile b/misc/chipmunk/Makefile index c79e6f1797e..94edb2f7f2f 100644 --- a/misc/chipmunk/Makefile +++ b/misc/chipmunk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/06/17 03:50:21 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:38 rillig Exp $ # DISTNAME= chipmunk-1.4 @@ -14,7 +14,7 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386 BUILD_TARGET= chipmunk -MAKE_ENV+= CONFIG_OPTIONS="${CPPFLAGS}" +MAKE_ENV+= CONFIG_OPTIONS=${CPPFLAGS:M*:Q} MAKE_ENV+= EXTRA_LIBS=-li386 INSTALLATION_DIRS= sbin diff --git a/misc/colorls/Makefile b/misc/colorls/Makefile index ec4e154f50d..bfb3eda38ed 100644 --- a/misc/colorls/Makefile +++ b/misc/colorls/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/08/26 22:31:49 reed Exp $ +# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:38 rillig Exp $ DISTNAME= ls PKGNAME= colorls-2.2 @@ -14,8 +14,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL MANCOMPRESSED_IF_MANZ= yes -MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} \ - MANOWN=${MANOWN} MANGRP=${MANGRP} +MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} \ + MANOWN=${MANOWN:Q} MANGRP=${MANGRP:Q} INSTALLATION_DIRS= bin man/man1 man/cat1 pre-patch: diff --git a/misc/dialog/Makefile b/misc/dialog/Makefile index ce5a9ebfb6d..ca4bda0ca9b 100644 --- a/misc/dialog/Makefile +++ b/misc/dialog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/11/08 13:25:12 joerg Exp $ +# $NetBSD: Makefile,v 1.31 2005/12/05 20:50:38 rillig Exp $ DISTNAME= dialog-1.0-20050911 PKGNAME= ${DISTNAME:C/-2/.2/} @@ -14,7 +14,7 @@ COMMENT= Display dialog boxes from shell scripts GNU_CONFIGURE= yes MAKEFILE= makefile -INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]* NetBSD-1.6[A-P]-* +INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-P]-* PKG_INSTALLATION_TYPES= overwrite pkgviews diff --git a/misc/dirdiff/Makefile b/misc/dirdiff/Makefile index 993733339e2..16e983a6204 100644 --- a/misc/dirdiff/Makefile +++ b/misc/dirdiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:34 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:38 rillig Exp $ # DISTNAME= dirdiff-1.6 @@ -6,7 +6,7 @@ PKGREVISION= 2 CATEGORIES= misc tk MASTER_SITES= http://samba.org/ftp/paulus/ -DEPENDS= tk>=8.3.4:../../x11/tk +DEPENDS+= tk>=8.3.4:../../x11/tk MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://samba.org/ftp/paulus/ diff --git a/misc/dotfile/Makefile b/misc/dotfile/Makefile index cda33e65d23..98e9d0b2769 100644 --- a/misc/dotfile/Makefile +++ b/misc/dotfile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/03/24 21:12:57 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:38 rillig Exp $ DISTNAME= dotfile-2.4.1 CATEGORIES= misc tk @@ -16,7 +16,7 @@ BUILD_DEFS+= DOTFILE_LANG DOTFILE_LANG?= english GNU_CONFIGURE= yes -NO_BUILD= +NO_BUILD= yes post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGNAME} diff --git a/misc/dpkg/Makefile b/misc/dpkg/Makefile index eae033b786d..d4bfbf80fff 100644 --- a/misc/dpkg/Makefile +++ b/misc/dpkg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:14 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:38 rillig Exp $ # DISTNAME= ${PKGNAME:S,-,_,} @@ -12,7 +12,7 @@ COMMENT= Package maintenance system for Debian BUILD_USES_MSGFMT= yes -WRKSRC= ${WRKDIR}/${PKGNAME} +WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes diff --git a/misc/dync/Makefile b/misc/dync/Makefile index 34cfd016792..b2b07b029b6 100644 --- a/misc/dync/Makefile +++ b/misc/dync/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/07/08 21:09:36 kristerw Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:38 rillig Exp $ # DISTNAME= dync-1.1 @@ -13,7 +13,7 @@ COMMENT= awk-like utility with C as language GNU_CONFIGURE= yes BUILD_TARGET= tst USE_TOOLS+= file_cmd -CONFIGURE_ENV+= FILE_CMD="${TOOLS_FILE_CMD}" -CONFIGURE_ENV+= ac_cv_path_LDCONFIG="${TOOLS_LDCONFIG}" +CONFIGURE_ENV+= FILE_CMD=${TOOLS_FILE_CMD:Q} +CONFIGURE_ENV+= ac_cv_path_LDCONFIG=${TOOLS_LDCONFIG:Q} .include "../../mk/bsd.pkg.mk" diff --git a/misc/edict/Makefile b/misc/edict/Makefile index 44888b6a62a..5ed63495f04 100644 --- a/misc/edict/Makefile +++ b/misc/edict/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/01/03 15:44:06 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:39 rillig Exp $ # DISTNAME= edict @@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR} DIST_SUBDIR= ${PKGNAME_NOREV} EXTRACT_ONLY= edict.gz -NO_BUILD= # nothing to do +NO_BUILD= yes do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/edict diff --git a/misc/elscreen/Makefile b/misc/elscreen/Makefile index 5deb5b9a90c..f890b835ce0 100644 --- a/misc/elscreen/Makefile +++ b/misc/elscreen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/08/28 04:25:30 uebayasi Exp $ +# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:39 rillig Exp $ # DISTNAME= elscreen-1.3.2 @@ -10,7 +10,7 @@ MAINTAINER= uebayasi@NetBSD.org HOMEPAGE= http://www.morishima.net/~naoto/j/software/elscreen/ COMMENT= Window manager within Emacs -NO_BUILD= # Defined +NO_BUILD= yes do-install: @${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/elscreen diff --git a/misc/fd/Makefile b/misc/fd/Makefile index dbb9a589129..48b52975a62 100644 --- a/misc/fd/Makefile +++ b/misc/fd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2002/11/10 00:35:08 grant Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:39 rillig Exp $ # DISTNAME= FD-1.03u @@ -10,7 +10,7 @@ MAINTAINER= nobu@psrc.isac.co.jp COMMENT= File and directory management tool MANLANG= ja -MAKE_ENV= LANG=${MANLANG} +MAKE_ENV+= LANG=${MANLANG:Q} DOCS= README FAQ HISTORY ToAdmin # require maintainer signature for binary package distributions diff --git a/misc/fooseti/Makefile b/misc/fooseti/Makefile index b79f9f07d6a..4cef548f8d5 100644 --- a/misc/fooseti/Makefile +++ b/misc/fooseti/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:05 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:39 rillig Exp $ # DISTNAME= fooseti-0.6.6 @@ -23,7 +23,6 @@ post-install: .for doc in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/${doc} ${PREFIX}/share/doc/fooseti .endfor -.undef doc .include "../../x11/gtk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/gnome1-dirs/dirs.mk b/misc/gnome1-dirs/dirs.mk index 9af11eb1742..0306076fee6 100644 --- a/misc/gnome1-dirs/dirs.mk +++ b/misc/gnome1-dirs/dirs.mk @@ -1,4 +1,4 @@ -# $NetBSD: dirs.mk,v 1.3 2005/06/04 11:20:22 jmmv Exp $ +# $NetBSD: dirs.mk,v 1.4 2005/12/05 20:50:39 rillig Exp $ # # This file is intended to be included by mk/dirs.mk, not directly by packages. # @@ -20,7 +20,6 @@ PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; } PRINT_PLIST_AWK+= /^@dirrm ${dir:S|/|\\/|g}$$/ \ { print "@comment in gnome1-dirs: " $$0; next; } . endfor -. undef dir .endif .endif # !defined(DIRS_GNOME1_MK) diff --git a/misc/gnome2-dirs/dirs.mk b/misc/gnome2-dirs/dirs.mk index 56b42bab779..597a1ea788a 100644 --- a/misc/gnome2-dirs/dirs.mk +++ b/misc/gnome2-dirs/dirs.mk @@ -1,4 +1,4 @@ -# $NetBSD: dirs.mk,v 1.3 2005/06/04 11:20:23 jmmv Exp $ +# $NetBSD: dirs.mk,v 1.4 2005/12/05 20:50:39 rillig Exp $ # # This file is intended to be included by mk/dirs.mk, not directly by packages. # @@ -25,7 +25,6 @@ PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; } PRINT_PLIST_AWK+= /^@dirrm ${dir:S|/|\\/|g}$$/ \ { print "@comment in gnome2-dirs: " $$0; next; } . endfor -. undef dir .endif .endif # !defined(DIRS_GNOME2_MK) diff --git a/misc/gnuls/Makefile b/misc/gnuls/Makefile index c962f276afb..4408d5efa7c 100644 --- a/misc/gnuls/Makefile +++ b/misc/gnuls/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/06/17 03:50:21 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:39 rillig Exp $ # DISTNAME= coreutils-5.2.1 @@ -16,7 +16,7 @@ CONFLICTS= coreutils-[0-9]* linuxls-[0-9]* GNU_CONFIGURE= YES -PLIST_SUBST+= GNU_PROGRAM_PREFIX="${GNU_PROGRAM_PREFIX}" +PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q} BUILD_DEFS+= GNU_PROGRAM_PREFIX INSTALLATION_DIRS= bin man/man1 diff --git a/misc/gone/Makefile b/misc/gone/Makefile index 3e405b08e5c..8af82f7d870 100644 --- a/misc/gone/Makefile +++ b/misc/gone/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/10/13 15:52:00 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:39 rillig Exp $ # DISTNAME= gone-1.3.5 @@ -10,6 +10,6 @@ HOMEPAGE= http://jaguar.ir.miami.edu/~marcus/ COMMENT= Terminal locking utility with many improvements over lock(1) GNU_CONFIGURE= yes -CONFIGURE_ENV= with_setuid=no +CONFIGURE_ENV+= with_setuid=no .include "../../mk/bsd.pkg.mk" diff --git a/misc/gperiodic/Makefile b/misc/gperiodic/Makefile index ceaf3703e64..d3c674091ad 100644 --- a/misc/gperiodic/Makefile +++ b/misc/gperiodic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/09/28 19:51:27 rillig Exp $ +# $NetBSD: Makefile,v 1.37 2005/12/05 20:50:39 rillig Exp $ DISTNAME= gperiodic-2.0.8 CATEGORIES= misc x11 @@ -19,11 +19,11 @@ BUILDLINK_TRANSFORM+= rm:-DGDK_DISABLE_DEPRECATED BUILDLINK_TRANSFORM+= rm:-DGDK_PIXBUF_DISABLE_DEPRECATED BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED -MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} +MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} BUILD_TARGET= gperiodic LIBS+= -lintl -MAKE_ENV+= LIBS=${LIBS:Q} +MAKE_ENV+= LIBS=${LIBS:M*:Q} .include "../../devel/gettext-lib/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/misc/heyu/Makefile b/misc/heyu/Makefile index 0a635b91a57..5732ef96987 100644 --- a/misc/heyu/Makefile +++ b/misc/heyu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/02/02 21:07:26 abs Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:39 rillig Exp $ # DISTNAME= x10_heyu @@ -15,7 +15,7 @@ DIST_SUBDIR= ${PKGNAME_NOREV} WRKSRC= ${WRKDIR}/heyu.dir CONFIGURE_SCRIPT= ./Configure -MAKE_ENV+= DEFAULT_SERIAL_DEVICE=${DEFAULT_SERIAL_DEVICE} +MAKE_ENV+= DEFAULT_SERIAL_DEVICE=${DEFAULT_SERIAL_DEVICE:Q} pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/heyu diff --git a/misc/iselect/Makefile b/misc/iselect/Makefile index fdf4a75e8aa..516abc230a4 100644 --- a/misc/iselect/Makefile +++ b/misc/iselect/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/09/28 19:51:27 rillig Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:39 rillig Exp $ # DISTNAME= iselect-1.2.0 @@ -13,7 +13,7 @@ COMMENT= Curses based Interactive Selection Tool GNU_CONFIGURE= yes post-configure: - touch ${WRKSRC}/config_ac.h.in + ${TOUCH} ${WRKSRC}/config_ac.h.in .include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/ja-man/Makefile b/misc/ja-man/Makefile index 131f7fea925..5f0e37b252c 100644 --- a/misc/ja-man/Makefile +++ b/misc/ja-man/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/07/15 18:27:52 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:39 rillig Exp $ DISTNAME= NetBSD1.3I-jman-19990531 PKGNAME= ja-man-19990531 @@ -9,12 +9,12 @@ MAINTAINER= sakamoto@NetBSD.org HOMEPAGE= ftp://ftp.spa.is.uec.ac.jp/pub/NetBSD/jman/index.html COMMENT= Japanese on-line manual pages of NetBSD -DEPENDS= ja-less>=332:../../misc/ja-less +DEPENDS+= ja-less>=332:../../misc/ja-less DEPENDS+= ja-groff-0.99:../../textproc/ja-groff JAMANDIR= ja_JP.EUC -PLIST_SUBST+= JAMANDIR=${JAMANDIR} -MAKE_ENV+= JAMANDIR=${JAMANDIR} +PLIST_SUBST+= JAMANDIR=${JAMANDIR:Q} +MAKE_ENV+= JAMANDIR=${JAMANDIR:Q} PLIST_SRC= ${WRKDIR}/PLIST diff --git a/misc/jhd/Makefile b/misc/jhd/Makefile index f0cded030ea..38dd7c41091 100644 --- a/misc/jhd/Makefile +++ b/misc/jhd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/06/17 03:50:21 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:39 rillig Exp $ DISTNAME= jhd-2.3 CATEGORIES= japanese misc @@ -7,7 +7,7 @@ MASTER_SITES= ftp://ftp.iamas.ac.jp/pub1/UNIX/File/ MAINTAINER= tech-pkg-ja@jp.NetBSD.org COMMENT= Japanese Hexadecimal Dump -BUILD_DEPENDS= nkf-1.7:../../converters/nkf +BUILD_DEPENDS+= nkf-1.7:../../converters/nkf INSTALLATION_DIRS= bin man/ja_JP.EUC/man1 diff --git a/misc/jitterbug/Makefile b/misc/jitterbug/Makefile index 27b879585be..9932f9f2a4b 100644 --- a/misc/jitterbug/Makefile +++ b/misc/jitterbug/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/02/09 09:17:50 wennmach Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:39 rillig Exp $ DISTNAME= jitterbug-1.6.2 PKGREVISION= 1 @@ -49,11 +49,11 @@ JB_FQHOSTNAME= ${JB_LONGNAME} JB_EMAIL?= ${JB_LOCALMAIL}@${JB_FQHOSTNAME} HAS_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} -MESSAGE_SUBST+= JB_USER=${JB_USER} \ - JB_PACKAGE=${JB_PACKAGE} \ - JB_LOCALMAIL=${JB_LOCALMAIL} +MESSAGE_SUBST+= JB_USER=${JB_USER:Q} \ + JB_PACKAGE=${JB_PACKAGE:Q} \ + JB_LOCALMAIL=${JB_LOCALMAIL:Q} pre-extract: @(if [ "X${JB_HOSTNAME}" = "X${JB_LONGNAME}" ]; then \ diff --git a/misc/kanjidic/Makefile b/misc/kanjidic/Makefile index f6be458ef93..90ad4340024 100644 --- a/misc/kanjidic/Makefile +++ b/misc/kanjidic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/08/17 11:10:56 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:39 rillig Exp $ # DISTNAME= kanjidic @@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR} DIST_SUBDIR= ${PKGNAME_NOREV} EXTRACT_ONLY= kanjidic.gz -NO_BUILD= # nothing to do +NO_BUILD= yes do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/kanjidic diff --git a/misc/kanjidic2/Makefile b/misc/kanjidic2/Makefile index c205ed2b2bc..f13a584d30c 100644 --- a/misc/kanjidic2/Makefile +++ b/misc/kanjidic2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/09/15 08:11:14 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:39 rillig Exp $ # DISTNAME= kanjidic2 @@ -23,7 +23,7 @@ DIST_SUBDIR= ${PKGNAME_NOREV} EXTRACT_ONLY= kanjidic2.xml.gz kanjidic2_dtd.gz kanjidic2_xsd.gz WRKSRC= ${WRKDIR} -NO_BUILD= # nothing to do +NO_BUILD= yes do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/kanjidic2 diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile index 2ffd52955af..39676778006 100644 --- a/misc/kdeutils3/Makefile +++ b/misc/kdeutils3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2005/04/11 21:46:35 tv Exp $ +# $NetBSD: Makefile,v 1.45 2005/12/05 20:50:39 rillig Exp $ DISTNAME= kdeutils-${_KDE_VERSION} COMMENT= Utilities for the KDE integrated X11 desktop @@ -12,7 +12,7 @@ USE_PKGINSTALL= YES # Ensure we export symbols in the linked shared object. LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} -MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}" +MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:Q} .if !empty(MACHINE_PLATFORM:MNetBSD-1.6*) || !empty(MACHINE_PLATFORM:MNetBSD-[2-9]*) CPPFLAGS+= -DARK_TAR="\"/usr/bin/tar\"" diff --git a/misc/kodos/Makefile b/misc/kodos/Makefile index 8198ffbdb2c..9189ac55240 100644 --- a/misc/kodos/Makefile +++ b/misc/kodos/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:35 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:39 rillig Exp $ DISTNAME= kodos-2.4.2 CATEGORIES= misc python @@ -8,7 +8,7 @@ MAINTAINER= recht@NetBSD.org HOMEPAGE= http://kodos.sourceforge.net/ COMMENT= GUI for creating, testing and debugging Python REs -DEPENDS= ${PYPKGPREFIX}-qt3-modules>=3.11:../../x11/py-qt3-modules +DEPENDS+= ${PYPKGPREFIX}-qt3-modules>=3.11:../../x11/py-qt3-modules DEPENDS+= ${PYPKGPREFIX}-qt3-sip>=4.0rc3:../../x11/py-qt3-sip PYDISTUTILSPKG= yes diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile index 8b162926063..81236553e46 100644 --- a/misc/koffice/Makefile +++ b/misc/koffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2005/11/25 21:23:15 wiz Exp $ +# $NetBSD: Makefile,v 1.68 2005/12/05 20:50:39 rillig Exp $ DISTNAME= koffice-1.4.2 PKGREVISION= 1 @@ -26,8 +26,8 @@ GCC_REQD+= 2.95.3 PTHREAD_OPTS+= require PYTHON_VERSIONS_ACCEPTED= 24 23 # needs shared library -CONFIGURE_ENV+= PYTHONDIR="${LOCALBASE}" -CONFIGURE_ENV+= PYVERSSUFFIX="${PYVERSSUFFIX}" +CONFIGURE_ENV+= PYTHONDIR=${LOCALBASE:Q} +CONFIGURE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} REPLACE_PERL+= lib/store/fix_storage.pl REPLACE_PERL+= admin/config.pl diff --git a/misc/kp/Makefile b/misc/kp/Makefile index 2401c2b19fe..a6d7c680b75 100644 --- a/misc/kp/Makefile +++ b/misc/kp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:05 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:40 rillig Exp $ DISTNAME= kp-0.96 CATEGORIES= misc tk @@ -7,7 +7,7 @@ MASTER_SITES= ftp://stampede.cs.berkeley.edu/pub/kp/ MAINTAINER= tech-pkg@NetBSD.org COMMENT= The Keyboard Practicer, touch-type training program -DEPENDS= tk>=8.3.2:../../x11/tk +DEPENDS+= tk>=8.3.2:../../x11/tk .include "../../mk/x11.buildlink3.mk" diff --git a/misc/lv/Makefile b/misc/lv/Makefile index ad17baeb86a..14e48701db4 100644 --- a/misc/lv/Makefile +++ b/misc/lv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/12/03 17:43:47 christos Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:40 rillig Exp $ DISTNAME= lv451 PKGNAME= lv-4.51 @@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/build GNU_CONFIGURE= yes CONFIGURE_SCRIPT= ../src/configure -MAKE_ENV+= LN=${LN} +MAKE_ENV+= LN=${LN:Q} INSTALLATION_DIRS= lib/lv .include "../../mk/bsd.pkg.mk" diff --git a/misc/most/Makefile b/misc/most/Makefile index 295227a69c4..65040f6e1f8 100644 --- a/misc/most/Makefile +++ b/misc/most/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/03/29 20:08:29 darcy Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:40 rillig Exp $ DISTNAME= most-4.9.0 CATEGORIES= misc @@ -10,7 +10,7 @@ HOMEPAGE= http://space.mit.edu/~davis/most.html COMMENT= Pager (like less) which has support for windows and binary files GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-x +CONFIGURE_ARGS+= --without-x .include "../../devel/libslang/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/open2300-mysql/Makefile b/misc/open2300-mysql/Makefile index 919be8fb329..a0375f256ce 100644 --- a/misc/open2300-mysql/Makefile +++ b/misc/open2300-mysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/07/31 14:03:28 grant Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:40 rillig Exp $ # PKGNAME= ${DISTNAME:S/-/-mysql-/} @@ -12,7 +12,7 @@ INSTALL_TARGET= install-mysql LIBS+= -lmysqlclient LIBS.SunOS+= -lnsl -lsocket -MAKE_ENV+= LIBS=${LIBS:Q} +MAKE_ENV+= LIBS=${LIBS:M*:Q} .include "../../mk/mysql.buildlink3.mk" -.include "../open2300/Makefile.common" +.include "../../misc/open2300/Makefile.common" diff --git a/misc/openoffice-bin/Makefile b/misc/openoffice-bin/Makefile index 3652c54f89c..efabd641b97 100644 --- a/misc/openoffice-bin/Makefile +++ b/misc/openoffice-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/10/10 20:08:09 mrauch Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:40 rillig Exp $ PKGNAME= openoffice-bin-${OO_VER} PKGREVISION= 1 @@ -16,7 +16,7 @@ HOMEPAGE= http://www.openoffice.org/ COMMENT= Integrated office productivity suite (binary pkg) OO_VER= 1.1.5 -PLIST_SUBST+= VER=${OO_VER} +PLIST_SUBST+= VER=${OO_VER:Q} MESSAGE_SUBST+= VER=${OO_VER} NO_BUILD= yes diff --git a/misc/openoffice-bin/Makefile.NetBSD.i386 b/misc/openoffice-bin/Makefile.NetBSD.i386 index c5bb082e77a..3ac367f747f 100644 --- a/misc/openoffice-bin/Makefile.NetBSD.i386 +++ b/misc/openoffice-bin/Makefile.NetBSD.i386 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.NetBSD.i386,v 1.2 2005/02/26 01:22:16 dmcmahill Exp $ +# $NetBSD: Makefile.NetBSD.i386,v 1.3 2005/12/05 20:50:40 rillig Exp $ DEPENDS+= suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat DEPENDS+= suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11 .if !exists(/emul/linux/proc/curproc/cmdline) && !exists(/proc/curproc/cmdline) -PKG_FAIL_REASON= "please mount /emul/linux/proc or /proc" +PKG_FAIL_REASON+= "please mount /emul/linux/proc or /proc" .endif .include "../../emulators/suse_linux/Makefile.application" 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} diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile index 9431ce177a1..0aab411a897 100644 --- a/misc/openoffice2-bin/Makefile +++ b/misc/openoffice2-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/11/01 13:26:43 mrauch Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:40 rillig Exp $ PKGNAME= openoffice-bin-2.0.0 PKGREVISION= 3 @@ -16,9 +16,9 @@ RPM2PKG= ${PREFIX}/sbin/rpm2pkg RPM2PKGARGS= -d ${PREFIX} -f ${WRKDIR}/PLIST.nouniq -s 1 OO_VER= 2.0 -PLIST_SUBST+= VER=${OO_VER} +PLIST_SUBST+= VER=${OO_VER:Q} MESSAGE_SUBST+= VER=${OO_VER} -FILES_SUBST+= VER=${OO_VER} +FILES_SUBST+= VER=${OO_VER:Q} NO_CONFIGURE= yes NO_BUILD= yes @@ -50,7 +50,7 @@ DEINSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL .if ${OPSYS} == "NetBSD" . if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" . if !exists(/emul/svr4/usr/lib/ld.so) -PKG_FAIL_REASON= '${PKGNAME} requires Solaris libraries - see compat_svr4(8)' +PKG_FAIL_REASON+= '${PKGNAME} requires Solaris libraries - see compat_svr4(8)' . endif DISTNAME= OOo_2.0.0_SolarisSparc_install WRKSRC= ${WRKDIR}/OOO680_m3_native_packed-1_en-US.8968/packages diff --git a/misc/p5-Msgcat/Makefile b/misc/p5-Msgcat/Makefile index 2812ab1ad63..11720bba4b9 100644 --- a/misc/p5-Msgcat/Makefile +++ b/misc/p5-Msgcat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/08/06 06:19:24 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:40 rillig Exp $ # DISTNAME= Msgcat-1.01 @@ -9,7 +9,6 @@ CATEGORIES= misc perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Locale/} MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= COMMENT= Perl5 module to use the message catalog functions WRKSRC= ${WRKDIR}/Msgcat diff --git a/misc/pdmenu/Makefile b/misc/pdmenu/Makefile index d8770052e16..b1489a8589d 100644 --- a/misc/pdmenu/Makefile +++ b/misc/pdmenu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/07/16 01:19:14 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:40 rillig Exp $ # DISTNAME= pdmenu_1.2.65 @@ -18,8 +18,8 @@ USE_TOOLS+= gmake perl:run REPLACE_PERL= examples/showdir.pl -CONFIGURE_ENV= SLANG_LIB_LOC="${BUILDLINK_PREFIX.libslang}/lib" \ - SLANG_H_LOC="${BUILDLINK_PREFIX.libslang}/include/slang.h" +CONFIGURE_ENV+= SLANG_LIB_LOC=${BUILDLINK_PREFIX.libslang:Q}/lib +CONFIGURE_ENV+= SLANG_H_LOC=${BUILDLINK_PREFIX.libslang:Q}/include/slang.h pre-install: ${SED} "s,.B /etc/pdmenurc,.B ${PREFIX}/etc/pdmenurc,g" \ diff --git a/misc/php-calendar/Makefile b/misc/php-calendar/Makefile index 6fb96aa540b..c3b60a620bf 100644 --- a/misc/php-calendar/Makefile +++ b/misc/php-calendar/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:39 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:40 rillig Exp $ MODNAME= calendar CATEGORIES+= misc -PKGREVISION= # empty COMMENT= PHP extension for calendar conversion support diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile index cf67949a192..a6d8a283314 100644 --- a/misc/pinfo/Makefile +++ b/misc/pinfo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/10/05 13:29:49 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:40 rillig Exp $ # DISTNAME= pinfo-0.6.1 @@ -18,7 +18,7 @@ USE_PKGINSTALL= yes INFO_FILES= pinfo.info -CPPFLAGS= -DDFLT_INFOPATH="\"/usr/share/info:${X11BASE}/info:${LOCALBASE}/info:/usr/local/info\"" +CPPFLAGS+= -DDFLT_INFOPATH="\"/usr/share/info:${X11BASE}/info:${LOCALBASE}/info:/usr/local/info\"" CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} diff --git a/misc/root/Makefile b/misc/root/Makefile index 23caf913ca7..cb188df11f2 100644 --- a/misc/root/Makefile +++ b/misc/root/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/06/17 03:50:22 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:40 rillig Exp $ DISTNAME= root_v2.23.08.source PKGNAME= root-2.23 @@ -16,7 +16,7 @@ BUILDLINK_PASSTHRU_DIRS=${PREFIX}/root/lib USE_TOOLS+= gmake BUILD_TARGET= netbsd -MAKE_ENV= LD_LIBRARY_PATH=${WRKDIR}/lib ROOTSYS=${WRKDIR} +MAKE_ENV+= LD_LIBRARY_PATH=${WRKDIR:Q}/lib ROOTSYS=${WRKDIR:Q} .if (${MACHINE_ARCH} == "arm") BROKEN= Compilation stops due to internal compiler error diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile index e325789a279..dbc5341c0f9 100644 --- a/misc/rpm/Makefile +++ b/misc/rpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2005/05/22 20:08:18 jlam Exp $ +# $NetBSD: Makefile,v 1.54 2005/12/05 20:50:40 rillig Exp $ DISTNAME= rpm-2.5.4 PKGREVISION= 3 @@ -26,10 +26,10 @@ INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL CONFIGURE_ARGS+= --datadir=${PREFIX}/${PKGLOCALEDIR} # The rpm databases are kept under ${RPM_DB_PREFIX}/lib/rpm. -CONFIGURE_ENV+= varprefix="${RPM_DB_PREFIX}" +CONFIGURE_ENV+= varprefix=${RPM_DB_PREFIX:Q} RPMDIR= ${RPM_DB_PREFIX}/lib/rpm -FILES_SUBST+= RPMDIR=${RPMDIR} +FILES_SUBST+= RPMDIR=${RPMDIR:Q} post-configure: cd ${WRKSRC}/po && ${MV} cz.po cs.po diff --git a/misc/tds/Makefile b/misc/tds/Makefile index 6315fad4da9..0b936223b91 100644 --- a/misc/tds/Makefile +++ b/misc/tds/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/07/16 01:19:15 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:40 rillig Exp $ # DISTNAME= tds-1.4.2 @@ -12,7 +12,7 @@ COMMENT= Web diary system USE_TOOLS+= perl:run GNU_CONFIGURE= YES -CONFIGURE_ENV+= PERL5="${PERL5}" +CONFIGURE_ENV+= PERL5=${PERL5:Q} NO_BUILD= YES diff --git a/misc/theme-dirs/dirs.mk b/misc/theme-dirs/dirs.mk index 246648cd5c6..0868626daef 100644 --- a/misc/theme-dirs/dirs.mk +++ b/misc/theme-dirs/dirs.mk @@ -1,4 +1,4 @@ -# $NetBSD: dirs.mk,v 1.4 2005/06/04 11:20:23 jmmv Exp $ +# $NetBSD: dirs.mk,v 1.5 2005/12/05 20:50:40 rillig Exp $ # # This file is intended to be included by mk/dirs.mk, not directly by packages. # @@ -43,7 +43,6 @@ PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; } PRINT_PLIST_AWK+= /^@dirrm ${dir:S|/|\\/|g}$$/ \ { print "@comment in theme-dirs: " $$0; next; } . endfor -. undef dir .endif .endif # !defined(DIRS_THEME_MK) diff --git a/misc/vfu/Makefile b/misc/vfu/Makefile index 3b8809d32d7..3b702b91933 100644 --- a/misc/vfu/Makefile +++ b/misc/vfu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/07/16 19:10:39 jlam Exp $ +# $NetBSD: Makefile,v 1.41 2005/12/05 20:50:41 rillig Exp $ # DISTNAME= vfu-3.04 @@ -15,7 +15,7 @@ USE_TOOLS+= perl:run USE_LANGUAGES= c c++ USE_PKGINSTALL= YES -INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]* +INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-* INCOMPAT_CURSES+= NetBSD-1.6[A-U]-* DOCDIR= ${PREFIX}/share/doc/vfu @@ -23,7 +23,7 @@ EGDIR= ${PREFIX}/share/examples/vfu CONF_FILES= ${EGDIR}/vfu.conf ${PKG_SYSCONFDIR}/vfu.conf -MAKE_ENV+= PKG_SYSCONFDIR="${PKG_SYSCONFDIR}" +MAKE_ENV+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} do-build: cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${SH} build.netbsd diff --git a/misc/xdg-dirs/dirs.mk b/misc/xdg-dirs/dirs.mk index 5867fba68c5..b403ac10a10 100644 --- a/misc/xdg-dirs/dirs.mk +++ b/misc/xdg-dirs/dirs.mk @@ -1,4 +1,4 @@ -# $NetBSD: dirs.mk,v 1.4 2005/06/04 11:20:23 jmmv Exp $ +# $NetBSD: dirs.mk,v 1.5 2005/12/05 20:50:41 rillig Exp $ # # This file is intended to be included by mk/dirs.mk, not directly by packages. # @@ -24,7 +24,6 @@ PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; } PRINT_PLIST_AWK+= /^@dirrm ${dir:S|/|\\/|g}$$/ \ { print "@comment in xdg-dirs: " $$0; next; } . endfor -. undef dir .endif .endif # !defined(DIRS_XDG_MK) diff --git a/misc/xdg-x11-dirs/dirs.mk b/misc/xdg-x11-dirs/dirs.mk index 6292373346f..f82a1128093 100644 --- a/misc/xdg-x11-dirs/dirs.mk +++ b/misc/xdg-x11-dirs/dirs.mk @@ -1,4 +1,4 @@ -# $NetBSD: dirs.mk,v 1.4 2005/06/04 11:20:23 jmmv Exp $ +# $NetBSD: dirs.mk,v 1.5 2005/12/05 20:50:41 rillig Exp $ # # This file is intended to be included by mk/dirs.mk, not directly by packages. # @@ -24,7 +24,6 @@ PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; } PRINT_PLIST_AWK+= /^@dirrm ${dir:S|/|\\/|g}$$/ \ { print "@comment in xdg-x11-dirs: " $$0; next; } . endfor -. undef dir .endif .endif # !defined(DIRS_XDG_X11_MK) diff --git a/misc/xorg-dirs/dirs.mk b/misc/xorg-dirs/dirs.mk index 9b9eedcdc5d..cf387bd3e8f 100644 --- a/misc/xorg-dirs/dirs.mk +++ b/misc/xorg-dirs/dirs.mk @@ -1,4 +1,4 @@ -# $NetBSD: dirs.mk,v 1.4 2005/06/04 11:20:23 jmmv Exp $ +# $NetBSD: dirs.mk,v 1.5 2005/12/05 20:50:41 rillig Exp $ # .if !defined(DIRS_XORG_MK) @@ -35,7 +35,6 @@ PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/${dir:S|/|\\/|g}$$/ { next; } PRINT_PLIST_AWK+= /^@dirrm ${dir:S|/|\\/|g}$$/ \ { print "@comment in xorg-dirs: "$$0; next; } . endfor -. undef dir .endif .endif # !defined(DIRS_XORG_MK) diff --git a/misc/xorg-docs/Makefile b/misc/xorg-docs/Makefile index 27e9bda837f..76dda663fae 100644 --- a/misc/xorg-docs/Makefile +++ b/misc/xorg-docs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/08/26 22:44:30 reed Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:41 rillig Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-docs-${XORG_VER} @@ -11,7 +11,7 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.x.org/ COMMENT= X.org Documentation -BUILD_DEPENDS= xorg-imake>=${XORG_VER}:../../x11/xorg-imake +BUILD_DEPENDS+= xorg-imake>=${XORG_VER}:../../x11/xorg-imake USE_LANGUAGES= # empty diff --git a/misc/xrolodex/Makefile b/misc/xrolodex/Makefile index 9c223a9522f..2805946258a 100644 --- a/misc/xrolodex/Makefile +++ b/misc/xrolodex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/09/28 19:51:28 rillig Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:41 rillig Exp $ DISTNAME= xrolodex.1.5.motif PKGNAME= xrolodex-1.5 @@ -13,7 +13,7 @@ COMMENT= Motif/X11 rolodex application WRKSRC= ${WRKDIR}/xrolodex.15 USE_IMAKE= yes -MAKE_ENV+= XMLIB="${MOTIFLIB}" +MAKE_ENV+= XMLIB=${MOTIFLIB:Q} .include "../../mk/motif.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/xtend/Makefile b/misc/xtend/Makefile index a1189c38f95..575f50ce963 100644 --- a/misc/xtend/Makefile +++ b/misc/xtend/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2004/02/07 10:39:39 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:41 rillig Exp $ # DISTNAME= xtend-1.2beta4 -PKGNAME= ${DISTNAME} CATEGORIES= misc MASTER_SITES= ftp://ftp.jabberwocky.com/pub/xtend/ diff --git a/misc/xtide/Makefile b/misc/xtide/Makefile index 218a1c34466..a5b8c409c10 100644 --- a/misc/xtide/Makefile +++ b/misc/xtide/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:05 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:41 rillig Exp $ DISTNAME= xtide-2.4 -PKGNAME= ${DISTNAME} PKGREVISION= 3 CATEGORIES= misc x11 MASTER_SITES= ftp://ftp.flaterco.com/xtide/ |