From e20be6c347e1a161c46b6d9315b5ab31353dc84d Mon Sep 17 00:00:00 2001
From: agc <agc@pkgsrc.org>
Date: Tue, 13 Apr 1999 15:31:04 +0000
Subject: Remove NOPORTDOCS definition - it was useless anyway, as any attempt
 to build a binary package with this definition would fail as the PLIST is not
 correct.

If a package's documentation is overwhelming, it should arguably be handled
in a separate pre-requisite documentation package.
---
 audio/mikmod/Makefile           | 6 +-----
 cad/spice/Makefile              | 4 +---
 converters/uudeview/Makefile    | 8 +-------
 databases/postgresql/Makefile   | 4 +---
 devel/ddd/Makefile              | 4 +---
 devel/tkcvs/Makefile            | 6 +-----
 graphics/xplot/Makefile         | 6 +-----
 graphics/xv/Makefile            | 4 +---
 japanese/micq/Makefile          | 4 +---
 misc/dt/Makefile                | 4 +---
 mk/mk.conf.example              | 7 +------
 net/bing/Makefile               | 6 +-----
 net/rsync/Makefile              | 6 +-----
 net/samba/Makefile              | 4 +---
 net/tcptrace/Makefile           | 6 +-----
 net/zephyr/Makefile             | 4 +---
 print/gv/Makefile               | 6 +-----
 shells/bash2/Makefile           | 9 +--------
 sysutils/amanda-server/Makefile | 4 +---
 x11/xpns/Makefile               | 6 +-----
 20 files changed, 20 insertions(+), 88 deletions(-)

diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile
index 1f744b7c339..6e74cafcf03 100644
--- a/audio/mikmod/Makefile
+++ b/audio/mikmod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1999/02/20 22:48:24 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 1999/04/13 15:31:04 agc Exp $
 #
 
 DISTNAME=	mikmod-3.0.3
@@ -14,8 +14,6 @@ DEPENDS+=	ncurses-1.9.9g:../../devel/ncurses
 
 USE_GMAKE=	yes
 
-.include "../../mk/bsd.prefs.mk"
-
 post-patch:
 	chmod a+x ${WRKSRC}/build-mikmod.netbsd.sh
 
@@ -25,11 +23,9 @@ do-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/usercode/mikmod ${PREFIX}/bin
 	#${INSTALL_MAN} ${WRKSRC}/docs/mikmod.1 ${PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/mikmod
 .for f in bugs.txt changes.txt future.txt mikmod.doc mikmod.txt tips.txt
 	${INSTALL_DATA} ${WRKSRC}/docs/$f ${PREFIX}/share/doc/mikmod
 .endfor
-.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index f44134b3060..c62f19d32e8 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/01/30 23:18:45 agc Exp $
+# $NetBSD: Makefile,v 1.9 1999/04/13 15:31:05 agc Exp $
 # FreeBSD Id: Makefile,v 1.10 1998/06/08 09:21:37 tg Exp
 #
 
