Enable pkgviews installation. Patches provided by Joachim Kuebart on

tech-pkg@.

21 files changed, 83 insertions, 21 deletions

diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index 908223c3030..755d7ab303e 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2004/04/17 19:24:37 grant Exp $
+# $NetBSD: Makefile,v 1.38 2004/05/31 16:47:47 minskim Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/04/27 16:06:15 ache Exp
 #
 
@@ -15,6 +15,8 @@ COMMENT=	Create/update ZIP files compatible with pkzip
 
 BUILD_DEPENDS=	unzip-[0-9]*:../../archivers/unzip
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 EXTRACT_ONLY=	zip23.tar.gz
 MAKEFILE=	unix/Makefile
 MAKE_FLAGS=	LOCAL_ZIP="${CFLAGS}" LFLAGS1="${_STRIPFLAG_CC}"
@@ -40,6 +42,8 @@ CFLAGS+=	-DHAVE_DIRENT_H
 
 USE_BUILDLINK3=	yes
 
+INSTALLATION_DIRS=	bin man/man1
+
 post-extract:
 	@cd ${WRKSRC} && ${LOCALBASE}/bin/unzip -qo ${DISTDIR}/zcrypt29.zip
 
diff --git a/audio/amp/Makefile b/audio/amp/Makefile
index 445caa11079..936fcb0cd4c 100644
--- a/audio/amp/Makefile
+++ b/audio/amp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/03/11 18:19:08 xtraeme Exp $
+# $NetBSD: Makefile,v 1.17 2004/05/31 16:47:47 minskim Exp $
 #
 
 DISTNAME=	amp-0.7.6
@@ -13,9 +13,13 @@ COMMENT=	Another mp3 player
 
 NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 USE_BUILDLINK3=	yes
 GNU_CONFIGURE=	yes
 
+INSTALLATION_DIRS=	bin man/man1
+
 do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/amp ${PREFIX}/bin
 	@ ${INSTALL_MAN} ${WRKSRC}/amp.1 ${PREFIX}/man/man1
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index e88c6e93009..14300925a7e 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2004/04/14 09:13:20 adam Exp $
+# $NetBSD: Makefile,v 1.41 2004/05/31 16:47:47 minskim Exp $
 #
 
 DISTNAME=	lame-${VERS}
@@ -14,6 +14,8 @@ VERS=		3.96
 
 LICENSE=	fee-based-commercial-use
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
diff --git a/audio/libmad/Makefile b/audio/libmad/Makefile
index 989656affeb..4b45a7d0f50 100644
--- a/audio/libmad/Makefile
+++ b/audio/libmad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/03/20 03:00:47 snj Exp $
+# $NetBSD: Makefile,v 1.9 2004/05/31 16:47:47 minskim Exp $
 #
 
 DISTNAME=	libmad-0.15.1b
@@ -12,6 +12,8 @@ COMMENT=	High-quality MPEG audio decoder
 
 CONFLICTS=	mad<0.15
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
@@ -19,6 +21,8 @@ USE_LIBTOOL=		YES
 # Avoid an ICE in gcc2 on sparc64
 CONFIGURE_ENV+=		F77=${FALSE}
 
+INSTALLATION_DIRS=	lib/pkgconfig
+
 post-build:
 	${SED}	-e 's,@PREFIX@,${PREFIX},g'			\
 		-e 's,@VERSION@,${PKGVERSION},g'		\
diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index f78a6137e43..68d2593eb9d 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/05/03 22:19:08 snj Exp $
+# $NetBSD: Makefile,v 1.22 2004/05/31 16:47:47 minskim Exp $
 #
 
 DISTNAME=	libsndfile-1.0.9
@@ -9,6 +9,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.mega-nerd.com/libsndfile/
 COMMENT=	Library for reading and writing audio files
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index caf0b8ed3de..88165e4bcbb 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2004/04/12 23:15:01 salo Exp $
+# $NetBSD: Makefile,v 1.34 2004/05/31 16:47:47 minskim Exp $
 
 DISTNAME=	libvorbis-1.0.1
 CATEGORIES=	devel audio
