Change default for zip extraction to leave files as they are.

Previously, zip extraction by default converted to lower case.

Fix some packages that need it and remove -L from some packages
that manually set it.

35 files changed, 188 insertions, 183 deletions

diff --git a/biology/sewer/Makefile b/biology/sewer/Makefile
index bbae6bd69de..cbbad299fed 100644
--- a/biology/sewer/Makefile
+++ b/biology/sewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/05/26 02:13:16 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2009/08/25 11:56:34 wiz Exp $
 
 DISTNAME=		sewer
 PKGNAME=		sewer-2.6
@@ -22,7 +22,7 @@ NO_BUILD=		YES
 WRKSRC=			${WRKDIR}
 
 pre-install:
-.for goner in readme.txt* cvs images/cvs styles/cvs scripts/cvs
+.for goner in readme.txt* CVS images/CVS styles/CVS scripts/CVS
 	${RM} -fr ${WRKDIR}/${goner}
 .endfor
 
diff --git a/comms/asterisk-sounds-de-x9media/Makefile b/comms/asterisk-sounds-de-x9media/Makefile
index 44ca3cb4efa..668e355fbcd 100644
--- a/comms/asterisk-sounds-de-x9media/Makefile
+++ b/comms/asterisk-sounds-de-x9media/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2008/03/03 05:33:32 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2009/08/25 11:56:34 wiz Exp $
 #
 
 PKGNAME=		asterisk-sounds-de-x9media-20060714
+PKGREVISION=		1
 DISTNAME=		asterisk-x9rita-soundfiles-ger-v4
 CATEGORIES=		comms
 MASTER_SITES=		http://www.x9media.com/downloads/
diff --git a/comms/asterisk-sounds-de-x9media/PLIST b/comms/asterisk-sounds-de-x9media/PLIST
index 8e7791c224b..51e9ef0e478 100644
--- a/comms/asterisk-sounds-de-x9media/PLIST
+++ b/comms/asterisk-sounds-de-x9media/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:31:59 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/08/25 11:56:34 wiz Exp $
 libdata/asterisk/sounds/de/agent-alreadyon.gsm
 libdata/asterisk/sounds/de/agent-incorrect.gsm
 libdata/asterisk/sounds/de/agent-loggedoff.gsm
@@ -90,32 +90,34 @@ libdata/asterisk/sounds/de/tt-allbusy.gsm
 libdata/asterisk/sounds/de/tt-monkeysintro.gsm
 libdata/asterisk/sounds/de/tt-somethingwrong.gsm
 libdata/asterisk/sounds/de/tt-weasels.gsm
+libdata/asterisk/sounds/de/vm-Cust1.gsm
+libdata/asterisk/sounds/de/vm-Cust2.gsm
+libdata/asterisk/sounds/de/vm-Cust3.gsm
+libdata/asterisk/sounds/de/vm-Cust4.gsm
+libdata/asterisk/sounds/de/vm-Cust5.gsm
+libdata/asterisk/sounds/de/vm-Family.gsm
+libdata/asterisk/sounds/de/vm-Friends.gsm
+libdata/asterisk/sounds/de/vm-INBOX.gsm
+libdata/asterisk/sounds/de/vm-Old.gsm
+libdata/asterisk/sounds/de/vm-Work.gsm
 libdata/asterisk/sounds/de/vm-advopts.gsm
 libdata/asterisk/sounds/de/vm-and.gsm
 libdata/asterisk/sounds/de/vm-calldiffnum.gsm
 libdata/asterisk/sounds/de/vm-changeto.gsm
-libdata/asterisk/sounds/de/vm-cust1.gsm
-libdata/asterisk/sounds/de/vm-cust2.gsm
-libdata/asterisk/sounds/de/vm-cust3.gsm
-libdata/asterisk/sounds/de/vm-cust4.gsm
-libdata/asterisk/sounds/de/vm-cust5.gsm
 libdata/asterisk/sounds/de/vm-delete.gsm
 libdata/asterisk/sounds/de/vm-deleted.gsm
 libdata/asterisk/sounds/de/vm-dialout.gsm
 libdata/asterisk/sounds/de/vm-enter-num-to-call.gsm
 libdata/asterisk/sounds/de/vm-extension.gsm
-libdata/asterisk/sounds/de/vm-family.gsm
 libdata/asterisk/sounds/de/vm-first.gsm
 libdata/asterisk/sounds/de/vm-for.gsm
 libdata/asterisk/sounds/de/vm-forward.gsm
 libdata/asterisk/sounds/de/vm-forwardoptions.gsm
-libdata/asterisk/sounds/de/vm-friends.gsm
 libdata/asterisk/sounds/de/vm-from-extension.gsm
 libdata/asterisk/sounds/de/vm-from-phonenumber.gsm
 libdata/asterisk/sounds/de/vm-from.gsm
 libdata/asterisk/sounds/de/vm-goodbye.gsm
 libdata/asterisk/sounds/de/vm-helpexit.gsm
-libdata/asterisk/sounds/de/vm-inbox.gsm
 libdata/asterisk/sounds/de/vm-incorrect-mailbox.gsm
 libdata/asterisk/sounds/de/vm-incorrect.gsm
 libdata/asterisk/sounds/de/vm-instructions.gsm
@@ -141,7 +143,6 @@ libdata/asterisk/sounds/de/vm-nobox.gsm
 libdata/asterisk/sounds/de/vm-nomore.gsm
 libdata/asterisk/sounds/de/vm-nonumber.gsm
 libdata/asterisk/sounds/de/vm-num-i-have.gsm
-libdata/asterisk/sounds/de/vm-old.gsm
 libdata/asterisk/sounds/de/vm-onefor.gsm
 libdata/asterisk/sounds/de/vm-options.gsm
 libdata/asterisk/sounds/de/vm-opts.gsm
@@ -187,7 +188,6 @@ libdata/asterisk/sounds/de/vm-undelete.gsm
 libdata/asterisk/sounds/de/vm-undeleted.gsm
 libdata/asterisk/sounds/de/vm-unknown-caller.gsm
 libdata/asterisk/sounds/de/vm-whichbox.gsm