@@ -49,10 +49,8 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/man/man3/mfb.3 ${PREFIX}/man/man3/mfb.3
 
 post-install:
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/examples/spice3
 	${INSTALL_DATA} ${WRKSRC}/examples/*.cir ${PREFIX}/share/examples/spice3
-.endif
 
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/converters/uudeview/Makefile b/converters/uudeview/Makefile
index b9456ae3c7c..2cb19586080 100644
--- a/converters/uudeview/Makefile
+++ b/converters/uudeview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1998/09/28 13:43:35 tron Exp $
+# $NetBSD: Makefile,v 1.11 1999/04/13 15:31:05 agc Exp $
 # FreeBSD Id: Makefile,v 1.15 1998/02/18 22:19:58 hoek Exp
 #
 
@@ -17,16 +17,10 @@ CONFIGURE_ENV=	LDFLAGS=-s
 
 PORTDOCDIR?=	share/doc/uudeview
 
-.include "../../mk/bsd.prefs.mk"
-
 post-install:
-.if !defined(NOPORTDOCS)
 	@${ECHO_MSG} "===>  Copying documents to ${PREFIX}/${PORTDOCDIR}"
 	@${MKDIR} ${PREFIX}/${PORTDOCDIR}
 	@${INSTALL_MAN} ${WRKSRC}/HOWTO ${PREFIX}/${PORTDOCDIR}
 	@${INSTALL_MAN} ${FILESDIR}/porting.notes ${PREFIX}/${PORTDOCDIR}
-.else
-	@${ECHO_MSG} "===>  Not copying available documents"
-.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile
index 90b27abbd11..221caf4c73f 100644
--- a/databases/postgresql/Makefile
+++ b/databases/postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 1999/04/01 13:36:55 agc Exp $
+# $NetBSD: Makefile,v 1.31 1999/04/13 15:31:05 agc Exp $
 # FreeBSD Id: Makefile,v 1.22 1997/12/24 01:21:37 alex Exp
 #
 
@@ -113,7 +113,6 @@ post-install:
 	@/usr/sbin/chown root:${PGGROUP} ${PREFIX}/etc/rc.d/pgsql.sh
 	@${INSTALL} -c -o ${PGUSER} -g ${PGGROUP} -m 444 \
 		${FILESDIR}/post-install-notes ${PREFIX}/${PGUSER}
-.if !defined(NOPORTDOCS)
 	-${MKDIR} ${PREFIX}/share/doc/pgsql
 	${CP} -R ${WRKDIR}/${DISTNAME}/doc/* ${PREFIX}/share/doc/pgsql
 	${RM} -rf ${PREFIX}/share/doc/pgsql/src/CVS \
@@ -121,7 +120,6 @@ post-install:
 		${PREFIX}/share/doc/pgsql/src/sgml/ref/CVS \
 		${PREFIX}/share/doc/pgsql/src/sgml/CVS \
 		${PREFIX}/share/doc/pgsql/CVS
-.endif
 .if !defined(BATCH)
 	@${CAT} ${FILESDIR}/post-install-notes
 .endif
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index 9b03fcdb67c..842a89a6028 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 1999/03/27 23:08:45 frueauf Exp $
+# $NetBSD: Makefile,v 1.21 1999/04/13 15:31:05 agc Exp $
 # $FreeBSD Id: Makefile,v 1.5 1998/02/19 09:43:16 obrien Exp
 #
 
@@ -36,7 +36,6 @@ post-configure:
 	${ECHO} "LIBXM = ${MOTIFLIB}" >> ${WRKSRC}/ddd/Makefile
 
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/ddd
 	${INSTALL_DATA} ${WRKSRC}/PROBLEMS ${PREFIX}/share/doc/ddd
 	${INSTALL_DATA} ${WRKSRC}/doc/README ${PREFIX}/share/doc/ddd
@@ -45,7 +44,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/sample.dddinit ${PREFIX}/share/doc/ddd
 	${GZIP_CMD} ${PREFIX}/share/doc/ddd/ddd-paper.ps
 	${GZIP_CMD} ${PREFIX}/share/doc/ddd/ddd.man.ps
-.endif
 
 check:
 	(cd ${WRKSRC} ; ${GMAKE} check)
diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile
index ff241cbeb3b..b44fa4a5f55 100644
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/04/01 13:38:43 agc Exp $
+# $NetBSD: Makefile,v 1.10 1999/04/13 15:31:05 agc Exp $
 # FreeBSD Id: Makefile,v 1.12 1998/02/24 21:43:24 jseger Exp
 #
 
@@ -20,13 +20,9 @@ post-extract:
 do-install:
 	(cd ${WRKSRC}/tkcvs; ${SETENV} ${MAKE_ENV} sh ./doinstall)
 
-.include "../../mk/bsd.prefs.mk"
-
 post-install:
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/tkcvs
 	${INSTALL_DATA} ${WRKSRC}/README.tkcvs ${PREFIX}/share/doc/tkcvs/
 	${INSTALL_DATA} ${WRKSRC}/tkdiff/README ${PREFIX}/share/doc/tkcvs/README.tkdiff
-.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xplot/Makefile b/graphics/xplot/Makefile
index b73c204a465..acef6bb9c86 100644
--- a/graphics/xplot/Makefile
+++ b/graphics/xplot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1999/01/30 23:18:51 agc Exp $
+# $NetBSD: Makefile,v 1.11 1999/04/13 15:31:05 agc Exp $
 #
 
 DISTNAME=	xplot-0.90
@@ -13,14 +13,10 @@ GNU_CONFIGURE=	yes
 DOCFILES=	ANNOUNCE README README.tcp_plots demo.0 demo.1 demo.2 \
 		demo.3 demo.4 demo.5 demo.6 demo.7
 
-.include "../../mk/bsd.prefs.mk"
-
 post-install:
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/xplot
 .for file in ${DOCFILES}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/xplot
 .endfor
-.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index 2e1cfdff163..fb82f537f44 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 1999/04/07 09:49:33 agc Exp $
+# $NetBSD: Makefile,v 1.18 1999/04/13 15:31:06 agc Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/07/03 07:37:08 asami Exp
 #
 
@@ -37,9 +37,7 @@ post-patch:
 post-install:
 	${MKDIR} ${PREFIX}/share/doc/xv
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xv
-.if !defined(NOPORTDOCS)
 	${INSTALL_DATA} ${WRKSRC}/docs/xvdocs.ps ${PREFIX}/share/doc/xv
-.endif
 
 .if ${OPSYS} == "SunOS"
 MAKE_ENV+=	CPPFLAGS=
diff --git a/japanese/micq/Makefile b/japanese/micq/Makefile
index f0ef481492e..71c65707e90 100644
--- a/japanese/micq/Makefile
+++ b/japanese/micq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/03/30 07:56:03 garbled Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/13 15:31:06 agc Exp $
 
 DISTNAME=	micq
 PKGNAME=	ja-micq-0.3.3
@@ -19,11 +19,9 @@ WRKSRC=		${WRKDIR}/micq981218
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/micq ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
 		${MKDIR} ${PREFIX}/share/doc/micq
 .for file in README TODO WISHLIST commands.txt
 		${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/micq
 .endfor
-.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/dt/Makefile b/misc/dt/Makefile
index 571613b4733..6c3904686d2 100644
--- a/misc/dt/Makefile
+++ b/misc/dt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/12/05 15:48:51 frueauf Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/13 15:31:06 agc Exp $
 #
 
 DISTNAME=	dt-1.1.6
@@ -19,9 +19,7 @@ ALL_TARGET=	depend all
 DTDOCSDIR=	${PREFIX}/share/doc/dt
 
 post-install:
-.if !defined(NOPORTDOCS)
 	${INSTALL_DATA_DIR} ${DTDOCSDIR}
 	(cd ${WRKSRC}; ${INSTALL_DATA} README dt.html example.dtrc ${DTDOCSDIR})
-.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mk/mk.conf.example b/mk/mk.conf.example
index 20169a5e1ed..16b2c5eaad3 100644
--- a/mk/mk.conf.example
+++ b/mk/mk.conf.example
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf.example,v 1.49 1999/03/31 09:04:19 agc Exp $
+# $NetBSD: mk.conf.example,v 1.50 1999/04/13 15:31:07 agc Exp $
 #
 
 # Sample /etc/mk.conf file, which can be used to set specific values
@@ -223,11 +223,6 @@ NMH_MTA=	smtp		# default MTA for use in nmh.
                                 # Possible: smtp or sendmail.
                                 # Default: smtp
 
-#NOPORTDOCS=			# If defined, used to stop installation of
-                                # any documentation.
-                                # Possible: defined, not defined
-                                # Default: not defined.
-
 #NOMANINSTALL=			# Used in expact package to stop installation
                                 # of manual pages.
                                 # Possible: defined, not defined
diff --git a/net/bing/Makefile b/net/bing/Makefile
index 06a71950b4a..981b9347460 100644
--- a/net/bing/Makefile
+++ b/net/bing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/08/09 20:50:57 kim Exp $
+# $NetBSD: Makefile,v 1.8 1999/04/13 15:31:06 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/10/13 09:14:49 tg Exp
 #
 
@@ -11,12 +11,8 @@ MAINTAINER=	packages@netbsd.org
 MAKE_ENV+=	INSTALL_MAN="${INSTALL_MAN}"
 MAKE_ENV+=	INSTALL_PROGRAM="${INSTALL_PROGRAM}"
 
-.include "../../mk/bsd.prefs.mk"
-
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/bing
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/bing
-.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index bcf3e6277b0..1d1a5dd02fc 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 1999/04/08 10:27:30 hubertf Exp $
+# $NetBSD: Makefile,v 1.18 1999/04/13 15:31:06 agc Exp $
 #
 
 DISTNAME=	rsync-2.3.1
@@ -13,13 +13,9 @@ HOMEPAGE=	http://samba.anu.edu.au/rsync/
 
 GNU_CONFIGURE=	yes
 
-.include "../../mk/bsd.prefs.mk"
-
 post-install:
 	@strip ${PREFIX}/bin/rsync
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/rsync
 	${INSTALL_DATA} ${WRKSRC}/tech_report.tex ${PREFIX}/share/doc/rsync
-.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 06411d4c686..afa0e0c2b3b 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 1999/04/09 10:55:33 agc Exp $
+# $NetBSD: Makefile,v 1.26 1999/04/13 15:31:06 agc Exp $
 
 DISTNAME=	samba-2.0.3
 CATEGORIES=	net
@@ -29,7 +29,6 @@ CONFIGURE_ARGS+= --with-swatdir=${PREFIX}/share/swat \
 PLIST_SRC= ${WRKDIR}/.PLIST-src
 
 post-install:
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/samba/faq
 	${MKDIR} ${PREFIX}/share/doc/samba/textdocs
 	for i in ${WRKDIR}/${DISTNAME}/docs/NT4_PlainPassword.reg \
@@ -43,7 +42,6 @@ post-install:
 	for i in ${WRKDIR}/${DISTNAME}/docs/textdocs/* ; do \
 		${INSTALL_DATA} $$i ${PREFIX}/share/doc/samba/textdocs; \
 	done
-.endif
 	@${ECHO} "Installing ${STARTUP_SCRIPT} startup file.";          \
 	${ECHO} '#!/bin/sh' > ${STARTUP_SCRIPT};                        \
 	${ECHO} 'smbd=${PREFIX}/sbin/smbd' >> ${STARTUP_SCRIPT};        \
diff --git a/net/tcptrace/Makefile b/net/tcptrace/Makefile
index 4bd9cdc78ca..1833a59e1cf 100644
--- a/net/tcptrace/Makefile
+++ b/net/tcptrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/08/20 15:17:20 tsarna Exp $
+# $NetBSD: Makefile,v 1.9 1999/04/13 15:31:06 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/07/19 19:43:36 fenner Exp
 #
 
@@ -16,15 +16,11 @@ ALL_TARGET=	tcptrace
 
 DOCFILES=	COPYRIGHT README README.tput_graphs
 
-.include "../../mk/bsd.prefs.mk"
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tcptrace ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/tcptrace
 .for file in ${DOCFILES}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/tcptrace
 .endfor
-.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/zephyr/Makefile b/net/zephyr/Makefile
index c0fbc6f7e2c..646dbeae3a6 100644
--- a/net/zephyr/Makefile
+++ b/net/zephyr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1998/08/20 15:17:22 tsarna Exp $
+# $NetBSD: Makefile,v 1.13 1999/04/13 15:31:06 agc Exp $
 #
 
 DISTNAME=	zephyr-2.0.4
@@ -25,11 +25,9 @@ post-install:
 	${MKDIR} ${ZEPHYR_RCDIR}
 	${SED} -e 's|@prefix@|'${PREFIX}'|g' < ${FILESDIR}/zhm.sh > ${WRKDIR}/zhm.sh
 	${INSTALL_SCRIPT} ${WRKDIR}/zhm.sh ${ZEPHYR_RCDIR}
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${ZEPHYR_DOCDIR}
 	for file in ${ZEPHYR_DOCS} ; do \
 	    ${INSTALL_DATA} ${WRKSRC}/$$file ${ZEPHYR_DOCDIR} ; \
 	    done
-.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/gv/Makefile b/print/gv/Makefile
index 4f2f852a6c0..e54127dc38b 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 1998/12/23 23:09:59 frueauf Exp $
+# $NetBSD: Makefile,v 1.17 1999/04/13 15:31:07 agc Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/07/13 18:49:29 max Exp
 #
 
@@ -14,15 +14,11 @@ DEPENDS+=	ghostscript-5.50:../../print/ghostscript5
 
 USE_IMAKE=	yes
 
-.include "../../mk/bsd.prefs.mk"
-
 post-extract:
 	${MV} ${WRKSRC}/doc/gv.man ${WRKSRC}/source/
 
 post-install:
-.if !defined(NOPORTDOCS)
 	@(cd ${WRKSRC}; ${MAKE} install.doc)
-.endif
 	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index 0046e72fb15..e2ad34e28c6 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 1999/03/22 16:08:33 bad Exp $
+# $NetBSD: Makefile,v 1.19 1999/04/13 15:31:07 agc Exp $
 # FreeBSD Id: Makefile,v 1.26 1997/06/27 23:03:27 ache Exp 
 #
 
@@ -8,12 +8,7 @@ DISTNAME=       bash-${V}
 CATEGORIES=	shells
 MASTER_SITES=	ftp://slc2.ins.cwru.edu/pub/dist/  \
 		${MASTER_SITE_GNU:=/bash/}
-
-.include "../../mk/bsd.prefs.mk"
-
-.if !defined(NOPORTDOCS)
 DISTFILES=      bash-${V}.tar.gz bash-doc-${DV}.tar.gz
-.endif
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/bash/bash.html
@@ -29,7 +24,6 @@ post-install:
 	${CP} /etc/shells /etc/shells.bak
 	(${GREP} -v ${PREFIX}/bin/bash /etc/shells.bak; ${ECHO} ${PREFIX}/bin/bash) >/etc/shells
 	${RM} /etc/shells.bak
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/bash
 	${INSTALL_MAN}  \
 		${WRKDIR}/doc/article.ps  \
@@ -43,6 +37,5 @@ post-install:
 		${WRKDIR}/doc/article.txt  \
 		${PREFIX}/share/doc/bash
 	${GZIP_CMD} ${PREFIX}/share/doc/bash/*.ps
-.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile
index 0b0ea3afec8..05ab1093217 100644
--- a/sysutils/amanda-server/Makefile
+++ b/sysutils/amanda-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/04/04 23:34:46 tron Exp $
+# $NetBSD: Makefile,v 1.4 1999/04/13 15:31:07 agc Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
@@ -35,7 +35,6 @@ CONFIGURE_ARGS+=	--with-user=${AMANDA_USER} \
 CONFIGURE_ENV+=		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 post-install:
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/amanda
 	${MKDIR} ${PREFIX}/share/examples/amanda
 	for i in ${WRKDIR}/${DISTNAME}/docs/* ; do \
@@ -53,6 +52,5 @@ post-install:
 	    ${WRKDIR}/${DISTNAME}/example/disklist; do \
 		${INSTALL_DATA} $$i ${PREFIX}/share/examples/amanda; \
 	done
-.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpns/Makefile b/x11/xpns/Makefile
index 9cedb893452..26dc62d57df 100644
--- a/x11/xpns/Makefile
+++ b/x11/xpns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/01/30 23:18:58 agc Exp $
+# $NetBSD: Makefile,v 1.8 1999/04/13 15:31:07 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/06/29 09:38:20 obrien Exp
 #
 
@@ -16,8 +16,6 @@ NO_WRKSUBDIR=	yes
 MAKEFILE=	makefile
 ALL_TARGET=	pns
 
-.include "../../mk/bsd.prefs.mk"
-
 do-install:
 	${MKDIR} ${PREFIX}/lib/xpns
 	${INSTALL_PROGRAM} ${WRKSRC}/pns ${PREFIX}/lib/xpns/
@@ -26,9 +24,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/xpns ${PREFIX}/bin/xpns
 
 post-install:
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/xpns
 	${CP} ${WRKSRC}/*.net ${PREFIX}/share/doc/xpns/
-.endif
 
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3