@@ -8,6 +8,8 @@ MAINTAINER=	lukem@NetBSD.org
 HOMEPAGE=	http://www.xiph.org/ogg/vorbis/
 COMMENT=	Library for the Ogg Vorbis audio encoding format
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
diff --git a/audio/mp3info/Makefile b/audio/mp3info/Makefile
index 564e230f631..ae6535a9862 100644
--- a/audio/mp3info/Makefile
+++ b/audio/mp3info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/02/11 01:46:30 abs Exp $
+# $NetBSD: Makefile,v 1.8 2004/05/31 16:47:47 minskim Exp $
 #
 
 DISTNAME=	mp3info-0.2.16
@@ -10,6 +10,8 @@ COMMENT=	MP3 header and tag information tool
 
 CONFLICTS=	gmp3info-[0-9]*
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 GNU_CONFIGURE=	YES
 USE_LANGUAGES=	c c++
 
diff --git a/chat/sirc/Makefile b/chat/sirc/Makefile
index ecac5000ff5..8ffb7642077 100644
--- a/chat/sirc/Makefile
+++ b/chat/sirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/04/11 06:05:04 snj Exp $
+# $NetBSD: Makefile,v 1.13 2004/05/31 16:47:47 minskim Exp $
 
 DISTNAME=	sirc-2.211
 PKGREVISION=	1
@@ -14,6 +14,8 @@ COMMENT=	IRC client written and programmable in perl
 
 DEPENDS+=	p5-Socket6>=0.07:../../net/p5-Socket6
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 # supports IPv6 (actually, af independent)
 BUILD_DEFS+=	USE_INET6
 
@@ -51,6 +53,8 @@ IRC_SERVER=	${DEFAULT_IRC_SERVER}
 IRC_SERVER=	us.undernet.org
 .endif
 