-libdata/asterisk/sounds/de/vm-work.gsm
 libdata/asterisk/sounds/de/vm-youhave.gsm
 libdata/asterisk/sounds/de/x9-enter-phrase-num-play.gsm
 libdata/asterisk/sounds/de/x9-enter-phrase-num-record.gsm
@@ -214,7 +214,7 @@ libdata/asterisk/sounds/digits/de/16.gsm
 libdata/asterisk/sounds/digits/de/17.gsm
 libdata/asterisk/sounds/digits/de/18.gsm
 libdata/asterisk/sounds/digits/de/19.gsm
-libdata/asterisk/sounds/digits/de/1f.gsm
+libdata/asterisk/sounds/digits/de/1F.gsm
 libdata/asterisk/sounds/digits/de/1n.gsm
 libdata/asterisk/sounds/digits/de/2.gsm
 libdata/asterisk/sounds/digits/de/20.gsm
diff --git a/devel/astyle/Makefile b/devel/astyle/Makefile
index 2d5a2afd843..33eb901c437 100644
--- a/devel/astyle/Makefile
+++ b/devel/astyle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/11/28 19:06:00 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2009/08/25 11:56:34 wiz Exp $
 #
 
 DISTNAME=	astyle_1.13.6.1
@@ -14,8 +14,6 @@ COMMENT=	Reindenter and reformatter of C++, C and Java source code
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-MAKE_FILE=	makefile
-
 HTMLDIR=	${PREFIX}/share/doc/html/astyle
 INSTALLATION_DIRS=	bin ${HTMLDIR}
 
diff --git a/devel/astyle/distinfo b/devel/astyle/distinfo
index ceeac0aff15..adada722b10 100644
--- a/devel/astyle/distinfo
+++ b/devel/astyle/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2007/11/28 19:06:01 joerg Exp $
+$NetBSD: distinfo,v 1.8 2009/08/25 11:56:34 wiz Exp $
 
 SHA1 (astyle_1.13.6.1.zip) = 4e0172fe30986d68c61b4a7c1638a1fc42ea0675
 RMD160 (astyle_1.13.6.1.zip) = 74030324515be84e0e7499edc2503d0e549673ba
 Size (astyle_1.13.6.1.zip) = 61422 bytes
-SHA1 (patch-aa) = 3e8adb7b979188f9828b3ae22d8037008975fb5b
+SHA1 (patch-aa) = 67bb1b1802e74bc264cb951a55075982c566d463
 SHA1 (patch-ab) = c9b21d45f53331411425a734971f003d415b11e7
 SHA1 (patch-ac) = d143f2cd5ef3d15317d8dbe01be98f3a9a862ec6
diff --git a/devel/astyle/patches/patch-aa b/devel/astyle/patches/patch-aa
index f74d45e7fdb..19bfe799637 100644
--- a/devel/astyle/patches/patch-aa
+++ b/devel/astyle/patches/patch-aa
@@ -1,20 +1,19 @@
-$NetBSD: patch-aa,v 1.4 2007/11/28 19:06:01 joerg Exp $
+$NetBSD: patch-aa,v 1.5 2009/08/25 11:56:34 wiz Exp $
 
---- makefile.orig	2000-02-11 12:02:10.000000000 +1100
-+++ makefile
+--- Makefile.orig	2000-02-11 12:02:10.000000000 +0000
++++ Makefile
 @@ -1,14 +1,19 @@
  # "Artistic Style" Makefile
  
 -CPPFLAGS = -Wall -Wno-sign-compare -O2
--OBJS = ASResource.o ASBeautifier.o ASFormatter.o astyle_main.o
 +#CPPFLAGS = -Wall -Wno-sign-compare -O2
-+OBJS = asresource.o asbeautifier.o asformatter.o astyle_main.o
-+
+ OBJS = ASResource.o ASBeautifier.o ASFormatter.o astyle_main.o
+ 
 +all: astyle
 +
 +install:
 +	install -s -c astyle ${DESTDIR}${PREFIX}/bin
- 
++
  astyle: $(OBJS)
 -	g++ $(CPPFLAGS) -o astyle  $(OBJS)
 +	$(CXX) $(CPPFLAGS) $(LDFLAGS) -o astyle  $(OBJS)
diff --git a/devel/rdp/Makefile b/devel/rdp/Makefile
index 53a6643b7cc..f231e7f2fef 100644
--- a/devel/rdp/Makefile
+++ b/devel/rdp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2009/06/30 00:07:14 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2009/08/25 11:56:34 wiz Exp $
 
 DISTNAME=		rdp1_5
 PKGNAME=		rdp-1.5
@@ -16,6 +16,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 MAKE_JOBS_SAFE=		no
 
+EXTRACT_OPTS_ZIP=	-Laqo
 WRKSRC=			${WRKDIR}/rdp
 MAKE_FILE=		makefile
 
diff --git a/editors/uemacs/Makefile b/editors/uemacs/Makefile
index 1274682a9a6..da9092725c3 100644
--- a/editors/uemacs/Makefile
+++ b/editors/uemacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/05/25 14:45:17 tron Exp $
+# $NetBSD: Makefile,v 1.11 2009/08/25 11:56:34 wiz Exp $
 
 DISTNAME=	ue400dev
 PKGNAME=	uemacs-4.0
@@ -11,6 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	"emacs" key sequences compatible full screen editor
 
 WRKSRC=		${WRKDIR}
+EXTRACT_OPTS_ZIP=	-Laqo
 
 post-extract:
 	${CP} -r ${WRKSRC}/freebsd ${WRKSRC}/netbsd
diff --git a/emulators/DatLib/Makefile b/emulators/DatLib/Makefile
index 235bc44e1f3..96d0a98dee8 100644
--- a/emulators/DatLib/Makefile
+++ b/emulators/DatLib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/03/03 19:21:37 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2009/08/25 11:56:36 wiz Exp $
 #
 
 DISTNAME=		datlib221
