From nobody@FreeBSD.org  Wed Dec 27 12:12:45 2000
Return-Path: <nobody@FreeBSD.org>
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id B8DC837B400
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 27 Dec 2000 12:12:45 -0800 (PST)
Received: (from nobody@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id eBRKCjE31813;
	Wed, 27 Dec 2000 12:12:45 -0800 (PST)
	(envelope-from nobody)
Message-Id: <200012272012.eBRKCjE31813@freefall.freebsd.org>
Date: Wed, 27 Dec 2000 12:12:45 -0800 (PST)
From: tkato@prontomail.ne.jp
Sender: nobody@FreeBSD.org
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update port: x11-wm/pwm
X-Send-Pr-Version: www-1.0

>Number:         23894
>Category:       ports
>Synopsis:       Update port: x11-wm/pwm
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    nbm
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 27 12:20:02 PST 2000
>Closed-Date:    Wed Jan 3 02:38:37 PST 2001
>Last-Modified:  Wed Jan 03 02:38:46 PST 2001
>Originator:     KATO Tsuguru
>Release:        4.2-RELEASE i386
>Organization:
>Environment:
>Description:
- USE_XLIB -> USE_X_PREFIX
- Support X11BASE properly
- Support NOPORTDOCS
- Use do-install target
- perl -> PERL

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/x11-wm/pwm/Makefile x11-wm/pwm/Makefile
--- /usr/ports/x11-wm/pwm/Makefile	Wed Oct 11 01:16:24 2000
+++ x11-wm/pwm/Makefile	Thu Dec 28 05:05:09 2000
@@ -1,4 +1,4 @@
-# New ports collection makefile for: pwm
+# New ports collection makefile for:	pwm
 # Date created:		02 Oct 2000
 # Whom:			Neil Blakey-Milner
 #
@@ -7,23 +7,38 @@
 
 PORTNAME=	pwm
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.students.tut.fi/~tuomov/dl/
 
 MAINTAINER=	nbm@FreeBSD.org
 
-USE_XLIB=	YES
-USE_GMAKE=	YES
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
 
 MAN1=		pwm.1x
 
 post-patch:
-	@perl -i -pe 's#^DOCDIR.*$$#DOCDIR=${PREFIX}/share/doc#' ${WRKSRC}/Makefile
-	@perl -i -p \
+	@${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
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/pwm ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/pwm.1x ${MANPREFIX}/man/man1
+	@${MKDIR} ${PREFIX}/etc/pwm
+	${INSTALL_DATA} ${WRKSRC}/etc/pwm/*.conf ${PREFIX}/etc/pwm
+.if !exists(${PREFIX}/etc/pwm/pwm.conf)
+	${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
+.endif
 
 .include <bsd.port.mk>


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->nakai 
Responsible-Changed-By: kevlo 
Responsible-Changed-When: Thu Dec 28 08:00:37 PST 2000 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=23894 
Responsible-Changed-From-To: nakai->nbm 
Responsible-Changed-By: kevlo 
Responsible-Changed-When: Thu Dec 28 08:03:11 PST 2000 
Responsible-Changed-Why:  
Oops, this one is correct 

http://www.freebsd.org/cgi/query-pr.cgi?pr=23894 
State-Changed-From-To: open->closed 
State-Changed-By: nbm 
State-Changed-When: Wed Jan 3 02:38:37 PST 2001 
State-Changed-Why:  
Applied, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=23894 
>Unformatted:
