summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/postgresql/Makefile4
-rw-r--r--graphics/gimp/Makefile4
-rw-r--r--mbone/nte/Makefile8
-rw-r--r--mbone/vat/Makefile8
-rw-r--r--misc/amanda/Makefile12
-rw-r--r--misc/astrolog/Makefile5
-rw-r--r--misc/dotfile/pkg/MESSAGE1
-rw-r--r--misc/mc/Makefile7
-rw-r--r--net/dip/Makefile5
-rw-r--r--shells/zsh/Makefile3
-rw-r--r--sysutils/amanda/Makefile12
-rw-r--r--sysutils/mc/Makefile7
-rw-r--r--www/apache/Makefile7
-rw-r--r--x11/xmove/pkg/DESCR2
14 files changed, 44 insertions, 41 deletions
diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile
index 51c1e33c916..01c770ff9d0 100644
--- a/databases/postgresql/Makefile
+++ b/databases/postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/04/22 14:22:40 agc Exp $
+# $NetBSD: Makefile,v 1.10 1998/05/09 15:24:42 frueauf Exp $
# FreeBSD Id: Makefile,v 1.22 1997/12/24 01:21:37 alex Exp
DISTNAME= postgresql-6.2.1
@@ -8,7 +8,6 @@ MASTER_SITES= ftp://ftp.PostgreSQL.org/pub/ \
MAINTAINER= packages@netbsd.org
-MAKE_ENV+= USE_TCL=true
DEPENDS+= tk-8.0p2:../../x11/tk80
DEPENDS+= tcl-8.0p2:../../lang/tcl80
@@ -21,6 +20,7 @@ PGUSER?= pgsql
USE_GMAKE= YES
USE_PERL5= yes
MAKEFILE= GNUmakefile
+MAKE_ENV+= USE_TCL=true
HAS_CONFIGURE= YES
CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \
--enable-locale \
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 892cf799f0b..598de47ae33 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 1998/05/07 15:26:01 tron Exp $
+# $NetBSD: Makefile,v 1.16 1998/05/09 15:24:42 frueauf Exp $
DISTNAME= gimp-0.99.28
CATEGORIES= graphics
@@ -42,7 +42,7 @@ PLIST_SRC= ${WRKDIR:T}/.PLIST-src
pre-build:
@if [ "$$DISPLAY" = "" ]; then \
- echo "${DISTNAME} can only be built under X11."; \
+ ${ECHO} "${DISTNAME} can only be built under X11."; \
exit 1; \
fi
diff --git a/mbone/nte/Makefile b/mbone/nte/Makefile
index 98c3346b294..311bbff5e8e 100644
--- a/mbone/nte/Makefile
+++ b/mbone/nte/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/05/08 21:25:00 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 1998/05/09 15:24:43 frueauf Exp $
#
DISTNAME= nt.1.5a23
@@ -8,12 +8,12 @@ MASTER_SITES= ftp://cs.ucl.ac.uk/mice/nte/
MAINTAINER= mycroft@NetBSD.ORG
-TK_DIR= ${PKGSRCDIR}/x11/tk80
-TK_SRC= ${TK_DIR}/${WRKDIR:T}/tk8.0
-
BUILD_DEPENDS= ${PKGSRCDIR}/x11/tk80/${WRKDIR:T}/tk8.0/generic/default.h:${TK_DIR}:configure
DEPENDS+= tk-8.0p2:../../x11/tk80
+TK_DIR= ${PKGSRCDIR}/x11/tk80
+TK_SRC= ${TK_DIR}/${WRKDIR:T}/tk8.0
+
RESTRICTED= "Contains DES encryption"
MIRROR_DISTFILE=no
NO_WRKSUBDIR= yes
diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile
index 04208c66191..7f3180aec0c 100644
--- a/mbone/vat/Makefile
+++ b/mbone/vat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1998/05/08 21:28:52 hubertf Exp $
+# $NetBSD: Makefile,v 1.12 1998/05/09 15:24:43 frueauf Exp $
# FreeBSD Id: Makefile,v 1.4 1997/09/11 03:54:43 fenner Exp
#
@@ -9,9 +9,6 @@ DISTFILES= vatsrc-4.0b2.tar.gz
MAINTAINER= mycroft@NetBSD.ORG
-GSM_DIR= ${PKGSRCDIR}/audio/gsm
-GSM_WORK= ${GSM_DIR}/${WRKDIR:T}/gsm-1.0-pl10
-
# If configure is changed to look for libgsm.a in ${PREFIX}/lib, then
# we can use this first BUILD_DEPENDS and save some work.
#BUILD_DEPENDS= ${GSM_WORK}/inc/private.h:${GSM_DIR}:patch
@@ -19,6 +16,9 @@ BUILD_DEPENDS= ${GSM_WORK}/lib/libgsm.a:${GSM_DIR}:build
DEPENDS+= tk-8.0p2:../../x11/tk80
#DEPENDS+= gsm-1.0.10:${GSM_DIR}
+GSM_DIR= ${PKGSRCDIR}/audio/gsm
+GSM_WORK= ${GSM_DIR}/${WRKDIR:T}/gsm-1.0-pl10
+
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= ${MACHINE_ARCH}--netbsd --with-gsm=${GSM_WORK}
INSTALL_TARGET= install install-man
diff --git a/misc/amanda/Makefile b/misc/amanda/Makefile
index 72fb62f02b6..c4c8dc491cb 100644
--- a/misc/amanda/Makefile
+++ b/misc/amanda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/05/07 17:04:05 agc Exp $
+# $NetBSD: Makefile,v 1.9 1998/05/09 15:24:43 frueauf Exp $
# FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
#
@@ -8,22 +8,22 @@ MASTER_SITES= ftp://ftp.cs.umd.edu/pub/amanda/
MAINTAINER= packages@netbsd.org
-USE_PERL5= yes
DEPENDS+= readline-2.2:../../devel/readline
RUN_DEPENDS+= gnuplot:../../graphics/gnuplot
RUN_DEPENDS+= gtar:../../archivers/gtar
AMANDA_USER?= backup
+USE_PERL5= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-user=${AMANDA_USER} --with-group=${AMANDA_USER}
MAKE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}"
CONFIGURE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}"
-MAN8+= amadmin.8 amcheck.8 amdump.8 amflush.8 amlabel.8
-MAN8+= amrestore.8 amtape.8 amanda.8 amcleanup.8 amtoc.8
-MAN8+= amcheckdb.8 amoverview.8 amplot.8 amrecover.8
-MAN8+= amrmtape.8 amverify.8
+MAN8= amadmin.8 amcheck.8 amdump.8 amflush.8 amlabel.8 \
+ amrestore.8 amtape.8 amanda.8 amcleanup.8 amtoc.8 \
+ amcheckdb.8 amoverview.8 amplot.8 amrecover.8 \
+ amrmtape.8 amverify.8
pre-install:
@${SETENV} ${MAKE_ENV} perl ${SCRIPTDIR}/createuser ${AMANDA_USER}
diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index abf89010987..3e6d3c7b479 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/20 11:56:26 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1998/05/09 15:24:44 frueauf Exp $
# FreeBSD Id: Makefile,v 1.12 1997/08/10 22:31:15 fenner Exp
#
@@ -8,11 +8,12 @@ CATEGORIES= misc
MASTER_SITES= http://www.astrolog.org/ftp/ephem/ \
http://www.astrolog.org/ftp/ \
ftp://ftp.kiarchive.ru/pub/unix/magick/astrology/astrolog/
-EPHEM= LRZ5_24 CHI_24 CPJV_24
DISTFILES= ${EXTRACT_ONLY} ${EPHEM}
MAINTAINER= packages@netbsd.org
+EPHEM= LRZ5_24 CHI_24 CPJV_24
+
EXTRACT_ONLY= ${DISTNAME}.shr
EXTRACT_CMD= ${SH}
EXTRACT_ARGS=
diff --git a/misc/dotfile/pkg/MESSAGE b/misc/dotfile/pkg/MESSAGE
index 89528ccaff5..13ca702aec3 100644
--- a/misc/dotfile/pkg/MESSAGE
+++ b/misc/dotfile/pkg/MESSAGE
@@ -1,3 +1,2 @@
Check out dotfile's useful homepage http://www.imada.ou.dk/~blackie/dotfile/
-
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 03816b2a9e0..9c927a04c9a 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/05/08 23:30:05 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 1998/05/09 15:24:44 frueauf Exp $
# FreeBSD Id: Makefile,v 1.16 1997/11/30 19:37:48 vanilla Exp
#
@@ -9,16 +9,17 @@ MASTER_SITE_SUBDIR= utils/file/managers/mc
MAINTAINER= packages@netbsd.org
+DEPENDS+= ncurses-1.9.9g:../../devel/ncurses
+
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-ncurses --without-edit --without-subshell
-DEPENDS+= ncurses-1.9.9g:../../devel/ncurses
MAN1= mc.1 mcedit.1
MAN8= mcserv.8
pre-configure:
for f in `find ${WRKDIR}/. -type f -print|xargs ${GREP} -l '/usr/local'`; do \
- echo patching $$f ; \
+ ${ECHO} patching $$f ; \
${CP} -p $$f $$f.tmp ; \
${SED} -e 's:/usr/local:'${PREFIX}':g' < $$f.tmp > $$f && ${MV} $$f.tmp $$f; \
done
diff --git a/net/dip/Makefile b/net/dip/Makefile
index 630bd236636..97a04642e4d 100644
--- a/net/dip/Makefile
+++ b/net/dip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/04/20 11:56:29 frueauf Exp $
+# $NetBSD: Makefile,v 1.4 1998/05/09 15:24:44 frueauf Exp $
# FreeBSD Id: Makefile,v 1.5 1997/04/30 03:18:07 asami Exp
#
@@ -14,4 +14,7 @@ MAINTAINER= packages@netbsd.org
NO_CONFIGURE= yes
+# Do not list MAN/CAT pages here. It will confuse if MANZ is set.
+# The pkg uses BSD-style-Makefiles itself, so it does the right thing.
+
.include <../../mk/bsd.pkg.mk>
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index ac2caa596d9..a532de63d91 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 1998/04/22 11:05:04 agc Exp $
+# $NetBSD: Makefile,v 1.10 1998/05/09 15:24:45 frueauf Exp $
# FreeBSD Id: Makefile,v 1.26 1997/09/26 08:23:14 torstenb Exp
#
DISTNAME= zsh-3.0.5
-PKGNAME= zsh-3.0.5
CATEGORIES= shells
MASTER_SITES= ftp://ftp.math.gatech.edu/pub/zsh/ \
ftp://ftp.sterling.com/zsh/ \
diff --git a/sysutils/amanda/Makefile b/sysutils/amanda/Makefile
index 72fb62f02b6..c4c8dc491cb 100644
--- a/sysutils/amanda/Makefile
+++ b/sysutils/amanda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/05/07 17:04:05 agc Exp $
+# $NetBSD: Makefile,v 1.9 1998/05/09 15:24:43 frueauf Exp $
# FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
#
@@ -8,22 +8,22 @@ MASTER_SITES= ftp://ftp.cs.umd.edu/pub/amanda/
MAINTAINER= packages@netbsd.org
-USE_PERL5= yes
DEPENDS+= readline-2.2:../../devel/readline
RUN_DEPENDS+= gnuplot:../../graphics/gnuplot
RUN_DEPENDS+= gtar:../../archivers/gtar
AMANDA_USER?= backup
+USE_PERL5= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-user=${AMANDA_USER} --with-group=${AMANDA_USER}
MAKE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}"
CONFIGURE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}"
-MAN8+= amadmin.8 amcheck.8 amdump.8 amflush.8 amlabel.8
-MAN8+= amrestore.8 amtape.8 amanda.8 amcleanup.8 amtoc.8
-MAN8+= amcheckdb.8 amoverview.8 amplot.8 amrecover.8
-MAN8+= amrmtape.8 amverify.8
+MAN8= amadmin.8 amcheck.8 amdump.8 amflush.8 amlabel.8 \
+ amrestore.8 amtape.8 amanda.8 amcleanup.8 amtoc.8 \
+ amcheckdb.8 amoverview.8 amplot.8 amrecover.8 \
+ amrmtape.8 amverify.8
pre-install:
@${SETENV} ${MAKE_ENV} perl ${SCRIPTDIR}/createuser ${AMANDA_USER}
diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile
index 03816b2a9e0..9c927a04c9a 100644
--- a/sysutils/mc/Makefile
+++ b/sysutils/mc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/05/08 23:30:05 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 1998/05/09 15:24:44 frueauf Exp $
# FreeBSD Id: Makefile,v 1.16 1997/11/30 19:37:48 vanilla Exp
#
@@ -9,16 +9,17 @@ MASTER_SITE_SUBDIR= utils/file/managers/mc
MAINTAINER= packages@netbsd.org
+DEPENDS+= ncurses-1.9.9g:../../devel/ncurses
+
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-ncurses --without-edit --without-subshell
-DEPENDS+= ncurses-1.9.9g:../../devel/ncurses
MAN1= mc.1 mcedit.1
MAN8= mcserv.8
pre-configure:
for f in `find ${WRKDIR}/. -type f -print|xargs ${GREP} -l '/usr/local'`; do \
- echo patching $$f ; \
+ ${ECHO} patching $$f ; \
${CP} -p $$f $$f.tmp ; \
${SED} -e 's:/usr/local:'${PREFIX}':g' < $$f.tmp > $$f && ${MV} $$f.tmp $$f; \
done
diff --git a/www/apache/Makefile b/www/apache/Makefile
index 4d10e04fe63..736228021a8 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.7 1998/04/20 11:56:34 frueauf Exp $
+# $NetBSD: Makefile,v 1.8 1998/05/09 15:24:45 frueauf Exp $
# FreeBSD Id: Makefile,v 1.45 1998/02/25 06:23:55 asami Exp
#
DISTNAME= apache_1.3b5
PKGNAME= apache-1.3b5
-WRKROOT= ${WRKDIR}/apache_1.3b5
WRKSRC= ${WRKROOT}/src
CATEGORIES= www
MASTER_SITES= http://www.apache.org/dist/
MAINTAINER= cjs@netbsd.org
+WRKROOT= ${WRKDIR}/apache_1.3b5
+
CONFIGURE_SCRIPT=Configure
HAS_CONFIGURE= YES
@@ -42,7 +43,7 @@ post-patch:
${MV} httpd.conf-dist.new httpd.conf-dist
@cd ${WRKSRC}/support && \
${SED} -e 's#/usr/local/apache/logs/#/var/run/#' \
- -e 's#/usr/local/apache/src/#/usr/pkg/sbin/#' \
+ -e 's#/usr/local/apache/src/#${PREFIX}/sbin/#' \
< apachectl >apachectl.new && \
${MV} apachectl.new apachectl
.if defined(VERS_ID)
diff --git a/x11/xmove/pkg/DESCR b/x11/xmove/pkg/DESCR
index bacd982734e..aa283b85c50 100644
--- a/x11/xmove/pkg/DESCR
+++ b/x11/xmove/pkg/DESCR
@@ -4,5 +4,3 @@ not to mention several bug fixes.
xmove is a pseudoserver (aka proxy server) which allows you to
dynamically move an X application between servers, and screens within
a server.
-
-