@@ -17,7 +17,7 @@ USE_TOOLS+=		gmake
 WRKSRC=			${WRKDIR}
 MAKE_FILE=		makefile
 BUILD_TARGET=		datlib
-EXTRACT_OPTS_ZIP=	-Laaqo
+EXTRACT_OPTS_ZIP=	-aaqo
 
 MAKE_ENV+=		RANLIB=${RANLIB:Q}
 INSTALLATION_DIRS=	lib
diff --git a/emulators/DatUtil/Makefile b/emulators/DatUtil/Makefile
index 27576a1d81c..864f11fec82 100644
--- a/emulators/DatUtil/Makefile
+++ b/emulators/DatUtil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2008/03/03 19:21:37 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2009/08/25 11:56:36 wiz Exp $
 #
 
 DISTNAME=		dutil232
@@ -17,7 +17,7 @@ USE_TOOLS+=		gmake
 WRKSRC=			${WRKDIR}
 MAKE_FILE=		makefile
 BUILD_TARGET=		datutil
-EXTRACT_OPTS_ZIP=	-Laaqo
+EXTRACT_OPTS_ZIP=	-aaqo
 
 INSTALLATION_DIRS=	bin
 
diff --git a/emulators/MAMEDiff/Makefile b/emulators/MAMEDiff/Makefile
index 3032d8cdb93..c3ee5e5edd7 100644
--- a/emulators/MAMEDiff/Makefile
+++ b/emulators/MAMEDiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2008/03/03 19:21:37 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2009/08/25 11:56:36 wiz Exp $
 #
 
 DISTNAME=		mdiff226
@@ -17,7 +17,7 @@ USE_TOOLS+=		gmake
 WRKSRC=			${WRKDIR}
 MAKE_FILE=		makefile
 BUILD_TARGET=		mamediff
-EXTRACT_OPTS_ZIP=	-Laaqo
+EXTRACT_OPTS_ZIP=	-aaqo
 INSTALLATION_DIRS=	bin
 
 post-extract:
diff --git a/emulators/ROMBuild/Makefile b/emulators/ROMBuild/Makefile
index bff64099f45..45b2900bfa2 100644
--- a/emulators/ROMBuild/Makefile
+++ b/emulators/ROMBuild/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/03/03 19:21:37 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2009/08/25 11:56:36 wiz Exp $
 #
 
 DISTNAME=		rbuild29
@@ -17,7 +17,7 @@ USE_TOOLS+=		gmake
 WRKSRC=			${WRKDIR}
 MAKE_FILE=		makefile
 BUILD_TARGET=		rombuild
-EXTRACT_OPTS_ZIP=	-Laaqo
+EXTRACT_OPTS_ZIP=	-aaqo
 INSTALLATION_DIRS=	bin
 
 post-extract:
diff --git a/emulators/ROMInfo/Makefile b/emulators/ROMInfo/Makefile
index d12efdf82db..6be26849cb1 100644
--- a/emulators/ROMInfo/Makefile
+++ b/emulators/ROMInfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/03/03 19:21:37 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2009/08/25 11:56:36 wiz Exp $
 #
 
 DISTNAME=		rinfo27
@@ -15,7 +15,7 @@ USE_TOOLS+=		gmake
 WRKSRC=			${WRKDIR}
 MAKE_FILE=		makefile
 BUILD_TARGET=		rominfo
-EXTRACT_OPTS_ZIP=	-Laaqo
+EXTRACT_OPTS_ZIP=	-aaqo
 INSTALLATION_DIRS=	bin
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/fonts/cyberbase-ttf/Makefile b/fonts/cyberbase-ttf/Makefile
index 33f245fa1ca..ced75b8ec7b 100644
--- a/fonts/cyberbase-ttf/Makefile
+++ b/fonts/cyberbase-ttf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2006/02/05 23:09:08 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2009/08/25 11:56:36 wiz Exp $
 #
 
 PKGNAME=	cyberbase-ttf-2.0
-PKGREVISION=	5
+PKGREVISION=	6
 FONT_FILE=	Cyberbase.ZIP
 
 COMMENT=	Cyberbit minus CJK subset, for ISO-8859-x languages
diff --git a/fonts/cyberbase-ttf/PLIST b/fonts/cyberbase-ttf/PLIST
index d12d29d1d37..ea73256a0eb 100644
--- a/fonts/cyberbase-ttf/PLIST
+++ b/fonts/cyberbase-ttf/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:54:10 joerg Exp $
-lib/X11/fonts/TTF/cyberbas.ttf
+@comment $NetBSD: PLIST,v 1.6 2009/08/25 11:56:36 wiz Exp $
+lib/X11/fonts/TTF/Cyberbas.ttf
 share/doc/html/cyberbit-ttf/ReadMe.htm
diff --git a/fonts/cyberbit-ttf/Makefile b/fonts/cyberbit-ttf/Makefile
index 83bc4e37b0c..4a9e235503b 100644
--- a/fonts/cyberbit-ttf/Makefile
+++ b/fonts/cyberbit-ttf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:09:08 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2009/08/25 11:56:36 wiz Exp $
 #
 
 PKGNAME=	cyberbit-ttf-2.0
-PKGREVISION=	5
+PKGREVISION=	6
 FONT_FILE=	Cyberbit.ZIP
 
 COMMENT=	Multilingual TrueType font from Bitstream
diff --git a/fonts/cyberbit-ttf/Makefile.common b/fonts/cyberbit-ttf/Makefile.common
index caf7e2ba73f..4557beaea1e 100644
--- a/fonts/cyberbit-ttf/Makefile.common
+++ b/fonts/cyberbit-ttf/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2009/05/19 08:59:14 wiz Exp $
+# $NetBSD: Makefile.common,v 1.22 2009/08/25 11:56:36 wiz Exp $
 #
 
 DISTNAME=	# empty
@@ -23,7 +23,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 DIST_SUBDIR=	cyberbit-ttf
 
 EXTRACT_ONLY=		${FONT_FILE}
