diff options
-rw-r--r-- | misc/screen/Makefile | 4 | ||||
-rw-r--r-- | net/ruby-xmlrpc4r/Makefile | 4 | ||||
-rw-r--r-- | pkgtools/x11-links/Makefile | 4 | ||||
-rw-r--r-- | print/LPRng-core/Makefile | 4 | ||||
-rw-r--r-- | print/ghostscript-nox11/Makefile.common | 8 | ||||
-rw-r--r-- | print/ghostscript-nox11/PLIST | 4 | ||||
-rw-r--r-- | security/cfs/Makefile | 4 | ||||
-rw-r--r-- | security/cyrus-sasl2/PLIST.common | 6 | ||||
-rw-r--r-- | security/kth-krb4/Makefile | 4 | ||||
-rw-r--r-- | sysutils/apcupsd/Makefile | 5 | ||||
-rw-r--r-- | sysutils/mgm/Makefile | 4 | ||||
-rw-r--r-- | textproc/crimson/Makefile | 4 | ||||
-rw-r--r-- | textproc/kdoc/Makefile | 4 | ||||
-rw-r--r-- | www/navigator/Makefile.common | 4 |
14 files changed, 30 insertions, 33 deletions
diff --git a/misc/screen/Makefile b/misc/screen/Makefile index 951072ee6a3..ccd2c9ba845 100644 --- a/misc/screen/Makefile +++ b/misc/screen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2002/12/23 13:13:02 grant Exp $ +# $NetBSD: Makefile,v 1.39 2002/12/23 16:25:30 cjep Exp $ DISTNAME= screen-3.9.13 CATEGORIES= misc @@ -9,7 +9,7 @@ MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://www.gnu.org/software/screen/screen.html COMMENT= Multi-screen window manager -USE_BUILDLINK2= # defined +USE_BUILDLINK2= # defined INFO_FILES= screen.info PLIST_SUBST= DISTNAME=${DISTNAME} TEXINFO_OVERRIDE= YES diff --git a/net/ruby-xmlrpc4r/Makefile b/net/ruby-xmlrpc4r/Makefile index d371e61acbe..d323c2bccc7 100644 --- a/net/ruby-xmlrpc4r/Makefile +++ b/net/ruby-xmlrpc4r/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/02/05 07:45:30 jmc Exp $ +# $NetBSD: Makefile,v 1.3 2002/12/23 16:24:59 cjep Exp $ # DISTNAME= xmlrpc4r-1_7_9 @@ -17,7 +17,7 @@ NO_BUILD= yes DOC= README ToDo doc/rubyStyle.css doc/ChangeLog.html \ doc/base64.html doc/client.html doc/datetime.html \ - doc/howto.html doc/index.html doc/server.html + doc/howto.html doc/index.html doc/server.html EXAMPLES= call.rb \ chat/client.rb chat/client.rb.tk chat/server.rb \ introspection/client.rb introspection/server.rb \ diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile index 9be6a639a54..c7a80ccfb85 100644 --- a/pkgtools/x11-links/Makefile +++ b/pkgtools/x11-links/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2002/12/07 02:39:01 schmonz Exp $ +# $NetBSD: Makefile,v 1.24 2002/12/23 16:25:41 cjep Exp $ # # NOTE: If you update this package, then you'll likely need to also update # the x11-links dependency in mk/buildlink2/bsd.buildlink2.mk to the @@ -31,7 +31,7 @@ PLIST_SRC= ${WRKDIR}/.PLIST_SRC BUILDLINK_X11_SUBDIR= share/x11-links .include "../../mk/bsd.prefs.mk" - + .if !exists(${X11BASE}/include/X11/X.h) PKG_FAIL_REASON= "${PKGNAME} requires X headers to be installed" .endif diff --git a/print/LPRng-core/Makefile b/print/LPRng-core/Makefile index 98e9a3c4df3..53db502ee2d 100644 --- a/print/LPRng-core/Makefile +++ b/print/LPRng-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/07/13 07:09:22 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2002/12/23 16:25:59 cjep Exp $ # FreeBSD Id: Makefile,v 1.5 1998/10/21 00:57:27 steve Exp # @@ -57,7 +57,7 @@ FILES_SUBST+= CHMOD=${CHMOD:Q} FILES_SUBST+= CMP=${CMP:Q} FILES_SUBST+= CP=${CP:Q} FILES_SUBST+= RM=${RM:Q} -FILES_SUBST+= TRUE=${TRUE:Q} +FILES_SUBST+= TRUE=${TRUE:Q} FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} pre-patch: diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common index aa3ce575323..c16c507d223 100644 --- a/print/ghostscript-nox11/Makefile.common +++ b/print/ghostscript-nox11/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.41 2002/10/24 17:16:58 bouyer Exp $ +# $NetBSD: Makefile.common,v 1.42 2002/12/23 16:27:12 cjep Exp $ DISTNAME= ghostscript-${GS_VERS} GS_VERS= 6.01 @@ -11,8 +11,8 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://www.cs.wisc.edu/~ghost/index.html CONFLICTS+= ghostscript{,-nox11}-[0-9]* -CONFLICTS+= ghostscript-esp{,-nox11}-[0-9]* -CONFLICTS+= ghostscript-gnu{,-nox11,-x11}-[0-9]* +CONFLICTS+= ghostscript-esp{,-nox11}-[0-9]* +CONFLICTS+= ghostscript-gnu{,-nox11,-x11}-[0-9]* CONFLICTS+= hpijs-[0-9]* DEPENDS+= ghostscript-fonts-6.0:../../fonts/ghostscript-fonts @@ -246,7 +246,7 @@ gimpprint-configure: ) >> gdevstp-print.h; \ ${CP} *.c *.h ${WRKSRC}/src && \ ${CAT} contrib.mak.addon.old >> ${WRKSRC}/src/contrib.mak - + do-configure: ${GS_CONF_PREREQ} # # Append build rules for extra drivers to contrib.mak diff --git a/print/ghostscript-nox11/PLIST b/print/ghostscript-nox11/PLIST index 04192b910cd..bf484bb723a 100644 --- a/print/ghostscript-nox11/PLIST +++ b/print/ghostscript-nox11/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2002/02/03 21:27:20 jlam Exp $ +@comment $NetBSD: PLIST,v 1.5 2002/12/23 16:27:39 cjep Exp $ bin/bdftops bin/dvipdf bin/eps2eps @@ -61,7 +61,7 @@ share/doc/ghostscript/gdevmjc-0.8/MJ700V2C.FAQ share/doc/ghostscript/gdevmjc-0.8/README.mjc share/doc/ghostscript/gdevmjc-0.8/README.mje share/doc/ghostscript/gdevmjc-0.8/README.noz -share/doc/ghostscript/gdevmjc-0.8/cpem.doc +share/doc/ghostscript/gdevmjc-0.8/cpem.doc share/doc/ghostscript/gdevprsc.en share/doc/ghostscript/gdevprsc.ja share/doc/html/ghostscript/Bug-form.htm diff --git a/security/cfs/Makefile b/security/cfs/Makefile index 8c816b6bd20..a436f3ffca2 100644 --- a/security/cfs/Makefile +++ b/security/cfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/07/24 09:55:34 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2002/12/23 16:28:11 cjep Exp $ DISTNAME= cfs-1.4.1 CATEGORIES= security @@ -86,7 +86,7 @@ pre-build: ${FILESDIR}/unansi.sh > ${WRKSRC}/unansi ${CHMOD} +x ${WRKSRC}/unansi -do-build: +do-build: cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \ ${SH} ${CFS_BUILD_SCRIPT} ${ALL_TARGET} diff --git a/security/cyrus-sasl2/PLIST.common b/security/cyrus-sasl2/PLIST.common index a1405d12c4a..1dfa444dfba 100644 --- a/security/cyrus-sasl2/PLIST.common +++ b/security/cyrus-sasl2/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.4 2002/12/13 01:06:02 grant Exp $ +@comment $NetBSD: PLIST.common,v 1.5 2002/12/23 16:28:44 cjep Exp $ etc/rc.d/saslauthd include/sasl/hmac-md5.h include/sasl/md5.h @@ -68,12 +68,12 @@ share/doc/html/cyrus-sasl/draft-nerenberg-sasl-crammd5-03.txt share/doc/html/cyrus-sasl/draft-newman-sasl-c-api-00.txt share/doc/html/cyrus-sasl/draft-sasl-login.txt share/doc/html/cyrus-sasl/draft-zeilenga-sasl-anon-01.txt -share/doc/html/cyrus-sasl/draft-zeilenga-sasl-plain-01.txt +share/doc/html/cyrus-sasl/draft-zeilenga-sasl-plain-01.txt share/doc/html/cyrus-sasl/gssapi.html share/doc/html/cyrus-sasl/index.html share/doc/html/cyrus-sasl/install.html share/doc/html/cyrus-sasl/macosx.html -share/doc/html/cyrus-sasl/mechanisms.html +share/doc/html/cyrus-sasl/mechanisms.html share/doc/html/cyrus-sasl/options.html share/doc/html/cyrus-sasl/plugprog.html share/doc/html/cyrus-sasl/programming.html diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile index 4a17e0d714b..da2b025a227 100644 --- a/security/kth-krb4/Makefile +++ b/security/kth-krb4/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.22 2002/10/29 13:56:50 joda Exp $ +# $NetBSD: Makefile,v 1.23 2002/12/23 16:29:02 cjep Exp $ # DISTNAME= krb4-1.2.1 -PKGNAME= kth-krb4-1.2.1 +PKGNAME= kth-krb4-1.2.1 CATEGORIES= security net MASTER_SITES= ftp://ftp.pdc.kth.se/pub/krb/src/ diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile index 0718836ccc5..37065017a74 100644 --- a/sysutils/apcupsd/Makefile +++ b/sysutils/apcupsd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2002/12/01 22:32:25 bouyer Exp $ +# $NetBSD: Makefile,v 1.19 2002/12/23 16:31:29 cjep Exp $ DISTNAME= apcupsd-3.8.5 CATEGORIES= sysutils @@ -45,7 +45,6 @@ CONF_FILES_PERMS+= ${EGDIR}/mainsback ${PKG_SYSCONFDIR}/mainsback ${ROOT_USER} $ SUPPORT_FILES_PERMS= ${EGDIR}/apccontrol ${PKG_SYSCONFDIR}/apccontrol ${ROOT_USER} ${ROOT_GROUP} 755 RCD_SCRIPTS= apcupsd - # we should probably allow the tty to be set in /etc/mk.conf too # post-build: @@ -88,7 +87,6 @@ HTMLDOCS= apcaccess.html apcnisd.html apctest.html apcupsd-styles.css \ upgrading_to_3_7_0.html upsbible.html usb.html win32.html \ wininstall1.gif wininstall2.gif wininstall3.gif wininstall4.gif \ wininstall5.gif wininstall6.gif wininstall7.gif - post-install: ${INSTALL_DATA} ${WRKDIR}/apcupsd.master.conf \ @@ -106,7 +104,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/manual/${file} \ ${PREFIX}/share/doc/html/apcupsd .endfor - .include "../../devel/gettext-lib/buildlink2.mk" diff --git a/sysutils/mgm/Makefile b/sysutils/mgm/Makefile index 86656133ef8..aa73c2093f8 100644 --- a/sysutils/mgm/Makefile +++ b/sysutils/mgm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/10/08 07:13:11 lukem Exp $ +# $NetBSD: Makefile,v 1.2 2002/12/23 16:31:46 cjep Exp $ DISTNAME= mgm-1.1 CATEGORIES= sysutils @@ -40,7 +40,7 @@ do-install: ${INSTALL_DATA} $$FILE ${MGM_PERL_DIR}/$$DIR; \ done; \ done - ${INSTALL_DATA_DIR} ${MGM_DOC_DIR} + ${INSTALL_DATA_DIR} ${MGM_DOC_DIR} for FILE in ${WRKSRC}/doc/*; do \ ${INSTALL_DATA} $$FILE ${MGM_DOC_DIR}; \ done diff --git a/textproc/crimson/Makefile b/textproc/crimson/Makefile index 882b5d936b0..aaad2800bb8 100644 --- a/textproc/crimson/Makefile +++ b/textproc/crimson/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/10/18 20:58:31 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2002/12/23 16:33:03 cjep Exp $ # # We use the binary distribution of crimson because otherwise we # have a bootstrap-loop between jakarta-ant and crimson, each of which @@ -15,7 +15,7 @@ COMMENT= Apache.org implementation of JAXP, SAX, and DOM WRKSRC= ${WRKDIR}/${PKGNAME} USE_JAVA= run -USE_BUILDLINK2= +USE_BUILDLINK2= NO_PATCH= NO_CONFIGURE= NO_BUILD= diff --git a/textproc/kdoc/Makefile b/textproc/kdoc/Makefile index 4c36bac9248..3560e4126d5 100644 --- a/textproc/kdoc/Makefile +++ b/textproc/kdoc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2002/11/15 00:16:41 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2002/12/23 16:33:21 cjep Exp $ DISTNAME= kdoc-2.0a54 PKGNAME= kdoc-3.0 @@ -7,7 +7,7 @@ CATEGORIES= textproc kde MASTER_SITES= ftp://ftp.kde.org/pub/kde/stable/3.0/src/ \ ftp://ftp.us.kde.org/pub/kde/stable/3.0/src/ \ ftp://ftp.uk.kde.org/pub/kde/stable/3.0/src/ \ - ftp://ftp.de.kde.org/pub/kde/stable/3.0/src/ + ftp://ftp.de.kde.org/pub/kde/stable/3.0/src/ MAINTAINER= wulf@netbsd.org COMMENT= C++ and IDL Class Documentation Tool diff --git a/www/navigator/Makefile.common b/www/navigator/Makefile.common index aa3d01667d5..b16e81d641a 100644 --- a/www/navigator/Makefile.common +++ b/www/navigator/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.58 2002/12/08 01:54:19 mrg Exp $ +# $NetBSD: Makefile.common,v 1.59 2002/12/23 16:33:42 cjep Exp $ # # Common include file for communicator and navigator packages @@ -92,7 +92,7 @@ WRKNAME= ${DISTUNAME} VENDOR_NAME= SunOS 4.1.3 MASTER_SITES= ftp://archive.netscape.com/archive/communicator/${SUB}/ # -.elif (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "sparc64") +.elif (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "sparc64") PLIST_ARCH= solaris-sparc .if !exists(/emul/svr4/usr/lib/ld.so.1) PKG_FAIL_REASON= "${PKGNAME} requires Solaris libraries - see compat_svr4(8)" |