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 /sysutils | |
| 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 'sysutils')
68 files changed, 178 insertions, 184 deletions
diff --git a/sysutils/855resolution/Makefile b/sysutils/855resolution/Makefile index 03be96b380e..7f6cc3eea79 100644 --- a/sysutils/855resolution/Makefile +++ b/sysutils/855resolution/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/10/20 10:06:46 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:59 rillig Exp $ # DISTNAME= 855resolution-0.4 @@ -13,6 +13,6 @@ COMMENT= BIOS VESA resolution utility for 855/865/915 Intel chips ONLY_FOR_PLATFORM= NetBSD-*-i386 WRKSRC= ${WRKDIR}/855resolution -USE_TOOLS= gmake +USE_TOOLS+= gmake .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common index b67aa632eaf..b833cd4cbed 100644 --- a/sysutils/amanda-common/Makefile.common +++ b/sysutils/amanda-common/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.17 2005/08/02 09:26:06 seb Exp $ +# $NetBSD: Makefile.common,v 1.18 2005/12/05 20:50:59 rillig Exp $ # # common make file fragment shared by all amanda-* pkgs. # @@ -29,8 +29,8 @@ USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/config/ltconfig USE_TOOLS+= gzip:run gtar:run -CONFIGURE_ENV+= ac_cv_path_GZIP=${TOOLS_GZIP_CMD} -CONFIGURE_ENV+= GNUTAR=${TOOLS_GTAR} +CONFIGURE_ENV+= ac_cv_path_GZIP=${TOOLS_GZIP_CMD:Q} +CONFIGURE_ENV+= GNUTAR=${TOOLS_GTAR:Q} TOOLS_DEPENDS.gtar= {gtar,gtar-base}>=1.12:../../archivers/gtar-base GNU_CONFIGURE= yes diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile index 80bc17f5878..193e1a117ab 100644 --- a/sysutils/apcupsd/Makefile +++ b/sysutils/apcupsd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2005/08/19 18:12:38 jlam Exp $ +# $NetBSD: Makefile,v 1.39 2005/12/05 20:50:59 rillig Exp $ DISTNAME= apcupsd-3.8.6 PKGREVISION= 4 @@ -35,7 +35,7 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} # this breaks .in files that uses @sbindir@ CONFIGURE_ARGS+= --sbindir=${PREFIX}/sbin -CONFIGURE_ENV+= SCRIPTSHELL="${TOOLS_SH}" +CONFIGURE_ENV+= SCRIPTSHELL=${TOOLS_SH:Q} EGDIR= ${PREFIX}/share/examples/apcupsd diff --git a/sysutils/aperture/Makefile b/sysutils/aperture/Makefile index 0d9734136ea..7eb32d1475b 100644 --- a/sysutils/aperture/Makefile +++ b/sysutils/aperture/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2004/12/03 15:15:09 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2005/12/05 20:50:59 rillig Exp $ DISTNAME= apNetBSD PKGNAME= aperture-2.0 @@ -26,12 +26,12 @@ NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL WRKSRC= ${WRKDIR} BUILD_TARGET= cleandir depend all -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${PKGNAME_NOREV}nb5 INSTALL_TARGET= dirs includes install MANCOMPRESSED_IF_MANZ= YES NO_CONFIGURE= YES OSVERSION_SPECIFIC= YES -MAKE_ENV+= BSDSRCDIR="${BSDSRCDIR}" +MAKE_ENV+= BSDSRCDIR=${BSDSRCDIR:Q} .include "../../mk/bsd.prefs.mk" diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile index 478be3c9eeb..7e1c451dbca 100644 --- a/sysutils/asapm/Makefile +++ b/sysutils/asapm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/06/01 18:03:21 jlam Exp $ +# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:59 rillig Exp $ # DISTNAME= asapm-2.11 @@ -13,7 +13,7 @@ HOMEPAGE= http://www.tigr.net/afterstep/detail.pl?applet=asapm COMMENT= Laptop battery status display for X11 .if !exists(/usr/include/machine/apmvar.h) -PKG_SKIP_REASON= "APM is not available for ${MACHINE_PLATFORM}" +PKG_SKIP_REASON+= "APM is not available for ${MACHINE_PLATFORM}" .endif GNU_CONFIGURE= YES diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile index 35c4d5d4488..84aa436c156 100644 --- a/sysutils/bacula/Makefile +++ b/sysutils/bacula/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.8 2005/11/22 19:33:06 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:59 rillig Exp $ CONFLICTS+= bacula-client-[0-9]* .include "options.mk" -PLIST_SUBST+= BACULA_DB=${BACULA_DB} +PLIST_SUBST+= BACULA_DB=${BACULA_DB:Q} MESSAGE_SUBST+= PREFIX=${PREFIX} MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV} diff --git a/sysutils/bacula/Makefile.common b/sysutils/bacula/Makefile.common index 724d8046b50..d6b97b18cfc 100644 --- a/sysutils/bacula/Makefile.common +++ b/sysutils/bacula/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.17 2005/11/22 18:35:25 wiz Exp $ +# $NetBSD: Makefile.common,v 1.18 2005/12/05 20:50:59 rillig Exp $ DISTNAME= bacula-1.38.1 CATEGORIES= sysutils @@ -24,11 +24,11 @@ BACULA_WORKINGDIR?= ${VARBASE}/spool/bacula OWN_DIRS_PERMS+= ${BACULA_WORKINGDIR} root ${BACULA_GROUP} 770 -FILES_SUBST+= BACULA_ETCDIR=${PKG_SYSCONFDIR} -FILES_SUBST+= BACULA_PIDDIR=${BACULA_PIDDIR} -FILES_SUBST+= BACULA_GROUP=${BACULA_GROUP} -FILES_SUBST+= BACULA_DIR_USER=${BACULA_DIR_USER} -FILES_SUBST+= BACULA_SD_USER=${BACULA_SD_USER} +FILES_SUBST+= BACULA_ETCDIR=${PKG_SYSCONFDIR:Q} +FILES_SUBST+= BACULA_PIDDIR=${BACULA_PIDDIR:Q} +FILES_SUBST+= BACULA_GROUP=${BACULA_GROUP:Q} +FILES_SUBST+= BACULA_DIR_USER=${BACULA_DIR_USER:Q} +FILES_SUBST+= BACULA_SD_USER=${BACULA_SD_USER:Q} CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-scriptdir=${PREFIX}/libexec/bacula diff --git a/sysutils/bacula/hacks.mk b/sysutils/bacula/hacks.mk index 93f891dd808..04c94415455 100644 --- a/sysutils/bacula/hacks.mk +++ b/sysutils/bacula/hacks.mk @@ -1,6 +1,6 @@ -# $NetBSD: hacks.mk,v 1.1 2005/11/22 18:35:25 wiz Exp $ +# $NetBSD: hacks.mk,v 1.2 2005/12/05 20:50:59 rillig Exp $ -.ifndef BACULA_HACKS_MK +.if !defined(BACULA_HACKS_MK) BACULA_HACKS_MK= #defined ### gcc 4.0* has been reported to produce bad code on amd64 diff --git a/sysutils/bchunk/Makefile b/sysutils/bchunk/Makefile index 9b9faa39314..26eac4da69a 100644 --- a/sysutils/bchunk/Makefile +++ b/sysutils/bchunk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/06/17 03:50:33 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:59 rillig Exp $ DISTNAME= bchunk-1.1.1 CATEGORIES= sysutils @@ -8,7 +8,7 @@ MAINTAINER= pooka@NetBSD.org HOMEPAGE= http://hes.iki.fi/bchunk/ COMMENT= ".bin/.cue" CD image converter -MAKE_FLAGS+= CC="${CC}" LD="${CC}" CFLAGS="${CFLAGS}" +MAKE_FLAGS+= CC=${CC:Q} LD=${CC:Q} CFLAGS=${CFLAGS:M*:Q} INSTALLATION_DIRS= bin man/man1 diff --git a/sysutils/bkpupsd/Makefile b/sysutils/bkpupsd/Makefile index b733ca29796..34db5c2fe04 100644 --- a/sysutils/bkpupsd/Makefile +++ b/sysutils/bkpupsd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:47:22 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:59 rillig Exp $ # DISTNAME= bkpupsd-2.1.2 @@ -20,8 +20,8 @@ USE_PKGINSTALL= YES .include "../../mk/bsd.prefs.mk" DOCDIR= ${PREFIX}/share/doc/bkpupsd -MAKE_ENV+= DEFAULT_DEVICE=${DEFAULT_SERIAL_DEVICE} DOCDIR=${DOCDIR} \ - RCD_SCRIPTS_EXAMPLEDIR=${RCD_SCRIPTS_EXAMPLEDIR} +MAKE_ENV+= DEFAULT_DEVICE=${DEFAULT_SERIAL_DEVICE:Q} DOCDIR=${DOCDIR:Q} \ + RCD_SCRIPTS_EXAMPLEDIR=${RCD_SCRIPTS_EXAMPLEDIR:Q} MESSAGE_SUBST+= DOCDIR=${DOCDIR} diff --git a/sysutils/ccze/Makefile b/sysutils/ccze/Makefile index 113b59f20ac..3610153151a 100644 --- a/sysutils/ccze/Makefile +++ b/sysutils/ccze/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:31 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:59 rillig Exp $ DISTNAME= ccze-0.2.1 CATEGORIES= sysutils @@ -8,7 +8,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://bonehunter.rulez.org/software/ccze/ COMMENT= Log coloriser, fast and light on resources -INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6* +INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6*-* PKG_INSTALLATION_TYPES= overwrite pkgviews diff --git a/sysutils/cdbkup/Makefile b/sysutils/cdbkup/Makefile index 69bf3bf3250..4a596434383 100644 --- a/sysutils/cdbkup/Makefile +++ b/sysutils/cdbkup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:20 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:59 rillig Exp $ DISTNAME= cdbkup-1.0 PKGREVISION= 3 @@ -17,9 +17,9 @@ DEPENDS+= cdrecord>=1.10:../../sysutils/cdrecord GNU_CONFIGURE= YES USE_TOOLS+= cat date gtar perl:run -CONFIGURE_ENV+= CAT="${TOOLS_CAT}" -CONFIGURE_ENV+= DATE="${TOOLS_DATE}" -CONFIGURE_ENV+= GNUTAR="${TOOLS_TAR}" +CONFIGURE_ENV+= CAT=${TOOLS_CAT:Q} +CONFIGURE_ENV+= DATE=${TOOLS_DATE:Q} +CONFIGURE_ENV+= GNUTAR=${TOOLS_TAR:Q} .if (${OPSYS} == SunOS) CDBKUP_SNARDIR?= /var/${PKGBASE} @@ -31,8 +31,8 @@ CDBKUP_DUMPGRP?= operator CONFIGURE_ARGS+= --with-snardir=${CDBKUP_SNARDIR} \ --with-dumpgrp=${CDBKUP_DUMPGRP} -PLIST_SUBST+= CDBKUP_SNARDIR=${CDBKUP_SNARDIR} \ - CDBKUP_DUMPGRP=${CDBKUP_DUMPGRP} \ - INSTALL=${INSTALL} RMDIR=${RMDIR} TRUE=${TRUE} +PLIST_SUBST+= CDBKUP_SNARDIR=${CDBKUP_SNARDIR:Q} \ + CDBKUP_DUMPGRP=${CDBKUP_DUMPGRP:Q} \ + INSTALL=${INSTALL:Q} RMDIR=${RMDIR:Q} TRUE=${TRUE:Q} .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/cdrecord-xcdroast/Makefile b/sysutils/cdrecord-xcdroast/Makefile index 7eccc45e19f..a63e0838b04 100644 --- a/sysutils/cdrecord-xcdroast/Makefile +++ b/sysutils/cdrecord-xcdroast/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:31 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:59 rillig Exp $ DISTNAME= cdrtools-2.01a21 PKGNAME= cdrecord-xcdroast-0.98a15.2.01a21 @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME:C/a.*//} USE_TOOLS+= gmake .if ${LOCALBASE} != "/opt/schily" -BUILDLINK_TRANSFORM= rmdir:/opt/schily +BUILDLINK_TRANSFORM+= rmdir:/opt/schily .endif # avoid picking up a bad ${ARCH} during the build diff --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile index 9e5f87b65f7..b0c40435cc4 100644 --- a/sysutils/cdrecord/Makefile +++ b/sysutils/cdrecord/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2005/05/22 21:04:42 jlam Exp $ +# $NetBSD: Makefile,v 1.68 2005/12/05 20:50:59 rillig Exp $ DISTNAME= cdrtools-2.00.3 PKGNAME= cdrecord-2.00.3 @@ -21,8 +21,8 @@ USE_TOOLS+= gmake tbl # avoid picking up a bad ${ARCH} during the build MAKE_ENV+= ARCH="" MAKE_ENV+= MAKEPROG="gmake" -MAKE_ENV+= COPTX="${CFLAGS}" -MAKE_ENV+= LDOPTX="${LDFLAGS}" +MAKE_ENV+= COPTX=${CFLAGS:M*:Q} +MAKE_ENV+= LDOPTX=${LDFLAGS:M*:Q} # if we're using a gcc which is named gcc, we need to set CCOM=gcc # in MAKE_ENV so the make infrastructure picks the right options. @@ -80,7 +80,7 @@ do-install: ${INSTALL_PROGRAM} OBJ/*/readcd ${PREFIX}/bin; \ ${INSTALL_MAN} readcd.1 ${PREFIX}/man/man1 -SUBST_CLASSES= fix +SUBST_CLASSES+= fix SUBST_STAGE.fix= post-patch SUBST_FILES.fix= cdrecord/defaults.c cdrecord/cdrecord.1 \ readcd/readcd.1 diff --git a/sysutils/cdrtools-ossdvd/Makefile b/sysutils/cdrtools-ossdvd/Makefile index f3a03554272..7b27a629893 100644 --- a/sysutils/cdrtools-ossdvd/Makefile +++ b/sysutils/cdrtools-ossdvd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/06/24 21:47:57 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:59 rillig Exp $ DISTNAME= cdrtools-2.01.01a01 PKGNAME= cdrtools-ossdvd-2.01.1.34 @@ -29,8 +29,8 @@ BUILDLINK_TRANSFORM+= rmdir:/opt/schily # avoid picking up a bad ${ARCH} during the build MAKE_ENV+= ARCH="" MAKE_ENV+= MAKEPROG="gmake" -MAKE_ENV+= COPTX="${CFLAGS}" -MAKE_ENV+= LDOPTX="${LDFLAGS}" +MAKE_ENV+= COPTX=${CFLAGS:M*:Q} +MAKE_ENV+= LDOPTX=${LDFLAGS:M*:Q} # if we're using a gcc which is named gcc, we need to set CCOM=gcc # in MAKE_ENV so the make infrastructure picks the right options. diff --git a/sysutils/coreutils/MESSAGE.gsu b/sysutils/coreutils/MESSAGE.gsu index 540e676f2a6..5540153ccec 100644 --- a/sysutils/coreutils/MESSAGE.gsu +++ b/sysutils/coreutils/MESSAGE.gsu @@ -1,7 +1,7 @@ =========================================================================== -$NetBSD: MESSAGE.gsu,v 1.1 2004/01/17 00:14:14 recht Exp $ +$NetBSD: MESSAGE.gsu,v 1.2 2005/12/05 20:50:59 rillig Exp $ -The GNU ${PKGNAME} version of su doesn't support the wheel group. +The GNU ${PKGNAME} version of su doesn't support the wheel group. Because of that it is installed without the setuid bit on ${OPSYS}. =========================================================================== diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile index c4d6cbe280a..0bb9587b8df 100644 --- a/sysutils/coreutils/Makefile +++ b/sysutils/coreutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/08/28 09:07:21 tron Exp $ +# $NetBSD: Makefile,v 1.29 2005/12/05 20:50:59 rillig Exp $ DISTNAME= coreutils-5.2.1 PKGREVISION= 1 @@ -39,7 +39,7 @@ PLIST_SUBST+= COREUTILS_HAVE_HOSTID="@comment " PLIST_SUBST+= COREUTILS_HAVE_HOSTID="" .endif -CONFIGURE_ARGS= --program-prefix=${GNU_PROGRAM_PREFIX} +CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX:Q} # if GNU_PROGRAM_PREFIX == 'g' # devel/id-utils installs a 'gid' program, so conflict with it # databases/geneweb a 'gwc' program, so conflict with it @@ -55,7 +55,7 @@ CONFLICTS+= graphviz-[0-9]* CONFLICTS+= teTeX-bin<3 .endif -PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX} +PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q} BUILD_DEFS+= GNU_PROGRAM_PREFIX .if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || \ diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile index 2a100718678..4eaa7a7f0cb 100644 --- a/sysutils/daemontools/Makefile +++ b/sysutils/daemontools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/05/17 08:41:36 schmonz Exp $ +# $NetBSD: Makefile,v 1.24 2005/12/05 20:51:00 rillig Exp $ DISTNAME= daemontools-0.76 CATEGORIES= sysutils @@ -26,7 +26,7 @@ SAMPLERC= svscan.sh.sample SERVICEDIR?= ${VARBASE}/spool/service CMDDIR= ${WRKSRC}/command -PLIST_SUBST+= SERVICEDIR=${SERVICEDIR} +PLIST_SUBST+= SERVICEDIR=${SERVICEDIR:Q} DEINSTALL_FILE= ${WRKDIR}/.DEINSTALL INSTALLATION_DIRS= bin man man/man8 share/examples/daemontools diff --git a/sysutils/dbus/Makefile.common b/sysutils/dbus/Makefile.common index 9cdcfd5cfdd..ffc4acd8b69 100644 --- a/sysutils/dbus/Makefile.common +++ b/sysutils/dbus/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2005/08/10 20:56:23 jlam Exp $ +# $NetBSD: Makefile.common,v 1.9 2005/12/05 20:51:00 rillig Exp $ # # XXX Do not update to 0.30 or above yet. The API in the 0.2x series is @@ -72,7 +72,6 @@ BUILD_DIRS+= ${WRKSRC}/${f} INSTALL_DIRS+= ${WRKSRC}/${f} SUBST_FILES.paths+= ${f}/Makefile.in . endfor -. undef f BUILDLINK_DEPENDS.dbus+= dbus>=${DBUS_VERSION} . include "../../sysutils/dbus/buildlink3.mk" diff --git a/sysutils/depot/Makefile b/sysutils/depot/Makefile index c536188ba09..e403ded3938 100644 --- a/sysutils/depot/Makefile +++ b/sysutils/depot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2003/09/19 23:08:29 dent Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:51:00 rillig Exp $ # DISTNAME= depot-5.14 @@ -10,8 +10,8 @@ HOMEPAGE= http://asg.web.cmu.edu/depot/ COMMENT= Maps several separate packages into a tree without merging them GNU_CONFIGURE= yes -CONFIGURE_ENV+= INSTALL="" CC="${CC}" -MAKE_ENV+= CC="${CC}" +CONFIGURE_ENV+= INSTALL="" CC=${CC:Q} +MAKE_ENV+= CC=${CC:Q} do-install: @cd ${WRKSRC}/src/cmd && ${MAKE} DESTDIR=${PREFIX} install diff --git a/sysutils/dmidecode/distinfo b/sysutils/dmidecode/distinfo index 4d93e5530b3..e6eeb9a1d64 100644 --- a/sysutils/dmidecode/distinfo +++ b/sysutils/dmidecode/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2005/10/29 15:32:04 reed Exp $ +$NetBSD: distinfo,v 1.5 2005/12/05 20:51:00 rillig Exp $ SHA1 (dmidecode-2.7.tar.gz) = 394cd6e4535a4676d2d464a44cf8c86f25df1d83 RMD160 (dmidecode-2.7.tar.gz) = 53296b5dcc5301bb31860851d4ce58a0ce024096 Size (dmidecode-2.7.tar.gz) = 52536 bytes -SHA1 (patch-aa) = 77aba3987226a2db2d2391d76b536f50d87e0a23 +SHA1 (patch-aa) = df099cd7fa47251280fa3be56e3e8ad2de3d8d4a diff --git a/sysutils/dmidecode/patches/patch-aa b/sysutils/dmidecode/patches/patch-aa index e0893dda6c3..a79fb5c3480 100644 --- a/sysutils/dmidecode/patches/patch-aa +++ b/sysutils/dmidecode/patches/patch-aa @@ -1,3 +1,5 @@ +$NetBSD: patch-aa,v 1.3 2005/12/05 20:51:00 rillig Exp $ + --- Makefile.orig 2005-10-28 20:13:08.000000000 -0700 +++ Makefile 2005-10-28 20:14:28.000000000 -0700 @@ -22,9 +22,9 @@ diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile index 1168dba97fc..63754235450 100644 --- a/sysutils/duplicity/Makefile +++ b/sysutils/duplicity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:23 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:51:00 rillig Exp $ # DISTNAME= duplicity-0.4.1 @@ -10,9 +10,9 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.nongnu.org/duplicity/ COMMENT= Remote encrypting incremental backup utility -DEPENDS= gnupg>=1.2.3:../../security/gnupg +DEPENDS+= gnupg>=1.2.3:../../security/gnupg -BUILDLINK_DEPENDS.librsync= librsync>=0.9.6 +BUILDLINK_DEPENDS.librsync+= librsync>=0.9.6 PYDISTUTILSPKG= yes PYTHON_VERSIONS_ACCEPTED= 22 23 diff --git a/sysutils/dvd+rw-tools/Makefile b/sysutils/dvd+rw-tools/Makefile index 1df49f9b236..adb6fd72a26 100644 --- a/sysutils/dvd+rw-tools/Makefile +++ b/sysutils/dvd+rw-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/11/04 21:55:09 dbj Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:51:00 rillig Exp $ # DISTNAME= dvd+rw-tools-5.21.4.10.8 @@ -11,7 +11,7 @@ COMMENT= Tools for writing DVD+R[W] disks DEPENDS+= {cdrecord-[1-9]*,cdrtools-ossdvd-[0-9]*}:../../sysutils/cdrecord -WRKSRC= ${WRKDIR}/${PKGNAME} +WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} INSTALLATION_DIRS= bin man/man1 diff --git a/sysutils/easydiskpasswd/Makefile b/sysutils/easydiskpasswd/Makefile index bc78b52ab1c..bc3beff885c 100644 --- a/sysutils/easydiskpasswd/Makefile +++ b/sysutils/easydiskpasswd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/01/20 12:26:15 agc Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:00 rillig Exp $ DISTNAME= easydiskpasswd-1.0 CATEGORIES= sysutils @@ -11,7 +11,7 @@ WRKSRC= ${WRKDIR} NO_CHECKSUM= yes # we depend on SCIOCCOMMAND and the "make" infrastructure -ONLY_FOR_PLATFORM= NetBSD-* +ONLY_FOR_PLATFORM= NetBSD-*-* do-extract: ${CP} ${FILESDIR}/easydiskpasswd.c ${FILESDIR}/Makefile ${WRKSRC} diff --git a/sysutils/fdgw/Makefile b/sysutils/fdgw/Makefile index 679f683c41b..62cb6444ad1 100644 --- a/sysutils/fdgw/Makefile +++ b/sysutils/fdgw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/07/08 19:15:25 kristerw Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:00 rillig Exp $ # DISTNAME= fdgw-20020130 @@ -15,7 +15,7 @@ _IMG_DST_DIR = ${PREFIX}/fdgw/${MACHINE_ARCH} ONLY_FOR_PLATFORM= NetBSD-1.5.*-i386 BUILD_TARGET= dist-build -MAKE_ENV+= BSDSRCDIR="${BSDSRCDIR}" +MAKE_ENV+= BSDSRCDIR=${BSDSRCDIR:Q} pre-fetch: @ ${ECHO} ""; @@ -50,7 +50,7 @@ post-install: .include "../../mk/bsd.prefs.mk" .if !exists(${X11BASE}/bin/lndir) && ${OPSYS} == "NetBSD" -PKG_FAIL_REASON= "${PKGNAME} requires the 'lndir' command, and hence X11" +PKG_FAIL_REASON+= "${PKGNAME} requires the 'lndir' command, and hence X11" .endif # we need the NetBSD source tree. diff --git a/sysutils/findutils/Makefile b/sysutils/findutils/Makefile index e35477b7029..f9aa8eb4948 100644 --- a/sysutils/findutils/Makefile +++ b/sysutils/findutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/10/11 01:59:49 jschauma Exp $ +# $NetBSD: Makefile,v 1.20 2005/12/05 20:51:00 rillig Exp $ DISTNAME= findutils-4.1 PKGREVISION= 4 @@ -12,7 +12,7 @@ COMMENT= The GNU find, xargs and locate utilities GNU_CONFIGURE= YES CONFIGURE_HAS_INFODIR= NO CONFIGURE_HAS_MANDIR= NO -MAKE_ENV+= INFO_DIR=${INFO_DIR} +MAKE_ENV+= INFO_DIR=${INFO_DIR:Q} LDFLAGS.IRIX+= -lgen INFO_FILES= find.info @@ -28,7 +28,7 @@ PLIST_SUBST+= USE_CATMAN="" .if defined(GNU_PROGRAM_PREFIX) CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX} .endif -PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX} +PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q} BUILD_DEFS+= GNU_PROGRAM_PREFIX .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/sysutils/fixelfprot/Makefile b/sysutils/fixelfprot/Makefile index 254b5bb4c7d..da9040ca747 100644 --- a/sysutils/fixelfprot/Makefile +++ b/sysutils/fixelfprot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/09/28 20:52:26 rillig Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 20:51:00 rillig Exp $ DISTNAME= fixelfprot-20040714 CATEGORIES= sysutils @@ -14,7 +14,7 @@ ONLY_FOR_PLATFORM= NetBSD-*-powerpc PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR} -NO_CHECKSUM= # defined - sources are part of pkgsrc entry +NO_CHECKSUM= yes # sources are part of pkgsrc entry NO_CONFIGURE= yes INSTALLATION_DIRS= bin diff --git a/sysutils/fsv/Makefile b/sysutils/fsv/Makefile index 8deb43f55a2..83d4e4bebf6 100644 --- a/sysutils/fsv/Makefile +++ b/sysutils/fsv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/06/24 21:15:21 kristerw Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:51:00 rillig Exp $ # DISTNAME= fsv-0.9 @@ -12,7 +12,7 @@ COMMENT= 3D filesystem visualizer GNU_CONFIGURE= yes USE_TOOLS+= file gmake -CONFIGURE_ENV+= FILE_CMD="${TOOLS_FILE_CMD}" +CONFIGURE_ENV+= FILE_CMD=${TOOLS_FILE_CMD:Q} .include "../../x11/gtkglarea/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" diff --git a/sysutils/gamin/Makefile b/sysutils/gamin/Makefile index 99f57216dc2..a66aefc4623 100644 --- a/sysutils/gamin/Makefile +++ b/sysutils/gamin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/08/30 23:24:33 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 20:51:00 rillig Exp $ DISTNAME= gamin-0.1.5 PKGREVISION= 1 @@ -8,7 +8,7 @@ MASTER_SITES= http://www.gnome.org/~veillard/gamin/sources/ CONFLICTS= fam-[0-9]* MAINTAINER= jlam@NetBSD.org -COMMENT= file alteration monitor +COMMENT= File alteration monitor HOMEPAGE= http://www.gnome.org/~veillard/gamin/ USE_LIBTOOL= yes diff --git a/sysutils/gkrellm-server/Makefile b/sysutils/gkrellm-server/Makefile index d615d126bc5..5c204706521 100644 --- a/sysutils/gkrellm-server/Makefile +++ b/sysutils/gkrellm-server/Makefile @@ -1,15 +1,13 @@ -# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:23 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 20:51:00 rillig Exp $ .include "../../sysutils/gkrellm/Makefile.common" -PKGREVISION= # empty1 - GKRELLM_PKGBASE= gkrellm-server COMMENT= Monitoring daemon remotely accessible by a GKrellM client DEPENDS+= gkrellm-share-${GKRELLM_VERSION}:../../sysutils/gkrellm-share USE_TOOLS+= pkg-config USE_PKGINSTALL= YES -PTHREAD_OPTS= require +PTHREAD_OPTS+= require RCD_SCRIPTS= gkrellmd CONF_FILES= ${PREFIX}/share/examples/gkrellm-server/gkrellmd.conf ${PREFIX}/etc/gkrellmd.conf @@ -19,7 +17,7 @@ CONF_FILES= ${PREFIX}/share/examples/gkrellm-server/gkrellmd.conf ${PREFIX}/etc SPECIAL_PERMS+= ${PREFIX}/bin/gkrellmd ${ROOT_USER} kmem 2711 .endif -NOT_FOR_PLATFORM= IRIX-* +NOT_FOR_PLATFORM= IRIX-*-* MAKE_ENV+= MODULES=server diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile index 757c6ea2de4..a106f51c8d3 100644 --- a/sysutils/gkrellm/Makefile +++ b/sysutils/gkrellm/Makefile @@ -1,8 +1,6 @@ -# $NetBSD: Makefile,v 1.45 2005/09/08 13:19:56 cube Exp $ +# $NetBSD: Makefile,v 1.46 2005/12/05 20:51:00 rillig Exp $ .include "Makefile.common" -PKGREVISION= # empty1 - GKRELLM_PKGBASE= gkrellm WRKSRC= ${GKRELLM_SRCDIR} @@ -21,13 +19,13 @@ USE_TOOLS+= pkg-config SPECIAL_PERMS+= ${PREFIX}/bin/gkrellm ${ROOT_USER} kmem 2711 .endif -NOT_FOR_PLATFORM= IRIX-* +NOT_FOR_PLATFORM= IRIX-*-* .include "options.mk" -MAKE_ENV+= MODULES=src LINK_FLAGS=${EXPORT_SYMBOLS_LDFLAGS} -MAKE_ENV+= BINOWNER=${BINOWN} BINGROUP=${BINGRP} -MAKE_ENV+= SSL_TYPE=${GKRELLM_SSL_TYPE} +MAKE_ENV+= MODULES=src LINK_FLAGS=${EXPORT_SYMBOLS_LDFLAGS:Q} +MAKE_ENV+= BINOWNER=${BINOWN:Q} BINGROUP=${BINGRP:Q} +MAKE_ENV+= SSL_TYPE=${GKRELLM_SSL_TYPE:Q} MAKE_ENV+= PKG_INCLUDE=-I${BUILDLINK_PREFIX.${GKRELLM_SSL_TYPE}}/include MAKE_ENV+= PKG_LIBS="-L${BUILDLINK_PREFIX.${GKRELLM_SSL_TYPE}}/lib -Wl,-R${BUILDLINK_PREFIX.${GKRELLM_SSL_TYPE}}/lib" diff --git a/sysutils/gkrellm/Makefile.common b/sysutils/gkrellm/Makefile.common index cb777274e76..3e985b8c964 100644 --- a/sysutils/gkrellm/Makefile.common +++ b/sysutils/gkrellm/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.12 2005/09/08 13:19:56 cube Exp $ +# $NetBSD: Makefile.common,v 1.13 2005/12/05 20:51:00 rillig Exp $ DISTNAME= ${GKRELLM_DISTBASE} PKGNAME= ${GKRELLM_PKGBASE}-${GKRELLM_VERSION} @@ -15,7 +15,7 @@ USE_TOOLS+= gmake USE_PKGLOCALEDIR= YES MAKE_ENV+= LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale -MAKE_ENV+= GREP=${GREP} +MAKE_ENV+= GREP=${GREP:Q} .if defined(GKRELLM_DEBUG) MAKE_ENV+= DEBUG=yes diff --git a/sysutils/gkrellm1/Makefile b/sysutils/gkrellm1/Makefile index 9741efe5dd2..e9a36887ab4 100644 --- a/sysutils/gkrellm1/Makefile +++ b/sysutils/gkrellm1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:22 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:51:00 rillig Exp $ # DISTNAME= gkrellm-1.2.13 @@ -23,7 +23,7 @@ BUILD_TARGET= netbsd INSTALL_TARGET= install_netbsd MAKE_ENV+= PTHREAD_INC="-I${LOCALBASE}/include" -MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}" +MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:Q} post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/gkrellm diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile index db36c981791..26d1c0379d3 100644 --- a/sysutils/gnome-vfs/Makefile +++ b/sysutils/gnome-vfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2005/08/10 20:56:23 jlam Exp $ +# $NetBSD: Makefile,v 1.52 2005/12/05 20:51:00 rillig Exp $ DISTNAME= gnome-vfs-1.0.5 PKGREVISION= 8 @@ -10,7 +10,7 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME Virtual File System BUILD_USES_MSGFMT= YES -BUILDLINK_DEPENDS.gnome-mime-data= gnome-mime-data>=2.0.1 +BUILDLINK_DEPENDS.gnome-mime-data+= gnome-mime-data>=2.0.1 USE_PKGLOCALEDIR= YES USE_X11BASE= YES diff --git a/sysutils/gnome-vfs2/Makefile.common b/sysutils/gnome-vfs2/Makefile.common index 60f078ec782..bd24a8c6479 100644 --- a/sysutils/gnome-vfs2/Makefile.common +++ b/sysutils/gnome-vfs2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.23 2005/10/09 00:33:20 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.24 2005/12/05 20:51:00 rillig Exp $ # DISTNAME= gnome-vfs-2.12.1.1 @@ -44,7 +44,6 @@ EGDIR= ${PREFIX}/share/examples/gnome-vfs-2.0 .for f in ${EGFILES} CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} .endfor -.undef f # # The following stuff is to allow easy building of modules distributed within diff --git a/sysutils/kdirstat/Makefile b/sysutils/kdirstat/Makefile index 09541614c2c..7e8f53eb21f 100644 --- a/sysutils/kdirstat/Makefile +++ b/sysutils/kdirstat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/06/30 10:25:33 markd Exp $ +# $NetBSD: Makefile,v 1.20 2005/12/05 20:51:00 rillig Exp $ DISTNAME= kdirstat-2.4.3 CATEGORIES= sysutils kde @@ -7,7 +7,7 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= markd@NetBSD.org HOMEPAGE= http://kdirstat.sourceforge.net/ -COMMENT= A graphical disk usage utility +COMMENT= Graphical disk usage utility USE_TOOLS+= gmake USE_LANGUAGES= c c++ diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile index 0f9d768cd18..4cba89b54a5 100644 --- a/sysutils/lavaps/Makefile +++ b/sysutils/lavaps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/07/16 01:19:20 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2005/12/05 20:51:01 rillig Exp $ # DISTNAME= lavaps-1.20 @@ -12,9 +12,10 @@ COMMENT= Lava lamp of currently running processes USE_TOOLS+= perl GNU_CONFIGURE= YES -CONFIGURE_ARGS= --with-additional-includes='-I${LOCALBASE}/include' \ - --with-additional-libs='-L${LOCALBASE}/lib' \ - --with-tcl-ver=8.3.2 --with-tk-ver=8.3.2 \ +CONFIGURE_ARGS+= --with-additional-includes=-I${LOCALBASE:Q}/include \ + --with-additional-libs=-L${LOCALBASE:Q}/lib \ + --with-tcl-ver=8.3.2 \ + --with-tk-ver=8.3.2 \ --with-tcltk-lib-suffix-type=nodot .include "../../x11/tk83/buildlink3.mk" diff --git a/sysutils/libgtop2/Makefile b/sysutils/libgtop2/Makefile index 78c9a3d47c2..7b7a4330535 100644 --- a/sysutils/libgtop2/Makefile +++ b/sysutils/libgtop2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/10/12 21:49:39 jmmv Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/05 20:51:01 rillig Exp $ DISTNAME= libgtop-2.12.0 PKGNAME= ${DISTNAME:S/-/2-/} @@ -50,7 +50,7 @@ PRINT_PLIST_AWK+= /^include\/libgtop-2.0\/glibtop_suid.h$$/ \ (${MACHINE_ARCH} != mipsel) && (${MACHINE_ARCH} != powerpc) && \ (${MACHINE_ARCH} != sparc) && (${MACHINE_ARCH} != sparc64) && \ (${MACHINE_ARCH} != x86_64) -PKG_FAIL_REASON= "${PKGNAME} has not yet been ported to ${MACHINE_ARCH}." +PKG_FAIL_REASON+= "${PKGNAME} has not yet been ported to ${MACHINE_ARCH}." PKG_FAIL_REASON+= "Please look at /usr/include/${MACHINE_ARCH}/pcb.h" PKG_FAIL_REASON+= "and update ${WRKSRC}/sysdeps/freebsd/prockernel.c appropriately." PKG_FAIL_REASON+= "(More information can be found in libgtop.info.)" diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile index fd9ef4fce31..7f2658dd9d5 100644 --- a/sysutils/lsof/Makefile +++ b/sysutils/lsof/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.86 2005/09/13 20:18:27 christos Exp $ +# $NetBSD: Makefile,v 1.87 2005/12/05 20:51:01 rillig Exp $ # DISTNAME= lsof_4.76 @@ -18,7 +18,7 @@ COMMENT= Lists information about open files WRKSRC= ${WRKDIR}/${DISTNAME}/${SRCBALL_NAME} HAS_CONFIGURE= yes CONFIGURE_SCRIPT= ./Configure -CONFIGURE_ARGS= -n ${LOWER_OPSYS} +CONFIGURE_ARGS+= -n ${LOWER_OPSYS} CONFIGURE_ENV+= LSOF_CC="${CC} ${CFLAGS}" MAKE_FLAGS+= LSOF_BLDCMT="NetBSD pkgsrc rocks!" CPPFLAGS+= -DLSOF_MORE_SECURE=${LSOF_MORE_SECURE} \ diff --git a/sysutils/radmind/Makefile b/sysutils/radmind/Makefile index b221dc81e7f..8f2ad6840c8 100644 --- a/sysutils/radmind/Makefile +++ b/sysutils/radmind/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/07/08 20:09:00 kristerw Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:51:01 rillig Exp $ # DISTNAME= radmind-1.5.0 @@ -14,7 +14,7 @@ COMMENT= Remote file administration and integrity tool GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} CONFIGURE_ARGS+= --with-radminddir=${VARBASE}/radmind -CONFIGURE_ENV+= diffpath="${TOOLS_DIFF}" +CONFIGURE_ENV+= diffpath=${TOOLS_DIFF:Q} USE_TOOLS+= diff BUILD_TARGET= all man rash diff --git a/sysutils/rdiff-backup/Makefile b/sysutils/rdiff-backup/Makefile index 8a5c897bc0e..cfa016bf473 100644 --- a/sysutils/rdiff-backup/Makefile +++ b/sysutils/rdiff-backup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/09/18 13:03:15 adrianp Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 20:51:01 rillig Exp $ # DISTNAME= rdiff-backup-1.0.1 @@ -12,13 +12,13 @@ COMMENT= Remote incremental backup utility PYDISTUTILSPKG= yes PYTHON_VERSIONS_ACCEPTED= 24 23 22 -SUBST_CLASSES= path +SUBST_CLASSES+= path SUBST_STAGE.path= post-patch SUBST_FILES.path= setup.py SUBST_SED.path= -e "s|%%LOCALBASE%%|${LOCALBASE}|g" SUBST_MESSAGE.path= "Fixing paths." -BUILDLINK_DEPENDS.librsync= librsync>=0.9.6 +BUILDLINK_DEPENDS.librsync+= librsync>=0.9.6 .include "../../devel/librsync/buildlink3.mk" .include "../../lang/python/application.mk" diff --git a/sysutils/rfstool/Makefile b/sysutils/rfstool/Makefile index 360af29ab2d..2dcf1d6aad3 100644 --- a/sysutils/rfstool/Makefile +++ b/sysutils/rfstool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/07/06 18:11:15 xtraeme Exp $ +# $NetBSD: Makefile,v 1.3 2005/12/05 20:51:01 rillig Exp $ # DISTNAME= rfstool-0.14-source @@ -13,7 +13,7 @@ COMMENT= Tools to access ReiserFS partitions PKG_INSTALLATION_TYPES= overwrite pkgviews -WRKSRC= ${WRKDIR}/${PKGNAME}/rfstool +WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}/rfstool MAKEFILE= makefile.gcc3x USE_LANGUAGES+= c++ diff --git a/sysutils/scsiinfo/Makefile b/sysutils/scsiinfo/Makefile index 68a5555d819..dfa164a7210 100644 --- a/sysutils/scsiinfo/Makefile +++ b/sysutils/scsiinfo/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2005/06/17 03:50:35 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:01 rillig Exp $ DISTNAME= scsiinfo-4.7 -PKGNAME= ${DISTNAME} CATEGORIES= sysutils MASTER_SITES= http://www.cs.toronto.edu/pub/jdd/scsiinfo/ EXTRACT_SUFX= .shar @@ -28,4 +27,3 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/scsiinfo.1 ${PREFIX}/man/man1 .include "../../mk/bsd.pkg.mk" - diff --git a/sysutils/sformat/DESCR b/sysutils/sformat/DESCR index a04294f2e72..c7a6e97c3ed 100644 --- a/sysutils/sformat/DESCR +++ b/sysutils/sformat/DESCR @@ -1,10 +1,11 @@ Sformat is the best SCSI disk tool, I came across in the last 20 years. It is able to repair and format nearly any disk, as long as its heads -are still in working condition and a few percent of its blocks are writable. -Once you have learned to use it, you will never think of using something else. -Formating a disk with sformat does not only send a scsi-format command to the disk, -but also make a detailed surface analysis after formating. The defect lists are -updated, and you come out with a reliable disk, again. Thanks Joerg. +are still in working condition and a few percent of its blocks are +writable. Once you have learned to use it, you will never think of using +something else. Formating a disk with sformat does not only send a +scsi-format command to the disk, but also make a detailed surface +analysis after formating. The defect lists are updated, and you come out +with a reliable disk, again. Thanks Joerg. -On the other side, like with any other powerful tool, you have to invest some time in learning. -Well invested time. +On the other side, like with any other powerful tool, you have to invest +some time in learning. Well invested time. diff --git a/sysutils/sformat/Makefile b/sysutils/sformat/Makefile index eb8278ab6e5..af01b74ebc4 100644 --- a/sysutils/sformat/Makefile +++ b/sysutils/sformat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:33 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:51:01 rillig Exp $ # DISTNAME= sformat-3.5 @@ -7,7 +7,7 @@ MASTER_SITES= ftp://ftp.berlios.de/pub/sformat/ MAINTAINER= Andreas.Hallmann@tiscali.de,tech-pkg@NetBSD.org HOMEPAGE= http://freshmeat.net/projects/sformat -COMMENT= SCSI-disk maintainance, formating, and ultimative repair tool with support for netbsd labels +COMMENT= SCSI disk maintainance, formating, and ultimative repair tool with support for NetBSD labels PKG_INSTALLATION_TYPES= overwrite pkgviews @@ -19,9 +19,9 @@ TBL?= tbl # avoid picking up a bad ${ARCH} during the build MAKE_ENV+= ARCH="" MAKE_ENV+= MAKEPROG="gmake" -MAKE_ENV+= COPTX="${CFLAGS}" -MAKE_ENV+= LDOPTX="${LDFLAGS}" -MAKE_FLAGS+= INS_BASE="${LOCALBASE}" # won't work in MAKE_ENV! +MAKE_ENV+= COPTX=${CFLAGS:M*:Q} +MAKE_ENV+= LDOPTX=${LDFLAGS:M*:Q} +MAKE_FLAGS+= INS_BASE=${LOCALBASE:Q} # won't work in MAKE_ENV! # if we're using a gcc which is named gcc, we need to set CCOM=gcc # in MAKE_ENV so the make infrastructure picks the right options. diff --git a/sysutils/socket/Makefile b/sysutils/socket/Makefile index 484dc83c867..13b5b7e970b 100644 --- a/sysutils/socket/Makefile +++ b/sysutils/socket/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/03/24 21:13:01 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:01 rillig Exp $ DISTNAME= socket-1.1 CATEGORIES= sysutils net @@ -7,7 +7,7 @@ MASTER_SITES= http://www.freebsd.org/~wosch/src/ MAINTAINER= tech-pkg@NetBSD.org COMMENT= Create tcp socket and connect to stdin/out -MAKE_ENV+= INSTALLBASE=${PREFIX} +MAKE_ENV+= INSTALLBASE=${PREFIX:Q} BUILD_DEFS+= USE_INET6 diff --git a/sysutils/sredird/Makefile b/sysutils/sredird/Makefile index c979ceb7c9c..56022eb85d4 100644 --- a/sysutils/sredird/Makefile +++ b/sysutils/sredird/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/06/17 03:50:35 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:51:01 rillig Exp $ # DISTNAME= sredird-2.0.0 @@ -10,7 +10,7 @@ HOMEPAGE= http://www.pcmicro.com/sredird/ COMMENT= RFC2217 compliant serial port redirector -MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS}" +MAKE_FLAGS+= CC=${CC:Q} CFLAGS=${CFLAGS:M*:Q} BUILD_TARGET= sredird INSTALLATION_DIRS= libexec share/doc diff --git a/sysutils/su2/Makefile b/sysutils/su2/Makefile index a16f61fd56e..d2b47653b49 100644 --- a/sysutils/su2/Makefile +++ b/sysutils/su2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/04/17 04:32:16 ben Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:51:01 rillig Exp $ # DISTNAME= su2-1.3 @@ -27,7 +27,7 @@ LDLIBS= -lcrypt LDLIBS+= -lcompat .endif -MAKE_ENV+= LDLIBS="${LDLIBS}" +MAKE_ENV+= LDLIBS=${LDLIBS:Q} post-extract: ${CHMOD} -R og+w ${WRKSRC} diff --git a/sysutils/sysinfo/Makefile b/sysutils/sysinfo/Makefile index 106a36ad655..c178bb67bba 100644 --- a/sysutils/sysinfo/Makefile +++ b/sysutils/sysinfo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/07/19 14:05:27 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:51:01 rillig Exp $ # DISTNAME= sysinfo-3.5.1 @@ -16,7 +16,7 @@ ONLY_FOR_PLATFORM= SunOS-*-* # only for Solaris, at the moment BUILD_TARGET= default INSTALL_TARGET= install install.man TEST_TARGET= test -MAKE_ENV+= CPPFLAGS="" CC="${CC}" +MAKE_ENV+= CPPFLAGS="" CC=${CC:Q} post-build: ${CHMOD} -R o+rx ${WRKDIR} diff --git a/sysutils/tits/Makefile b/sysutils/tits/Makefile index c293fd9ec60..fa29a846bd4 100644 --- a/sysutils/tits/Makefile +++ b/sysutils/tits/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2003/09/26 08:16:17 agc Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:01 rillig Exp $ # DISTNAME= tits-1.1.1 @@ -10,7 +10,7 @@ COMMENT= Server which provides telnet(1) access to one or more tty ports BINDIR= ${PREFIX}/sbin MANDIR= ${PREFIX}/man -MAKE_ENV+= BINDIR=${BINDIR} MANDIR=${MANDIR} +MAKE_ENV+= BINDIR=${BINDIR:Q} MANDIR=${MANDIR:Q} MANCOMPRESSED_IF_MANZ= yes diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile index 0bf986b6399..10ed8402c2f 100644 --- a/sysutils/ups-nut/Makefile +++ b/sysutils/ups-nut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/08/23 11:48:51 rillig Exp $ +# $NetBSD: Makefile,v 1.37 2005/12/05 20:51:01 rillig Exp $ # DISTNAME= nut-2.0.1 @@ -33,8 +33,8 @@ NUT_STATEDIR= /var/db/nut NUT_USER?= nut NUT_GROUP?= nut -FILES_SUBST+= NUT_CONFDIR=${NUT_CONFDIR} -FILES_SUBST+= NUT_STATEDIR=${NUT_STATEDIR} +FILES_SUBST+= NUT_CONFDIR=${NUT_CONFDIR:Q} +FILES_SUBST+= NUT_STATEDIR=${NUT_STATEDIR:Q} MESSAGE_SUBST+= NUT_CONFDIR=${NUT_CONFDIR} MESSAGE_SUBST+= NUT_EGDIR=${NUT_EGDIR} diff --git a/sysutils/user/DESCR b/sysutils/user/DESCR index 5fefbd8b9d7..3cc38bae07b 100644 --- a/sysutils/user/DESCR +++ b/sysutils/user/DESCR @@ -1,8 +1,8 @@ The usermgmt suite of programs provides SVR4/Solaris-compatible {user,group}{add,del,mod} commands, and two utilities, user(8) and -group(8) whcih perform the same functions. In addition, some -extensions are provided, which allow a user to be created with the -same uid and gid, for example. +group(8) which perform the same functions. In addition, some extensions +are provided, which allow a user to be created with the same uid and +gid, for example. The usermgmt suite was based on the old addnerd package, which, in turn, was based on Matt Green's addbozo script. diff --git a/sysutils/user/Makefile b/sysutils/user/Makefile index 8abe3ebd656..7f009ab63c9 100644 --- a/sysutils/user/Makefile +++ b/sysutils/user/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/01/20 12:26:16 agc Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 20:51:01 rillig Exp $ # # Note to package maintainers: @@ -16,7 +16,7 @@ COMMENT= Solaris-compatible {user,group}{add,del,mod} commands ONLY_FOR_PLATFORM= NetBSD-*-* # already in Solaris base system .if exists(/usr/sbin/user) -PKG_SKIP_REASON= "${PKGNAME} is part of your ${OPSYS} distribution" +PKG_SKIP_REASON+= "${PKGNAME} is part of your ${OPSYS} distribution" .endif WRKSRC= ${WRKDIR}/user diff --git a/sysutils/user_darwin/DESCR b/sysutils/user_darwin/DESCR index 6c9c655c3ba..5060afa99cb 100644 --- a/sysutils/user_darwin/DESCR +++ b/sysutils/user_darwin/DESCR @@ -1,2 +1,2 @@ This implements a subset of useradd(8)/groupadd(8) functionality on -Darwin that is sufficient for pkgsrc use.
\ No newline at end of file +Darwin that is sufficient for pkgsrc use. diff --git a/sysutils/user_darwin/Makefile b/sysutils/user_darwin/Makefile index d17149942a4..98286a2de92 100644 --- a/sysutils/user_darwin/Makefile +++ b/sysutils/user_darwin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/06/17 03:50:36 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:51:01 rillig Exp $ # DISTNAME= user-20040801 @@ -15,7 +15,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews NO_CHECKSUM= yes NO_CONFIGURE= yes -NO_TOOLS= yes NO_BUILD= yes INSTALLATION_DIRS= sbin diff --git a/sysutils/user_interix/Makefile b/sysutils/user_interix/Makefile index 7ddef1bf52e..c5c73226182 100644 --- a/sysutils/user_interix/Makefile +++ b/sysutils/user_interix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/10/23 21:56:41 rillig Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:51:01 rillig Exp $ # DISTNAME= user-20040426 @@ -15,7 +15,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews NO_CHECKSUM= yes NO_CONFIGURE= yes -NO_TOOLS= yes NO_BUILD= yes INSTALLATION_DIRS= sbin diff --git a/sysutils/vifm/Makefile b/sysutils/vifm/Makefile index 7abf75fa19c..0ea4ff84ce2 100644 --- a/sysutils/vifm/Makefile +++ b/sysutils/vifm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:33 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 20:51:01 rillig Exp $ # DISTNAME= vifm-0.1 @@ -13,8 +13,8 @@ COMMENT= Ncurses based file manager with vi like keybindings GNU_CONFIGURE= yes USE_TOOLS+= gmake -INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]* -INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-C]* +INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-* +INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-C]*-* pre-configure: @${SED} -e "s/cfg.use_screen = 0/cfg.use_screen = 1/" \ diff --git a/sysutils/wtail/Makefile b/sysutils/wtail/Makefile index 7e11446faab..c6fee46df1c 100644 --- a/sysutils/wtail/Makefile +++ b/sysutils/wtail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:30 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:51:01 rillig Exp $ # DISTNAME= wtail-0.2.2 @@ -11,7 +11,7 @@ HOMEPAGE= http://www.teaser.fr/~amajorel/wtail/ COMMENT= Watch multiple files at once -MAKE_ENV+= SED="${SED}" +MAKE_ENV+= SED=${SED:Q} .include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xbatt/Makefile b/sysutils/xbatt/Makefile index 004f667cb8d..7ba99bcb415 100644 --- a/sysutils/xbatt/Makefile +++ b/sysutils/xbatt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/06/17 04:49:49 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:51:02 rillig Exp $ # DISTNAME= xbatt-1.3pr1 @@ -12,7 +12,7 @@ HOMEPAGE= http://www2.clave.gr.jp/~eto/xbatt/ # Not really COMMENT= Displays battery status of your notebook via APM .if !exists(/usr/include/machine/apmvar.h) -PKG_SKIP_REASON= "APM is not available for ${MACHINE_PLATFORM}" +PKG_SKIP_REASON+= "APM is not available for ${MACHINE_PLATFORM}" .endif WRKSRC= ${WRKDIR}/xbatt-1.3 diff --git a/sysutils/xbattbar/Makefile b/sysutils/xbattbar/Makefile index a296148ed89..656b7b3be7d 100644 --- a/sysutils/xbattbar/Makefile +++ b/sysutils/xbattbar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/09/28 20:52:27 rillig Exp $ +# $NetBSD: Makefile,v 1.26 2005/12/05 20:51:02 rillig Exp $ DISTNAME= xbattbar_1.4.2 PKGNAME= ${DISTNAME:S/_/-/} @@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} USE_IMAKE= yes .if !exists(/usr/include/machine/apmvar.h) -PKG_SKIP_REASON= "APM is not available for ${MACHINE_PLATFORM}" +PKG_SKIP_REASON+= "APM is not available for ${MACHINE_PLATFORM}" .endif .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile index 1f3812029f2..af3051b5a9c 100644 --- a/sysutils/xcdroast/Makefile +++ b/sysutils/xcdroast/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/08/19 18:12:39 jlam Exp $ +# $NetBSD: Makefile,v 1.37 2005/12/05 20:51:02 rillig Exp $ DISTNAME= xcdroast-0.98alpha15 PKGNAME= xcdroast-0.98a15 @@ -26,7 +26,7 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} .if ${_OPSYS_HAS_OSSAUDIO} == "yes" CFLAGS+= -DHAVE_OSS -CONFIGURE_ENV+= AUDIO_LIBS=${LIBOSSAUDIO} +CONFIGURE_ENV+= AUDIO_LIBS=${LIBOSSAUDIO:Q} .endif DOCDIR= ${PREFIX}/share/doc/xcdroast diff --git a/sysutils/xentools12/Makefile b/sysutils/xentools12/Makefile index c191e0c5c32..0508b7ab251 100644 --- a/sysutils/xentools12/Makefile +++ b/sysutils/xentools12/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:33 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:02 rillig Exp $ # DISTNAME= xeno-1.2-src-040418 @@ -25,8 +25,8 @@ CONF_FILES+= ${EGDIR}/democd ${PKG_SYSCONFDIR}/democd CONF_FILES+= ${EGDIR}/netbsd ${PKG_SYSCONFDIR}/netbsd USE_TOOLS+= gmake -MAKE_ENV+= EGDIR="${EGDIR}" -MAKE_ENV+= MV="${MV}" PYTHON="${PYTHONBIN}" SED="${SED}" +MAKE_ENV+= EGDIR=${EGDIR:Q} +MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q} PYTHON_VERSIONS_ACCEPTED= 22 23 PY_PATCHPLIST= yes PYTHON_PATCH_SCRIPTS= examples/xc_dom_control.py examples/xc_dom_create.py diff --git a/sysutils/xentools20/Makefile b/sysutils/xentools20/Makefile index d86162e7654..167924a1b42 100644 --- a/sysutils/xentools20/Makefile +++ b/sysutils/xentools20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/11/08 00:47:35 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2005/12/05 20:51:02 rillig Exp $ # DISTNAME= xen-2.0.7-src @@ -27,8 +27,8 @@ EGDIR= ${PREFIX}/share/examples/xen MESSAGE_SUBST= EGDIR=${EGDIR} USE_TOOLS+= gmake -MAKE_ENV+= EGDIR="${EGDIR}" -MAKE_ENV+= MV="${MV}" PYTHON="${PYTHONBIN}" SED="${SED}" +MAKE_ENV+= EGDIR=${EGDIR:Q} +MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q} PYTHON_VERSIONS_ACCEPTED= 24 23 22 PY_PATCHPLIST= yes PYTHON_PATCH_SCRIPTS= python/xen/util/console_client.py @@ -44,7 +44,7 @@ PYTHON_PATCH_SCRIPTS+= misc/netfix PYTHON_PATCH_SCRIPTS+= misc/xend PYTHON_PATCH_SCRIPTS+= xentrace/xentrace_format -SUBST_CLASSES= paths py conf +SUBST_CLASSES+= paths py conf SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= python/xen/xend/server/SrvDaemon.py SUBST_FILES.paths+= python/xen/xend/XendDomainInfo.py @@ -75,9 +75,9 @@ PROCPATH= /proc .endif RCD_SCRIPTS= xend xendomains -FILES_SUBST+= RCD_INTERPRETER=${PYTHONBIN} -FILES_SUBST+= PROCPATH=${PROCPATH} -FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} +FILES_SUBST+= RCD_INTERPRETER=${PYTHONBIN:Q} +FILES_SUBST+= PROCPATH=${PROCPATH:Q} +FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} XEND_SCRIPTS= network block-enbd vif-bridge block-file diff --git a/sysutils/xenvstat/Makefile b/sysutils/xenvstat/Makefile index 2d6d998fb31..2fed957afdd 100644 --- a/sysutils/xenvstat/Makefile +++ b/sysutils/xenvstat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/06/17 03:50:36 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:02 rillig Exp $ DISTNAME= xenvstat-20041127 CATEGORIES= sysutils @@ -14,7 +14,7 @@ ONLY_FOR_PLATFORM= NetBSD-*-* NO_CONFIGURE= yes NO_CHECKSUM= yes -LIBS= -lXmu -lXext -lXt -lX11 -lm +LIBS+= -lXmu -lXext -lXt -lX11 -lm INSTALLATION_DIRS= bin lib/X11/app-defaults diff --git a/sysutils/xhfs/Makefile b/sysutils/xhfs/Makefile index b8b11226d08..4aaa18e29e6 100644 --- a/sysutils/xhfs/Makefile +++ b/sysutils/xhfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/06/01 18:03:23 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:02 rillig Exp $ # DISTNAME= hfsutils-3.2.6 @@ -13,8 +13,9 @@ COMMENT= Tk GUI + Tcl Shell for accessing HFS volumes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib \ - --with-tk=${BUILDLINK_PREFIX.tk}/lib --disable-cli +CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib +CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk}/lib +CONFIGURE_ARGS+= --disable-cli CPPFLAGS+= -I${BUILDLINK_PREFIX.libhfs}/include/libhfs .include "../../devel/libhfs/buildlink3.mk" diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile index 0fa62b74f9c..ea4a14414ca 100644 --- a/sysutils/xosview/Makefile +++ b/sysutils/xosview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2005/11/17 15:53:00 rillig Exp $ +# $NetBSD: Makefile,v 1.55 2005/12/05 20:51:02 rillig Exp $ DISTNAME= xosview-1.8.2 PKGREVISION= 1 @@ -27,7 +27,7 @@ INSTALLATION_DIRS= bin lib/X11/app-defaults man/man1 . if !defined(UVM) && exists(/usr/include/uvm/uvm.h) CFLAGS+= -DUVM UVM= # defined -BUILD_DEFS= UVM +BUILD_DEFS+= UVM . endif .elif ${OPSYS} == "SunOS" USE_TOOLS+= gmake diff --git a/sysutils/zidrav/Makefile b/sysutils/zidrav/Makefile index b9c459497c8..1cedd3b2e93 100644 --- a/sysutils/zidrav/Makefile +++ b/sysutils/zidrav/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/10/21 04:00:56 minskim Exp $ +# $NetBSD: Makefile,v 1.2 2005/12/05 20:51:02 rillig Exp $ # DISTNAME= zidrav4unix-1.2.0 @@ -16,9 +16,8 @@ BUILD_TARGET= zidrav PKG_INSTALLATION_TYPES= overwrite pkgviews .include "../../mk/endian.mk" - .if ${MACHINE_ENDIAN} == "big" - CXXFLAGS+=-DCPU_BIGENDIAN +CXXFLAGS+= -DCPU_BIGENDIAN .endif INSTALLATION_DIRS= bin man/man1 |