+INSTALLATION_DIRS=	bin man/man1
+
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/sirc
 	cd ${WRKSRC} ; ( \
diff --git a/chat/vicq/Makefile b/chat/vicq/Makefile
index 899e2adbf1c..946efe0d1d1 100644
--- a/chat/vicq/Makefile
+++ b/chat/vicq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/03/29 08:08:53 xtraeme Exp $
+# $NetBSD: Makefile,v 1.16 2004/05/31 16:47:47 minskim Exp $
 
 DISTNAME=	vicq-0.4.1
 PKGREVISION=	1
@@ -12,6 +12,8 @@ COMMENT=	Simple icq client written in perl
 
 DEPENDS+=	p5-Term-ReadLine>=1.11:../../devel/p5-Term-ReadLine
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 WRKSRC=			${WRKDIR}/vicq
 USE_BUILDLINK3=		YES
 NO_BUILD=		YES
@@ -20,6 +22,8 @@ REPLACE_PERL=		vicq
 PERL5_CONFIGURE=	NO
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/vICQ/.packlist
 
+INSTALLATION_DIRS=	bin man
+
 do-install:
 	(cd ${WRKSRC}; ${PERL5} ./install.pl --prefix=${PREFIX})
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/vicq
diff --git a/devel/libebml/Makefile b/devel/libebml/Makefile
index 7521d4fdbe4..c79d3c517ef 100644
--- a/devel/libebml/Makefile
+++ b/devel/libebml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/05/16 09:30:18 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/05/31 16:47:48 minskim Exp $
 #
 
 DISTNAME=	libebml-0.7.0
@@ -9,6 +9,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.sourceforge.net/projects/ebml/
 COMMENT=	Extensible Binary Meta Language support library
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 USE_BUILDLINK3=	yes
 USE_GNU_TOOLS+=	make
 USE_LANGUAGES=	c++
diff --git a/devel/libscsi/Makefile b/devel/libscsi/Makefile
index 83f07e877ac..a0e0c692991 100644
--- a/devel/libscsi/Makefile
+++ b/devel/libscsi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:31:39 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/05/31 16:47:48 minskim Exp $
 #
 
 DISTNAME=	libscsi-1.6
@@ -8,8 +8,12 @@ MASTER_SITES=	ftp://ftp.emsi.priv.at/pub/netbsd/contrib/
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	FreeBSD SCSI user library
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 MAKE_ENV=	LIBDIR=${PREFIX}/lib MANDIR=${PREFIX}/man NOPIC=1 NOPROFILE=1
 
 MANCOMPRESSED_IF_MANZ=	yes
 
+INSTALLATION_DIRS=	include lib man/cat3 man/man3
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/ghostscript-fonts/Makefile b/fonts/ghostscript-fonts/Makefile
index 6f2fb948559..81e0c95283f 100644
--- a/fonts/ghostscript-fonts/Makefile
+++ b/fonts/ghostscript-fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/05/07 15:25:13 cjep Exp $
+# $NetBSD: Makefile,v 1.13 2004/05/31 16:47:48 minskim Exp $
 
 DISTNAME=		ghostscript-fonts-6.0
 CATEGORIES=		fonts
@@ -22,6 +22,8 @@ GS_FONTS_OTHER=		ghostscript-fonts-other-6.0.tar.gz
 
 CONFLICTS=		ghostscript-[0-5]* ghostscript-x11-[0-5]*
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 DIST_SUBDIR=		ghostscript
 EXTRACT_ONLY=		# empty
 NO_CONFIGURE=		# defined
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index b410313ddc1..618ce57aaa2 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2004/02/21 14:46:50 minskim Exp $
+# $NetBSD: Makefile,v 1.30 2004/05/31 16:47:48 minskim Exp $
 #
 
 DISTNAME=		plotutils-2.4.1
@@ -12,6 +12,8 @@ COMMENT=		Programs and library for plotting scientific data
 
 CONFLICTS+=		plotutils-nox11-[0-9]*
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 USE_BUILDLINK3=		YES
 USE_GCC_SHLIB=		YES
 USE_X11=		YES
diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile
index 98059fc1463..f6bda0b3352 100644
--- a/graphics/qiv/Makefile
+++ b/graphics/qiv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/02/17 15:20:47 snj Exp $
+# $NetBSD: Makefile,v 1.14 2004/05/31 16:47:48 minskim Exp $
 
 DISTNAME=	qiv-1.9-src
 PKGNAME=	${DISTNAME:S/-src//}
@@ -10,10 +10,14 @@ MAINTAINER=	snj@NetBSD.org
 HOMEPAGE=	http://www.klografx.net/qiv/
 COMMENT=	Quick image viewer
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_GNU_TOOLS+=	make
 USE_BUILDLINK3=	yes
 
+INSTALLATION_DIRS=	bin man/man1
+
 .include "../../devel/libgetopt/buildlink3.mk"
 .include "../../graphics/imlib/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
diff --git a/math/fftw2/Makefile b/math/fftw2/Makefile
index 2803a9b1247..431f9a8d242 100644
--- a/math/fftw2/Makefile
+++ b/math/fftw2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/02/19 11:11:31 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2004/05/31 16:47:48 minskim Exp $
 
 DISTNAME=		fftw-2.1.5
 PKGNAME=		fftw2-2.1.5
@@ -10,6 +10,8 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.fftw.org/
 COMMENT=		Collection of fast C routines to compute DFTs
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--enable-shared
 .if ${MACHINE_ARCH} == "i386"
diff --git a/math/libffm/Makefile b/math/libffm/Makefile
index de42a2ae168..f6e3131ad62 100644
--- a/math/libffm/Makefile
+++ b/math/libffm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/02/11 08:31:37 xtraeme Exp $
+# $NetBSD: Makefile,v 1.8 2004/05/31 16:47:48 minskim Exp $
 
 DISTNAME=		libffm.0.28
 PKGNAME=		libffm-0.28
@@ -8,11 +8,15 @@ MASTER_SITES=		ftp://ftp.unix-ag.org/user/nils/
 MAINTAINER=		root@garbled.net
 COMMENT=		Fast alpha-optimized replacement for some libm routines
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 
 ONLY_FOR_PLATFORM=      NetBSD-*-alpha
 
+INSTALLATION_DIRS=	lib include
+
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libffm.a ${PREFIX}/lib/libffm.a
 	${INSTALL_DATA} ${WRKSRC}/libffm.h ${PREFIX}/include/libffm.h
diff --git a/misc/dialog/Makefile b/misc/dialog/Makefile
index 089661bafc3..c64365378af 100644
--- a/misc/dialog/Makefile
+++ b/misc/dialog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/04/24 22:46:11 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2004/05/31 16:47:48 minskim Exp $
 
 DISTNAME=       dialog-0.6z
 PKGREVISION=	2
@@ -13,10 +13,14 @@ USE_GNU_TOOLS+=		make
 
 INCOMPAT_CURSES=	NetBSD-1.5* NetBSD-1.6[-_.]* NetBSD-1.6[A-P]-*
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 EGDIR=			${PREFIX}/share/examples/dialog
 EGFILES=		checklist guage infobox inputbox menubox msgbox
 EGFILES+=		radiolist textbox yesno
 
+INSTALLATION_DIRS=	bin man/man1
+
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	cd ${WRKSRC}/samples; for file in ${EGFILES}; do		\
diff --git a/multimedia/xvidcore/Makefile b/multimedia/xvidcore/Makefile
index 2561a1ed3e4..b3e8d497f20 100644
--- a/multimedia/xvidcore/Makefile
+++ b/multimedia/xvidcore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/05/19 11:33:17 drochner Exp $
+# $NetBSD: Makefile,v 1.7 2004/05/31 16:47:48 minskim Exp $
 #
 
 DISTNAME=	xvidcore-1.0.0
@@ -14,6 +14,8 @@ ONLY_FOR_PLATFORM+=	*-*-i386
 
 BUILD_DEPENDS+=	nasm>=0.98.34:../../devel/nasm
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/build/generic
 USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
diff --git a/net/p5-Socket6/Makefile b/net/p5-Socket6/Makefile
index 8cc908860e5..2e42157f0e3 100644
--- a/net/p5-Socket6/Makefile
+++ b/net/p5-Socket6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/04/27 06:05:57 snj Exp $
+# $NetBSD: Makefile,v 1.15 2004/05/31 16:47:48 minskim Exp $
 #
 
 DISTNAME=		Socket6-0.12
@@ -11,6 +11,8 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://theory.uwinnipeg.ca/CPAN/data/libnet/FAQ.html
 COMMENT=		Perl5 module to support getaddrinfo() and getnameinfo()
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Socket6/.packlist
 
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index 79db55f0ccb..d1389aba612 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2004/03/26 02:27:57 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2004/05/31 16:47:48 minskim Exp $
 
 DISTNAME=		w3c-libwww-5.4.0
 PKGNAME=		libwww-5.4.0
@@ -13,6 +13,8 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.w3.org/Library/
 COMMENT=		The W3C Reference Library
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 SITES_libwww-configure-5.4.0nb1.gz=	${MASTER_SITE_LOCAL}
 
diff --git a/x11/fspanel/Makefile b/x11/fspanel/Makefile
index 8b37dd6d88e..c464964277a 100644
--- a/x11/fspanel/Makefile
+++ b/x11/fspanel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/05/12 21:54:42 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/05/31 16:47:48 minskim Exp $
 #
 
 DISTNAME=	fspanel-0.8beta1
@@ -10,12 +10,16 @@ MAINTAINER=	ptiJo@noos.fr
 HOMEPAGE=	http://www.chatjunkies.org/fspanel/
 COMMENT=	F***ing Small Panel
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 USE_BUILDLINK3=	YES
 USE_X11=	YES
 HAS_CONFIGURE=	YES
 
 CFLAGS+=	-DHAVE_XPM -DXFT
 
+INSTALLATION_DIRS=	bin
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fspanel ${PREFIX}/bin/