-EXTRACT_OPTS_ZIP=	-Laq
+#EXTRACT_OPTS_ZIP=	-Laq
 
 USE_X11BASE=	YES
 NO_CONFIGURE=	YES
diff --git a/fonts/cyberbit-ttf/PLIST b/fonts/cyberbit-ttf/PLIST
index c2d94028bb1..70bc5b86046 100644
--- a/fonts/cyberbit-ttf/PLIST
+++ b/fonts/cyberbit-ttf/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:54:10 joerg Exp $
-lib/X11/fonts/TTF/cyberbit.ttf
+@comment $NetBSD: PLIST,v 1.6 2009/08/25 11:56:36 wiz Exp $
+lib/X11/fonts/TTF/Cyberbit.ttf
 share/doc/html/cyberbit-ttf/ReadMe.htm
diff --git a/fonts/dbz-ttf/Makefile b/fonts/dbz-ttf/Makefile
index 52dff0ae7f0..35c5ef9e5b3 100644
--- a/fonts/dbz-ttf/Makefile
+++ b/fonts/dbz-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/05/19 08:59:14 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2009/08/25 11:56:35 wiz Exp $
 #
 
 DISTNAME=	dbz
@@ -18,6 +18,7 @@ NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
+EXTRACT_OPTS_ZIP=	-Laqo
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/games/quake3server-osp/Makefile b/games/quake3server-osp/Makefile
index 5de703fd7e2..304971bcac8 100644
--- a/games/quake3server-osp/Makefile
+++ b/games/quake3server-osp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2009/06/05 22:33:53 zafer Exp $
+# $NetBSD: Makefile,v 1.7 2009/08/25 11:56:35 wiz Exp $
 
 DISTNAME=	osp-Quake3-1.03a_full
 PKGNAME=	quake3server-osp-1.03a
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	games net
 MASTER_SITES=	${MASTER_SITE_GENTOO:=distfiles/}
 EXTRACT_SUFX=	.zip
diff --git a/games/quake3server-osp/PLIST b/games/quake3server-osp/PLIST
index b89860edfe2..d5f58e274b8 100644
--- a/games/quake3server-osp/PLIST
+++ b/games/quake3server-osp/PLIST
@@ -1,14 +1,72 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:56:54 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/08/25 11:56:35 wiz Exp $
 lib/lokigames/quake3server/osp/1v1.cfg
-lib/lokigames/quake3server/osp/cfg-defaultmodereference/1v1.cfg
-lib/lokigames/quake3server/osp/cfg-defaultmodereference/clanarena.cfg
-lib/lokigames/quake3server/osp/cfg-defaultmodereference/ctf.cfg
-lib/lokigames/quake3server/osp/cfg-defaultmodereference/ffa.cfg
-lib/lokigames/quake3server/osp/cfg-defaultmodereference/qil.cfg
-lib/lokigames/quake3server/osp/cfg-defaultmodereference/settings.txt
-lib/lokigames/quake3server/osp/cfg-defaultmodereference/team.cfg
-lib/lokigames/quake3server/osp/cfg-gfxexample/gfxdef.cfg
-lib/lokigames/quake3server/osp/cfg-gfxexample/z-osp-misc.pk3
+lib/lokigames/quake3server/osp/Docs/CHN/INSTALL.txt
+lib/lokigames/quake3server/osp/Docs/CHN/OSP_Match_QuickStart.txt
+lib/lokigames/quake3server/osp/Docs/CHN/README.txt
+lib/lokigames/quake3server/osp/Docs/CHN/_CHINESE_TRANSLATIONS_
+lib/lokigames/quake3server/osp/Docs/CHN/osp-q3-ClientReadme.txt
+lib/lokigames/quake3server/osp/Docs/CHN/osp-q3-Commands.txt
+lib/lokigames/quake3server/osp/Docs/CHN/osp-q3-DecalEditing.txt
+lib/lokigames/quake3server/osp/Docs/CHN/osp-q3-Logging.txt
+lib/lokigames/quake3server/osp/Docs/CHN/osp-q3-MapConfigInfo.txt
+lib/lokigames/quake3server/osp/Docs/CHN/osp-q3-ModeInfo.txt
+lib/lokigames/quake3server/osp/Docs/CHN/osp-q3-PlayerFilters.txt
+lib/lokigames/quake3server/osp/Docs/CHN/osp-q3-ServerGfx.txt
+lib/lokigames/quake3server/osp/Docs/CHN/osp-q3-Variables.txt
+lib/lokigames/quake3server/osp/Docs/CHN/osp-q3-Viewcam.txt
+lib/lokigames/quake3server/osp/Docs/CPM-info.txt
+lib/lokigames/quake3server/osp/Docs/ESP/INSTALL.txt
+lib/lokigames/quake3server/osp/Docs/ESP/OSP Match Quick Start.txt
+lib/lokigames/quake3server/osp/Docs/ESP/README.txt
+lib/lokigames/quake3server/osp/Docs/ESP/_SPANISH_TRANSLATIONS_
+lib/lokigames/quake3server/osp/Docs/ESP/filters.txt
+lib/lokigames/quake3server/osp/Docs/ESP/osp-q3-ClientReadme.txt
+lib/lokigames/quake3server/osp/Docs/ESP/osp-q3-Commands.txt
+lib/lokigames/quake3server/osp/Docs/ESP/osp-q3-ModeInfo.txt
+lib/lokigames/quake3server/osp/Docs/ESP/osp-q3-PlayerFilters.txt
+lib/lokigames/quake3server/osp/Docs/ESP/osp-q3-ServerGfx.txt
+lib/lokigames/quake3server/osp/Docs/ESP/osp-q3-Variables.txt
+lib/lokigames/quake3server/osp/Docs/ESP/osp-q3-Viewcam.txt
+lib/lokigames/quake3server/osp/Docs/ESP/osp-q3-mapConfigInfo.txt
+lib/lokigames/quake3server/osp/Docs/README.txt
+lib/lokigames/quake3server/osp/Docs/RUS/INSTALL.txt
+lib/lokigames/quake3server/osp/Docs/RUS/OSP Match Quick Start.txt
+lib/lokigames/quake3server/osp/Docs/RUS/README.txt
+lib/lokigames/quake3server/osp/Docs/RUS/_RUSSIAN_TRANSLATIONS_
+lib/lokigames/quake3server/osp/Docs/RUS/osp-q3-CQ3Info.txt
+lib/lokigames/quake3server/osp/Docs/RUS/osp-q3-ClientReadme.txt
+lib/lokigames/quake3server/osp/Docs/RUS/osp-q3-Commands.txt
+lib/lokigames/quake3server/osp/Docs/RUS/osp-q3-PlayerFilters.txt
+lib/lokigames/quake3server/osp/Docs/RUS/osp-q3-ServerGfx.txt
+lib/lokigames/quake3server/osp/Docs/RUS/osp-q3-Variables.txt
+lib/lokigames/quake3server/osp/Docs/RUS/osp-q3-Viewcam.txt
+lib/lokigames/quake3server/osp/Docs/osp-q3-CQ3Info.txt
+lib/lokigames/quake3server/osp/Docs/osp-q3-ClientReadme.txt
+lib/lokigames/quake3server/osp/Docs/osp-q3-Commands.txt
+lib/lokigames/quake3server/osp/Docs/osp-q3-DecalEditing.txt
+lib/lokigames/quake3server/osp/Docs/osp-q3-FreezeTag.txt
+lib/lokigames/quake3server/osp/Docs/osp-q3-History.txt
+lib/lokigames/quake3server/osp/Docs/osp-q3-Logging.txt
+lib/lokigames/quake3server/osp/Docs/osp-q3-MapConfigInfo.txt
+lib/lokigames/quake3server/osp/Docs/osp-q3-ModeInfo.txt
+lib/lokigames/quake3server/osp/Docs/osp-q3-PlayerFilters.txt
+lib/lokigames/quake3server/osp/Docs/osp-q3-ServerGfx.txt
+lib/lokigames/quake3server/osp/Docs/osp-q3-Variables.txt
+lib/lokigames/quake3server/osp/Docs/osp-q3-Viewcam.txt
+lib/lokigames/quake3server/osp/INSTALL.txt
+lib/lokigames/quake3server/osp/OSP Config Generator.exe
+lib/lokigames/quake3server/osp/OSP Match Quick Start.txt
+lib/lokigames/quake3server/osp/README.txt
+lib/lokigames/quake3server/osp/VoodooStats-ReadME.txt
+lib/lokigames/quake3server/osp/cfg-DefaultModeReference/1v1.cfg
+lib/lokigames/quake3server/osp/cfg-DefaultModeReference/clanarena.cfg
+lib/lokigames/quake3server/osp/cfg-DefaultModeReference/ctf.cfg
+lib/lokigames/quake3server/osp/cfg-DefaultModeReference/ffa.cfg
+lib/lokigames/quake3server/osp/cfg-DefaultModeReference/qil.cfg
+lib/lokigames/quake3server/osp/cfg-DefaultModeReference/settings.txt
+lib/lokigames/quake3server/osp/cfg-DefaultModeReference/team.cfg
+lib/lokigames/quake3server/osp/cfg-GfxExample/gfxdef.cfg
+lib/lokigames/quake3server/osp/cfg-GfxExample/z-osp-misc.pk3
 lib/lokigames/quake3server/osp/cfg-maps/1v1maps.txt
 lib/lokigames/quake3server/osp/cfg-maps/cbmaps.txt
 lib/lokigames/quake3server/osp/cfg-maps/clanarenamaps.txt
@@ -19,73 +77,17 @@ lib/lokigames/quake3server/osp/clanarena.cfg
 lib/lokigames/quake3server/osp/ctf-public.cfg
 lib/lokigames/quake3server/osp/ctf.cfg
 lib/lokigames/quake3server/osp/description.txt
