- Update to version 2003.06.17

PR:		ports/65265
Submitted by:	Ports Fury

4 files changed, 20 insertions, 30 deletions

diff --git a/x11-wm/pwm/Makefile b/x11-wm/pwm/Makefile
index 5eea624f44b8..eb16caf24418 100644
--- a/x11-wm/pwm/Makefile
+++ b/x11-wm/pwm/Makefile
@@ -6,28 +6,29 @@
 #
 
 PORTNAME=	pwm
-PORTVERSION=	1.0
-PORTREVISION=	2
+PORTVERSION=	2003.06.17
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://modeemi.fi/~tuomov/dl/
+MASTER_SITES=	http://modeemi.fi/~tuomov/pwm/dl/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A lightweight window manager with emphasis on usability
 
 USE_X_PREFIX=	yes
-USE_PERL5_BUILD=yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
+MAKE_ENV=	X11_PREFIX="${X11BASE}"
 
 MAN1=		pwm.1x
 
 post-patch:
-	@${PERL} -pi \
-		-e 's#^PREFIX.*$$#PREFIX=${PREFIX}#;' \
-		-e 's#^X11_PREFIX.*$$#X11_PREFIX=${X11BASE}#;' \
-		-e 's#^CC=.*$$#CC=${CC}#;' \
-		-e 's#^CFLAGS=-g -O2 (.*)$$#CFLAGS=${CFLAGS} \1#;' \
-		-e 's#^LDFLAGS=-g (.*)$$#LDFLAGS=${LDFLAGS} \1#;' \
-		${WRKSRC}/system.mk
+	@${REINPLACE_CMD} -e \
+		's|^PREFIX=|PREFIX?=|g ; \
+		 s|^X11_PREFIX=|X11_PREFIX?=|g ; \
+		 s|^CC=|CC?=|g ; \
+		 s|^CFLAGS=-g -O2|CFLAGS+=|g ; \
+		 s|^LDFLAGS=-g|LDFLAGS=|g ; \
+		 s|-pedantic-errors||g' ${WRKSRC}/system.mk
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pwm ${PREFIX}/bin
@@ -38,9 +39,9 @@ do-install:
 	${CP} ${PREFIX}/etc/pwm/sample.conf ${PREFIX}/etc/pwm/pwm.conf
 .endif
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/pwm
-	${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/pwm
-	${INSTALL_DATA} ${WRKSRC}/config.txt ${PREFIX}/share/doc/pwm
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/config.txt ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-wm/pwm/distinfo b/x11-wm/pwm/distinfo
index 7c0ac40b5f08..c5c18eb808fb 100644
--- a/x11-wm/pwm/distinfo
+++ b/x11-wm/pwm/distinfo
@@ -1,2 +1,2 @@
-MD5 (pwm-1.0.tar.gz) = 9a1efe73f597a3303aa94b8d0136779d
-SIZE (pwm-1.0.tar.gz) = 93239
+MD5 (pwm-20030617.tar.gz) = 069f51aa3e1a938675d58b4acff15765
+SIZE (pwm-20030617.tar.gz) = 152149
diff --git a/x11-wm/pwm/files/patch-system.mk b/x11-wm/pwm/files/patch-system.mk
deleted file mode 100644
index b8b286c9c44a..000000000000
--- a/x11-wm/pwm/files/patch-system.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- system.mk.orig	Sat Sep 28 18:57:23 2002
-+++ system.mk	Sat Sep 28 18:57:31 2002
-@@ -55,7 +55,7 @@
- # have unused variables.
- WARN=	-W -Wimplicit -Wreturn-type -Wswitch -Wcomment \
- 	-Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized \
--	-Wparentheses -pedantic-errors
-+	-Wparentheses
- 
- CFLAGS=-g -O2 $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
- LDFLAGS=-g $(LIBS) $(EXTRA_LIBS)
diff --git a/x11-wm/pwm/pkg-plist b/x11-wm/pwm/pkg-plist
index 8525943c62e3..5101370dbb1c 100644
--- a/x11-wm/pwm/pkg-plist
+++ b/x11-wm/pwm/pkg-plist
@@ -7,7 +7,7 @@ etc/pwm/menus-default.conf
 @unexec if cmp -s %B/sample.conf %B/pwm.conf; then rm -f %B/pwm.conf; fi
 etc/pwm/sample.conf
 @exec if [ ! -e %B/pwm.conf ]; then cp %B/sample.conf %B/pwm.conf; fi
-share/doc/pwm/LICENSE
-share/doc/pwm/config.txt
-@dirrm share/doc/pwm
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/config.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm etc/pwm