Added REPLACE_PERL for a Perl program that requires it. Didn't add Perl

as a dependency since that program is only useful when KDE is installed.
Chances are high that Perl is then also installed. Bumped PKGREVISION.
Fixed pkglint warnings.

3 files changed, 34 insertions, 30 deletions

diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index 13006f157ac..2dad9c969c7 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.65 2006/03/04 21:30:55 jlam Exp $
+# $NetBSD: Makefile,v 1.66 2006/03/10 23:04:46 rillig Exp $
 
 DISTNAME=	WindowMaker-0.92.0
 PKGNAME=	${DISTNAME:S/WindowMaker/windowmaker/}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	x11 wm windowmaker
 MASTER_SITES=	ftp://ftp.windowmaker.org/pub/source/release/ \
 		ftp://ftp.ics.es.osaka-u.ac.jp/mirrors/WindowMaker/source/release/
@@ -20,14 +20,15 @@ USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-usermenu
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR:Q}
-CONFIGURE_ARGS+=	--with-gnustepdir=${PREFIX}/share/GNUstep
-CONFIGURE_ARGS+=	--with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale
+CONFIGURE_ARGS+=	--with-gnustepdir=${PREFIX:Q}/share/GNUstep
+CONFIGURE_ARGS+=	--with-nlsdir=${PREFIX:Q}/${PKGLOCALEDIR:Q}/locale
 CONFIGURE_ENV+=		LINGUAS=yes
 CONFIGURE_ENV+=		CPP_PATH=${CPP:Q}
 .if ${MACHINE_ARCH} != "i386"
 CONFIGURE_ENV+=		ac_cv_c_inline_asm=no
 .endif
 
+REPLACE_PERL+=		util/wkdemenu.pl
 INSTALL_TARGET=		install-strip
 
 .include "../../mk/bsd.prefs.mk"
@@ -40,7 +41,7 @@ PKG_SYSCONFSUBDIR=	WindowMaker
 EGDIR=			${PREFIX}/share/examples/WindowMaker
 CONF_FILES=
 .for f in WMGLOBAL WMRootMenu WMState WMWindowAttributes WindowMaker
-CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
+CONF_FILES+=		${EGDIR:Q}/${f:Q} ${PKG_SYSCONFDIR:Q}/${f:Q}
 .endfor
 
 # WINDOWMAKER_OPTIONS is a space-separated list of compile-time options
@@ -55,37 +56,40 @@ WINDOWMAKER_OPTIONS?=	gnome kde openlook vdesktop
 
 BUILD_DEFS+=		WINDOWMAKER_OPTIONS
 
-.for OPTION in ${WINDOWMAKER_OPTIONS}
-CONFIGURE_ARGS+=	--enable-${OPTION}
+.for option in ${WINDOWMAKER_OPTIONS}
+CONFIGURE_ARGS+=	--enable-${option:Q}
 .endfor
 
 post-extract:
-	${RM} -f ${WRKSRC}/WindowMaker/Defaults/WMState \
-		 ${WRKSRC}/WindowMaker/Defaults/WMWindowAttributes \
-		 ${WRKSRC}/WindowMaker/Defaults/WindowMaker \
-		 ${WRKSRC}/po/zh_TW.Big5.po
-	for manfile in ${WRKSRC}/doc/*.1x ${WRKSRC}/doc/*/*.1x; \
+	${RM} -f ${WRKSRC:Q}/WindowMaker/Defaults/WMState \
+		 ${WRKSRC:Q}/WindowMaker/Defaults/WMWindowAttributes \
+		 ${WRKSRC:Q}/WindowMaker/Defaults/WindowMaker \
+		 ${WRKSRC:Q}/po/zh_TW.Big5.po
+	set -e; \
+	for manfile in ${WRKSRC:Q}/doc/*.1x ${WRKSRC:Q}/doc/*/*.1x; \
 	do \
-		${MV} $${manfile} `${ECHO} $${manfile} | ${SED} "s/1x$$/1/"`; \
+		${MV} "$$manfile" `${ECHO} "$$manfile" | ${SED} "s/1x$$/1/"`; \
 	done;