-lib/lokigames/quake3server/osp/docs/chn/_chinese_translations_
-lib/lokigames/quake3server/osp/docs/chn/install.txt
-lib/lokigames/quake3server/osp/docs/chn/osp-q3-clientreadme.txt
-lib/lokigames/quake3server/osp/docs/chn/osp-q3-commands.txt
-lib/lokigames/quake3server/osp/docs/chn/osp-q3-decalediting.txt
-lib/lokigames/quake3server/osp/docs/chn/osp-q3-logging.txt
-lib/lokigames/quake3server/osp/docs/chn/osp-q3-mapconfiginfo.txt
-lib/lokigames/quake3server/osp/docs/chn/osp-q3-modeinfo.txt
-lib/lokigames/quake3server/osp/docs/chn/osp-q3-playerfilters.txt
-lib/lokigames/quake3server/osp/docs/chn/osp-q3-servergfx.txt
-lib/lokigames/quake3server/osp/docs/chn/osp-q3-variables.txt
-lib/lokigames/quake3server/osp/docs/chn/osp-q3-viewcam.txt
-lib/lokigames/quake3server/osp/docs/chn/osp_match_quickstart.txt
-lib/lokigames/quake3server/osp/docs/chn/readme.txt
-lib/lokigames/quake3server/osp/docs/cpm-info.txt
-lib/lokigames/quake3server/osp/docs/esp/_spanish_translations_
-lib/lokigames/quake3server/osp/docs/esp/filters.txt
-lib/lokigames/quake3server/osp/docs/esp/install.txt
-lib/lokigames/quake3server/osp/docs/esp/osp match quick start.txt
-lib/lokigames/quake3server/osp/docs/esp/osp-q3-clientreadme.txt
-lib/lokigames/quake3server/osp/docs/esp/osp-q3-commands.txt
-lib/lokigames/quake3server/osp/docs/esp/osp-q3-mapconfiginfo.txt
-lib/lokigames/quake3server/osp/docs/esp/osp-q3-modeinfo.txt
-lib/lokigames/quake3server/osp/docs/esp/osp-q3-playerfilters.txt
-lib/lokigames/quake3server/osp/docs/esp/osp-q3-servergfx.txt
-lib/lokigames/quake3server/osp/docs/esp/osp-q3-variables.txt
-lib/lokigames/quake3server/osp/docs/esp/osp-q3-viewcam.txt
-lib/lokigames/quake3server/osp/docs/esp/readme.txt
-lib/lokigames/quake3server/osp/docs/osp-q3-clientreadme.txt
-lib/lokigames/quake3server/osp/docs/osp-q3-commands.txt
-lib/lokigames/quake3server/osp/docs/osp-q3-cq3info.txt
-lib/lokigames/quake3server/osp/docs/osp-q3-decalediting.txt
-lib/lokigames/quake3server/osp/docs/osp-q3-freezetag.txt
-lib/lokigames/quake3server/osp/docs/osp-q3-history.txt
-lib/lokigames/quake3server/osp/docs/osp-q3-logging.txt
-lib/lokigames/quake3server/osp/docs/osp-q3-mapconfiginfo.txt
-lib/lokigames/quake3server/osp/docs/osp-q3-modeinfo.txt
-lib/lokigames/quake3server/osp/docs/osp-q3-playerfilters.txt
-lib/lokigames/quake3server/osp/docs/osp-q3-servergfx.txt
-lib/lokigames/quake3server/osp/docs/osp-q3-variables.txt
-lib/lokigames/quake3server/osp/docs/osp-q3-viewcam.txt
-lib/lokigames/quake3server/osp/docs/readme.txt
-lib/lokigames/quake3server/osp/docs/rus/_russian_translations_
-lib/lokigames/quake3server/osp/docs/rus/install.txt
-lib/lokigames/quake3server/osp/docs/rus/osp match quick start.txt
-lib/lokigames/quake3server/osp/docs/rus/osp-q3-clientreadme.txt
-lib/lokigames/quake3server/osp/docs/rus/osp-q3-commands.txt
-lib/lokigames/quake3server/osp/docs/rus/osp-q3-cq3info.txt
-lib/lokigames/quake3server/osp/docs/rus/osp-q3-playerfilters.txt
-lib/lokigames/quake3server/osp/docs/rus/osp-q3-servergfx.txt
-lib/lokigames/quake3server/osp/docs/rus/osp-q3-variables.txt
-lib/lokigames/quake3server/osp/docs/rus/osp-q3-viewcam.txt
-lib/lokigames/quake3server/osp/docs/rus/readme.txt
 lib/lokigames/quake3server/osp/ffa.cfg
 lib/lokigames/quake3server/osp/filters.txt
 lib/lokigames/quake3server/osp/freezetag-vanilla.cfg
 lib/lokigames/quake3server/osp/freezetag.cfg
 lib/lokigames/quake3server/osp/instagib.cfg
-lib/lokigames/quake3server/osp/install.txt
 lib/lokigames/quake3server/osp/locs/pro-q3dm6.cfg
 lib/lokigames/quake3server/osp/locs/q3dm6.cfg
-lib/lokigames/quake3server/osp/osp config generator.exe
-lib/lokigames/quake3server/osp/osp match quick start.txt
-lib/lokigames/quake3server/osp/readme.txt
 lib/lokigames/quake3server/osp/spectool.cfg
 lib/lokigames/quake3server/osp/team.cfg
 lib/lokigames/quake3server/osp/vm/qagame.qvm
+lib/lokigames/quake3server/osp/voodoo/VoodooStats-ReadME.txt
 lib/lokigames/quake3server/osp/voodoo/c-default.cfg
 lib/lokigames/quake3server/osp/voodoo/c-footer.html
 lib/lokigames/quake3server/osp/voodoo/c-header.html
@@ -256,13 +258,11 @@ lib/lokigames/quake3server/osp/voodoo/log-backup/log-backup
 lib/lokigames/quake3server/osp/voodoo/server/voodoostats42-c-linux.zip
 lib/lokigames/quake3server/osp/voodoo/server/voodoostats42-linux.zip
 lib/lokigames/quake3server/osp/voodoo/server/voodoostats42-win32.zip
-lib/lokigames/quake3server/osp/voodoo/voodoostats-readme.txt
 lib/lokigames/quake3server/osp/voodoo/voodoostats.bat
 lib/lokigames/quake3server/osp/voodoo/voodoostats41-c.bat
 lib/lokigames/quake3server/osp/voodoo/voodoostats41-c.exe
 lib/lokigames/quake3server/osp/voodoo/voodoostats42-c.exe
 lib/lokigames/quake3server/osp/voodoo/vs-preparse.exe
-lib/lokigames/quake3server/osp/voodoostats-readme.txt
 lib/lokigames/quake3server/osp/zz-osp-pak0.pk3
 lib/lokigames/quake3server/osp/zz-osp-pak1.pk3
 lib/lokigames/quake3server/osp/zz-osp-pak2.pk3
diff --git a/games/quakedata/Makefile b/games/quakedata/Makefile
index 343448f7558..66499681ee4 100644
--- a/games/quakedata/Makefile
+++ b/games/quakedata/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:15 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2009/08/25 11:56:36 wiz Exp $
 
 DISTNAME=	quake106
 PKGNAME=	quakedata-1.0
@@ -23,7 +23,6 @@ BUILD_DEPENDS+=	lha-[0-9]*:../../archivers/lha
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 EXTRACT_ELEMENTS=	resource.*
-EXTRACT_OPTS_ZIP=	-qo
 
 WRKSRC=		${WRKDIR}
 NO_BUILD=	YES
diff --git a/graphics/cal3d-examples/Makefile b/graphics/cal3d-examples/Makefile
index 78385ae759b..b89105cc0cb 100644
--- a/graphics/cal3d-examples/Makefile
+++ b/graphics/cal3d-examples/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/01/24 08:33:26 obache Exp $
+# $NetBSD: Makefile,v 1.17 2009/08/25 11:56:35 wiz Exp $
 #
 
 PKGNAME=		cal3d-examples-${CAL3D_VERSION}
