From nobody@FreeBSD.org  Fri Mar 26 02:28:53 2004
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DDEE916A4CE
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 26 Mar 2004 02:28:53 -0800 (PST)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C0A7E43D2F
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 26 Mar 2004 02:28:53 -0800 (PST)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.12.10/8.12.10) with ESMTP id i2QASr72028500
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 26 Mar 2004 02:28:53 -0800 (PST)
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.12.10/8.12.10/Submit) id i2QASrQP028499;
	Fri, 26 Mar 2004 02:28:53 -0800 (PST)
	(envelope-from nobody)
Message-Id: <200403261028.i2QASrQP028499@www.freebsd.org>
Date: Fri, 26 Mar 2004 02:28:53 -0800 (PST)
From: michael johnson <ahze@ahze.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [MAINTAINER] net/openverse -- cleanup Makefile
X-Send-Pr-Version: www-2.3

>Number:         64752
>Category:       ports
>Synopsis:       [MAINTAINER] net/openverse -- cleanup Makefile
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    vs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 26 02:30:15 PST 2004
>Closed-Date:    Fri Mar 26 07:20:41 PST 2004
>Last-Modified:  Fri Mar 26 07:20:41 PST 2004
>Originator:     michael johnson
>Release:        
>Organization:
>Environment:
>Description:
Clean up Makefile
>How-To-Repeat:
      
>Fix:
diff -ruN net/openverse.orig/Makefile net/openverse/Makefile
--- net/openverse.orig/Makefile	Fri Mar 26 05:12:00 2004
+++ net/openverse/Makefile	Fri Mar 26 05:26:47 2004
@@ -23,7 +23,7 @@
 STRIP=	# Nothing to Strip
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/bin/wish|${PREFIX}/bin/wish8.2|g' \
+	@${REINPLACE_CMD} -e 's|/usr/bin/wish|${LOCALBASE}/bin/wish8.2|g' \
 	-e 's|/usr/lib/OpenVerse|${PREFIX}/lib/OpenVerse|g' \
 		${WRKSRC}/OpenVerse.tcl
 
@@ -34,13 +34,13 @@
 .endfor
 	${INSTALL_PROGRAM} ${WRKSRC}/OpenVerse.tcl ${WRKSRC}/server.cfg ${WRKSRC}/server.tcl \
 		${WRKSRC}/passageways.txt ${PREFIX}/lib/OpenVerse/
-	${MKDIR} ${PREFIX}/share/doc/OpenVerse/help
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}/help
 	${INSTALL_DATA} ${WRKSRC}/help/* ${PREFIX}/share/doc/OpenVerse/help
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/OpenVerse/README
+.endif
 
 post-install:
-	@${ECHO} "Please read the documentation for OpenVerse located in"
-	@${ECHO} "${PREFIX}/share/doc/OpenVerse/help and ${PREFIX}/share/doc/OpenVerse/README."
 	${LN} -sf ${PREFIX}/lib/OpenVerse/OpenVerse.tcl ${PREFIX}/bin/OpenVerse
 
 .include <bsd.port.mk>
diff -ruN net/openverse.orig/pkg-plist net/openverse/pkg-plist
--- net/openverse.orig/pkg-plist	Fri Mar 26 05:12:00 2004
+++ net/openverse/pkg-plist	Fri Mar 26 05:21:45 2004
@@ -77,12 +77,12 @@
 lib/OpenVerse/server.cfg
 lib/OpenVerse/server.tcl
 lib/OpenVerse/passageways.txt
-share/doc/OpenVerse/help/Technical.ohlp
-share/doc/OpenVerse/help/PServ.ohlp
-share/doc/OpenVerse/help/OpenVerse.ohlp
-share/doc/OpenVerse/help/About.ohlp
-share/doc/OpenVerse/help/FAQ.ohlp
-share/doc/OpenVerse/README
+%%PORTDOCS%%%%DOCSDIR%%/help/Technical.ohlp
+%%PORTDOCS%%%%DOCSDIR%%/help/PServ.ohlp
+%%PORTDOCS%%%%DOCSDIR%%/help/OpenVerse.ohlp
+%%PORTDOCS%%%%DOCSDIR%%/help/About.ohlp
+%%PORTDOCS%%%%DOCSDIR%%/help/FAQ.ohlp
+%%PORTDOCS%%%%DOCSDIR%%/README
 lib/OpenVerse/icons/jump.gif
 lib/OpenVerse/icons/locked.gif~
 lib/OpenVerse/icons/room.gif
@@ -99,6 +99,6 @@
 @dirrm lib/OpenVerse/plugins/Query
 @dirrm lib/OpenVerse/plugins
 @dirrm lib/OpenVerse/rooms
-@dirrm share/doc/OpenVerse/help
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/help
 @dirrm lib/OpenVerse/
-@dirrm share/doc/OpenVerse/
+%%PORTDOCS%%@dirrm %%DOCSDIR%% 

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->vs 
Responsible-Changed-By: vs 
Responsible-Changed-When: Fri Mar 26 05:52:21 PST 2004 
Responsible-Changed-Why:  
I'll handle this one as well. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=64752 
State-Changed-From-To: open->closed 
State-Changed-By: vs 
State-Changed-When: Fri Mar 26 07:20:09 PST 2004 
State-Changed-Why:  
Committed, thanks! 

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