-	cd ${WRKSRC} && \
+	set -e; \
+	cd ${WRKSRC:Q} && \
 	for f in WINGs/wapplication.c WindowMaker/Defaults/WindowMaker.in \
 		WPrefs.app/Paths.c WindowMaker/menu* WindowMaker/plmenu*; do \
 		${SED}	-e "s|/usr/local|${PREFIX}|g" \
 			-e "s|${PREFIX}/GNUstep|${PREFIX}/share/GNUstep|g" \
-			$$f > $$f.new && \
-		${MV} $$f.new $$f; \
+			"$$f" > "$$f".new && \
+		${MV} "$$f".new "$$f"; \
 	done
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/WindowMaker/SoundSets
-	${INSTALL_DATA_DIR} ${PREFIX}/share/WindowMaker/Sounds
-	${TOUCH} ${PREFIX}/share/WindowMaker/SoundSets/.directory
-	${TOUCH} ${PREFIX}/share/WindowMaker/Sounds/.directory
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/WindowMaker
-	cd ${WRKSRC}; ${INSTALL_DATA} \
+	${INSTALL_DATA_DIR} ${PREFIX:Q}/share/WindowMaker/SoundSets
+	${INSTALL_DATA_DIR} ${PREFIX:Q}/share/WindowMaker/Sounds
+	${TOUCH} ${PREFIX:Q}/share/WindowMaker/SoundSets/.directory
+	${TOUCH} ${PREFIX:Q}/share/WindowMaker/Sounds/.directory
+	${INSTALL_DATA_DIR} ${PREFIX:Q}/share/doc/WindowMaker
+	cd ${WRKSRC:Q} && \
+	${INSTALL_DATA} \
 		README README.definable-cursor FAQ FAQ.I18N \
-		${PREFIX}/share/doc/WindowMaker
+		${PREFIX:Q}/share/doc/WindowMaker
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/wm/windowmaker/PLIST b/wm/windowmaker/PLIST
index ab80599ae28..c905c7a8c37 100644
--- a/wm/windowmaker/PLIST
+++ b/wm/windowmaker/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2005/10/27 08:10:08 joerg Exp $
+@comment $NetBSD: PLIST,v 1.14 2006/03/10 23:04:46 rillig Exp $
 bin/convertfonts
 bin/get-wings-flags
 bin/get-wraster-flags
@@ -52,10 +52,6 @@ man/sk/man1/wmaker.1
 man/sk/man1/wmsetbg.1
 man/sk/man1/wxcopy.1
 man/sk/man1/wxpaste.1
-share/WINGs/Images.tiff
-share/WINGs/Images.xpm
-share/WINGs/defaultIcon.tiff
-share/WINGs/defaultIcon.xpm
 share/GNUstep/Applications/WPrefs.app/WPrefs
 share/GNUstep/Applications/WPrefs.app/WPrefs.tiff
 share/GNUstep/Applications/WPrefs.app/WPrefs.xpm
@@ -123,6 +119,10 @@ share/GNUstep/Applications/WPrefs.app/tiff/windowfocus.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/workspace.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/workspacename.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/xis.tiff
+share/WINGs/Images.tiff
+share/WINGs/Images.xpm
+share/WINGs/defaultIcon.tiff
+share/WINGs/defaultIcon.xpm
 share/WindowMaker/Backgrounds/BlueImage.jpeg
 share/WindowMaker/IconSets/Default.iconset
 share/WindowMaker/Icons/BitchX.tiff
diff --git a/wm/windowmaker/buildlink3.mk b/wm/windowmaker/buildlink3.mk
index d7794b5d077..dd36104e6ab 100644
--- a/wm/windowmaker/buildlink3.mk
+++ b/wm/windowmaker/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:11:15 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/03/10 23:04:46 rillig Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 WINDOWMAKER_BUILDLINK3_MK:=	${WINDOWMAKER_BUILDLINK3_MK}+
@@ -24,4 +24,4 @@ BUILDLINK_PKGSRCDIR.windowmaker?=	../../wm/windowmaker
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}