@@ -15,15 +15,15 @@ USE_TOOLS+=		automake pax
 
 CONFIGURE_ARGS+=	--with-cal3d=${PREFIX:Q}
 CONFIGURE_ARGS+=	--with-glut=${BUILDLINK_PREFIX.glut:Q}
-CONFIGURE_DIRS=		${WRKSRC}/examples/cally \
-			${WRKSRC}/examples/miniviewer_gl \
-			${WRKSRC}/tools/converter
+CONFIGURE_DIRS=		examples/cally \
+			examples/miniviewer_gl \
+			tools/converter
 CFLAGS+=		-DCAL3D_DATADIR='"${DATADIR}/"'
 LDFLAGS+=		-L${X11BASE}/lib
 LIBS+=			-lm -lGL -lX11 -lGLU -lXi -lXmu
-BUILD_DIRS=		${WRKSRC}/examples/cally \
-			${WRKSRC}/examples/miniviewer_gl \
-			${WRKSRC}/tools/converter
+BUILD_DIRS=		examples/cally \
+			examples/miniviewer_gl \
+			tools/converter
 
 DATADIR=		${PREFIX}/share/cal3d-examples/data
 WRKDATADIR=		${WRKDIR}/thecallydemo-0.9.1b/data
diff --git a/graphics/cal3d-examples/distinfo b/graphics/cal3d-examples/distinfo
index dac3c1e1359..cd032abb46a 100644
--- a/graphics/cal3d-examples/distinfo
+++ b/graphics/cal3d-examples/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 08:45:03 agc Exp $
+$NetBSD: distinfo,v 1.3 2009/08/25 11:56:35 wiz Exp $
 
 SHA1 (TheCallyDemo-0.9.1b.zip) = e4d1d4b14504e0971f5cb56e7daa1133f62ad2b8
 RMD160 (TheCallyDemo-0.9.1b.zip) = bbcb4dec803b754a55d0318aa3c6eb8656dc309b
@@ -6,5 +6,7 @@ Size (TheCallyDemo-0.9.1b.zip) = 2503946 bytes
 SHA1 (cal3d-0.9.1.tar.bz2) = 2e0765caddc972f05f70d3a255862ced1276e039
 RMD160 (cal3d-0.9.1.tar.bz2) = f77dcf34a46a9286020592df16f5b16264839d80
 Size (cal3d-0.9.1.tar.bz2) = 2871094 bytes
-SHA1 (patch-aa) = ec6dc2b56810a7bceeea864410ef1cff997f0501
 SHA1 (patch-ab) = 74ca6b1b75016253bd45e38ba09fce1f2f7573f1
+SHA1 (patch-ac) = 7c71ee949fecf2755d0461962075dda496a6bc51
+SHA1 (patch-ad) = 3128f69512bf3c88d1b04b2f10c9b0ee6660a8df
+SHA1 (patch-ae) = b5e6552950208c996e74bef982b9d2b3a7b06aee
diff --git a/graphics/cal3d-examples/patches/patch-aa b/graphics/cal3d-examples/patches/patch-aa
deleted file mode 100644
index 34292a9d9bb..00000000000
--- a/graphics/cal3d-examples/patches/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/02/10 09:15:39 garbled Exp $
-
---- ../thecallydemo-0.9.1b/data/cally.cfg~	Wed Aug  6 03:57:54 2003
-+++ ../thecallydemo-0.9.1b/data/cally.cfg	Wed Nov  5 05:45:30 2003
-@@ -4,7 +4,7 @@
- # model: cally
- #
- 
--path=data/cally/
-+path=@@DATADIR@@/cally/
- 
- scale=1.0
- 
---- ../thecallydemo-0.9.1b/data/skeleton.cfg~	Wed Aug  6 03:57:54 2003
-+++ ../thecallydemo-0.9.1b/data/skeleton.cfg	Wed Nov  5 05:45:57 2003
-@@ -4,7 +4,7 @@
- # model: skeleton
- #
- 
--path=data/skeleton/
-+path=@@DATADIR@@/skeleton/
- 
- scale=1.0
- 
---- ../thecallydemo-0.9.1b/data/paladin.cfg~	Wed Aug  6 03:57:54 2003
-+++ ../thecallydemo-0.9.1b/data/paladin.cfg	Wed Nov  5 05:45:46 2003
-@@ -4,7 +4,7 @@
- # model: paladin
- #
- 
--path=data/paladin/
-+path=@@DATADIR@@/paladin/
- 
- scale=0.5
- 
diff --git a/graphics/cal3d-examples/patches/patch-ac b/graphics/cal3d-examples/patches/patch-ac
new file mode 100644
index 00000000000..e792f4c8268
--- /dev/null
+++ b/graphics/cal3d-examples/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2009/08/25 11:56:35 wiz Exp $
+
+--- ../TheCallyDemo-0.9.1b/data/cally.cfg.orig	2003-11-29 17:11:52.000000000 +0000
++++ ../TheCallyDemo-0.9.1b/data/cally.cfg
+@@ -4,7 +4,7 @@
+ # model: cally
+ #
+ 
+-path=data/cally/
++path=@@DATADIR@@/cally/
+ 
+ scale=1.0
+ 
diff --git a/graphics/cal3d-examples/patches/patch-ad b/graphics/cal3d-examples/patches/patch-ad
new file mode 100644
index 00000000000..543b4c2c4ae
--- /dev/null
+++ b/graphics/cal3d-examples/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2009/08/25 11:56:35 wiz Exp $
+
+--- ../TheCallyDemo-0.9.1b/data/paladin.cfg.orig	2003-11-29 17:11:54.000000000 +0000
++++ ../TheCallyDemo-0.9.1b/data/paladin.cfg
+@@ -4,7 +4,7 @@
+ # model: paladin
+ #
+ 
+-path=data/paladin/
++path=@@DATADIR@@/paladin/
+ 
+ scale=0.5
+ 
diff --git a/graphics/cal3d-examples/patches/patch-ae b/graphics/cal3d-examples/patches/patch-ae
new file mode 100644
index 00000000000..414ee8739ed
--- /dev/null
+++ b/graphics/cal3d-examples/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2009/08/25 11:56:35 wiz Exp $
+
+--- ../TheCallyDemo-0.9.1b/data/skeleton.cfg.orig	2003-11-29 17:11:54.000000000 +0000
++++ ../TheCallyDemo-0.9.1b/data/skeleton.cfg
+@@ -4,7 +4,7 @@
+ # model: skeleton
+ #
+ 
+-path=data/skeleton/
++path=@@DATADIR@@/skeleton/
+ 
+ scale=1.0
+ 
diff --git a/lang/pforth/Makefile b/lang/pforth/Makefile
index 07cdfa2acf2..80fb9117a12 100644
--- a/lang/pforth/Makefile
+++ b/lang/pforth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/03/04 16:38:12 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2009/08/25 11:56:35 wiz Exp $
 
 DISTNAME=		pfthpc21
 PKGNAME=		pforth-21
@@ -16,7 +16,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 WRKSRC=			${WRKDIR}
 USE_LANGUAGES=		c++
 USE_TOOLS+=		gmake
-MAKE_FILE=		${WRKSRC}/makefile
 
 NOT_FOR_PLATFORM=	*-*-alpha  #segfaults when running ./pforth during build
 
diff --git a/lang/pforth/distinfo b/lang/pforth/distinfo
index 0b9f3e41074..9b6f6c09e5f 100644
--- a/lang/pforth/distinfo
+++ b/lang/pforth/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 09:03:10 agc Exp $
+$NetBSD: distinfo,v 1.6 2009/08/25 11:56:35 wiz Exp $
 
 SHA1 (pfthpc21.zip) = 550de4405f593004ff6e957a1c294bd801167e5b
 RMD160 (pfthpc21.zip) = cd5ab920efad2098351be98f86955d0e10ea61b2
 Size (pfthpc21.zip) = 295565 bytes
-SHA1 (patch-aa) = 8e2c5bcde82e078f341db25d12b79e667cf76c54
+SHA1 (patch-aa) = 7e875a466fb4577457120bf4165adb9339a20193
 SHA1 (patch-ab) = bce3729fabfd196b11562ccdc2e559455e29176e
diff --git a/lang/pforth/patches/patch-aa b/lang/pforth/patches/patch-aa
index 84ff8ffef03..81368a9e140 100644
--- a/lang/pforth/patches/patch-aa
+++ b/lang/pforth/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2004/05/20 18:54:23 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2009/08/25 11:56:35 wiz Exp $
 
---- makefile.orig	1998-04-06 17:13:12.000000000 +0200
-+++ makefile
+--- Makefile.orig	1998-04-06 17:13:12.000000000 +0200
++++ Makefile
 @@ -12,7 +12,7 @@ SOURCEDIR = csrc
  OBJECTDIR = objects
  EMBOBJECTDIR = embobjects
diff --git a/mail/newspipe/Makefile b/mail/newspipe/Makefile
index 62fe107fa3b..ba16bf31409 100644
--- a/mail/newspipe/Makefile
+++ b/mail/newspipe/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2009/02/09 22:56:25 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2009/08/25 11:56:35 wiz Exp $
 #
 
 DISTNAME=		newspipe.1.1.9
 PKGNAME=		${DISTNAME:S/./-/}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=newspipe/}
 EXTRACT_SUFX=		.zip
@@ -39,7 +39,7 @@ do-install:
 	for f in cache.py newspipe.py opml.py; do			\
 	${INSTALL_SCRIPT} $${f} ${DESTDIR}${PREFIX}/share/newspipe;	\
 	done;								\
-	for f in manual.html readme; do					\
+	for f in manual.html README; do					\
 	${INSTALL_DATA} $${f} ${DESTDIR}${PREFIX}/share/doc/newspipe;	\
 	done;								\
 	for f in newspipe.ini test.opml; do				\
diff --git a/mail/newspipe/PLIST b/mail/newspipe/PLIST
index bd2775e2088..6c30b89ccad 100644
--- a/mail/newspipe/PLIST
+++ b/mail/newspipe/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:04:38 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/08/25 11:56:35 wiz Exp $
 bin/newspipe
+share/doc/newspipe/README
 share/doc/newspipe/manual.html
-share/doc/newspipe/readme
 share/examples/newspipe/newspipe.ini
 share/examples/newspipe/test.opml
 share/newspipe/cache.py
diff --git a/mk/extract/extract b/mk/extract/extract
index a5893f00dc8..51c08fbafd0 100755
--- a/mk/extract/extract
+++ b/mk/extract/extract
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: extract,v 1.9 2009/07/08 13:27:52 minskim Exp $
+# $NetBSD: extract,v 1.10 2009/08/25 11:56:35 wiz Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -298,7 +298,7 @@ shar)
 	;;
 
 zip)
-	: ${EXTRACT_OPTS_ZIP=-Laqo}
+	: ${EXTRACT_OPTS_ZIP=-aqo}
 	${TEST} "$exclude" = "no" || exclude_flag="-x"
 	if ${TEST} -n "$exclude_file"; then
 		set -- dummy `${CAT} "$exclude_file"`; shift
diff --git a/sysutils/rfstool/Makefile b/sysutils/rfstool/Makefile
index a3ae4cfc23a..b6472e5c1fa 100644
--- a/sysutils/rfstool/Makefile
+++ b/sysutils/rfstool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/02/22 19:30:06 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2009/08/25 11:56:36 wiz Exp $
 #
 
 DISTNAME=	rfstool-0.14-source
@@ -14,7 +14,7 @@ COMMENT=	Tools to access ReiserFS partitions
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}/rfstool
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}/RFSTOOL
 MAKE_FILE=	makefile.gcc3x
 USE_LANGUAGES=	c++