From T.D.Bishop@kent.ac.uk  Mon Aug 11 03:33:21 2003
Return-Path: <T.D.Bishop@kent.ac.uk>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D69C637B401
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 11 Aug 2003 03:33:21 -0700 (PDT)
Received: from mercury.ukc.ac.uk (mercury.ukc.ac.uk [129.12.21.10])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1A9DB43FB1
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 11 Aug 2003 03:33:21 -0700 (PDT)
	(envelope-from T.D.Bishop@kent.ac.uk)
Received: from pendennis.ukc.ac.uk ([129.12.3.232])
	by mercury.ukc.ac.uk with esmtp (Exim 3.22 #4)
	id 19m9zB-0004Pc-00; Mon, 11 Aug 2003 11:33:09 +0100
Received: from tdb by pendennis.ukc.ac.uk with local (Exim 4.20)
	id 19m9zB-0004cM-9l; Mon, 11 Aug 2003 11:33:09 +0100
Message-Id: <E19m9zB-0004cM-9l@pendennis.ukc.ac.uk>
Date: Mon, 11 Aug 2003 11:33:09 +0100
From: Tim Bishop <tim@bishnet.net>
Sender: "T.D.Bishop" <T.D.Bishop@kent.ac.uk>
Reply-To: Tim Bishop <tim@bishnet.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: tim@bishnet.net
Subject: Tidy port: irc/pircbot
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         55459
>Category:       ports
>Synopsis:       Tidy port: irc/pircbot
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 11 03:40:18 PDT 2003
>Closed-Date:    Tue Aug 12 03:58:04 PDT 2003
>Last-Modified:  Tue Aug 12 10:20:13 PDT 2003
>Originator:     Tim Bishop
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
>Environment:
System: FreeBSD pendennis.ukc.ac.uk 4.8-STABLE FreeBSD 4.8-STABLE #3: Sun Jun 15 16:13:30 BST 2003 tdb@pendennis.ukc.ac.uk:/usr/obj/usr/src/sys/PENDENNIS i386

>Description:
	Correctly use DOCSDIR (as recommended by portlint).
	Also used JAVAJARDIR in Makefile.
	Not sure how to use JAVAJARDIR variable in pkg-plist... suggestions welcome.

>How-To-Repeat:
>Fix:

	Apply patch below.

--- pircbot-1.2.3-vars.diff begins here ---
diff -ruN pircbot.bak/Makefile pircbot/Makefile
--- pircbot.bak/Makefile	Mon Aug 11 01:25:23 2003
+++ pircbot/Makefile	Mon Aug 11 01:45:43 2003
@@ -20,20 +20,20 @@
 USE_JAVA=	1.1+
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/pircbot.jar ${PREFIX}/share/java/classes
+	${INSTALL_DATA} ${WRKSRC}/pircbot.jar ${JAVAJARDIR}
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/pircbot
-	(cd ${WRKSRC}/javadocs && ${TAR} -cf - . | ${TAR} -xf - -C ${PREFIX}/share/doc/pircbot)
+	${MKDIR} ${DOCSDIR}
+	(cd ${WRKSRC}/javadocs && ${TAR} -cf - . | ${TAR} -xf - -C ${DOCSDIR})
 .endif
 
 post-install:
 	@echo "    ---------------------------------------------------------------"
-	@echo "    To use pircbot add ${PREFIX}/share/java/classes/pircbot.jar to"
+	@echo "    To use pircbot add ${JAVAJARDIR}/pircbot.jar to"
 	@echo "    your classpath. A short tutorial can be found here:"
 	@echo "        http://www.jibble.org/pircbot.php"
 .if !defined(NOPORTDOCS)
 	@echo "    pircbot javadoc documentation has also been installed in:"
-	@echo "        ${PREFIX}/share/doc/pircbot"
+	@echo "        ${DOCSDIR}"
 .endif
 	@echo "    ---------------------------------------------------------------"
 
diff -ruN pircbot.bak/pkg-plist pircbot/pkg-plist
--- pircbot.bak/pkg-plist	Mon Aug 11 01:26:47 2003
+++ pircbot/pkg-plist	Mon Aug 11 01:47:02 2003
@@ -1,49 +1,49 @@
 share/java/classes/pircbot.jar
-%%PORTDOCS%%share/doc/pircbot/constant-values.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/class-use/NickAlreadyInUseException.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/class-use/DccChat.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/class-use/DccFileTransfer.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/class-use/DccManager.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/class-use/IdentServer.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/class-use/InputThread.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/class-use/IrcException.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/class-use/OutputThread.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/class-use/PircBot.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/class-use/Queue.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/class-use/Colors.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/class-use/ReplyConstants.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/class-use/User.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/package-use.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/package-frame.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/package-summary.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/package-tree.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/DccChat.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/DccFileTransfer.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/DccManager.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/IdentServer.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/InputThread.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/OutputThread.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/PircBot.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/Queue.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/IrcException.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/NickAlreadyInUseException.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/Colors.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/ReplyConstants.html
-%%PORTDOCS%%share/doc/pircbot/org/jibble/pircbot/User.html
-%%PORTDOCS%%share/doc/pircbot/overview-tree.html
-%%PORTDOCS%%share/doc/pircbot/index-all.html
-%%PORTDOCS%%share/doc/pircbot/deprecated-list.html
-%%PORTDOCS%%share/doc/pircbot/allclasses-frame.html
-%%PORTDOCS%%share/doc/pircbot/allclasses-noframe.html
-%%PORTDOCS%%share/doc/pircbot/index.html
-%%PORTDOCS%%share/doc/pircbot/packages.html
-%%PORTDOCS%%share/doc/pircbot/serialized-form.html
-%%PORTDOCS%%share/doc/pircbot/package-list
-%%PORTDOCS%%share/doc/pircbot/help-doc.html
-%%PORTDOCS%%share/doc/pircbot/pircbot-style.css
-%%PORTDOCS%%share/doc/pircbot/stylesheet.css
-%%PORTDOCS%%@dirrm share/doc/pircbot/org/jibble/pircbot/class-use
-%%PORTDOCS%%@dirrm share/doc/pircbot/org/jibble/pircbot
-%%PORTDOCS%%@dirrm share/doc/pircbot/org/jibble
-%%PORTDOCS%%@dirrm share/doc/pircbot/org
-%%PORTDOCS%%@dirrm share/doc/pircbot
+%%DOCSDIR%%/constant-values.html
+%%DOCSDIR%%/org/jibble/pircbot/class-use/NickAlreadyInUseException.html
+%%DOCSDIR%%/org/jibble/pircbot/class-use/DccChat.html
+%%DOCSDIR%%/org/jibble/pircbot/class-use/DccFileTransfer.html
+%%DOCSDIR%%/org/jibble/pircbot/class-use/DccManager.html
+%%DOCSDIR%%/org/jibble/pircbot/class-use/IdentServer.html
+%%DOCSDIR%%/org/jibble/pircbot/class-use/InputThread.html
+%%DOCSDIR%%/org/jibble/pircbot/class-use/IrcException.html
+%%DOCSDIR%%/org/jibble/pircbot/class-use/OutputThread.html
+%%DOCSDIR%%/org/jibble/pircbot/class-use/PircBot.html
+%%DOCSDIR%%/org/jibble/pircbot/class-use/Queue.html
+%%DOCSDIR%%/org/jibble/pircbot/class-use/Colors.html
+%%DOCSDIR%%/org/jibble/pircbot/class-use/ReplyConstants.html
+%%DOCSDIR%%/org/jibble/pircbot/class-use/User.html
+%%DOCSDIR%%/org/jibble/pircbot/package-use.html
+%%DOCSDIR%%/org/jibble/pircbot/package-frame.html
+%%DOCSDIR%%/org/jibble/pircbot/package-summary.html
+%%DOCSDIR%%/org/jibble/pircbot/package-tree.html
+%%DOCSDIR%%/org/jibble/pircbot/DccChat.html
+%%DOCSDIR%%/org/jibble/pircbot/DccFileTransfer.html
+%%DOCSDIR%%/org/jibble/pircbot/DccManager.html
+%%DOCSDIR%%/org/jibble/pircbot/IdentServer.html
+%%DOCSDIR%%/org/jibble/pircbot/InputThread.html
+%%DOCSDIR%%/org/jibble/pircbot/OutputThread.html
+%%DOCSDIR%%/org/jibble/pircbot/PircBot.html
+%%DOCSDIR%%/org/jibble/pircbot/Queue.html
+%%DOCSDIR%%/org/jibble/pircbot/IrcException.html
+%%DOCSDIR%%/org/jibble/pircbot/NickAlreadyInUseException.html
+%%DOCSDIR%%/org/jibble/pircbot/Colors.html
+%%DOCSDIR%%/org/jibble/pircbot/ReplyConstants.html
+%%DOCSDIR%%/org/jibble/pircbot/User.html
+%%DOCSDIR%%/overview-tree.html
+%%DOCSDIR%%/index-all.html
+%%DOCSDIR%%/deprecated-list.html
+%%DOCSDIR%%/allclasses-frame.html
+%%DOCSDIR%%/allclasses-noframe.html
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/packages.html
+%%DOCSDIR%%/serialized-form.html
+%%DOCSDIR%%/package-list
+%%DOCSDIR%%/help-doc.html
+%%DOCSDIR%%/pircbot-style.css
+%%DOCSDIR%%/stylesheet.css
+@dirrm %%DOCSDIR%%/org/jibble/pircbot/class-use
+@dirrm %%DOCSDIR%%/org/jibble/pircbot
+@dirrm %%DOCSDIR%%/org/jibble
+@dirrm %%DOCSDIR%%/org
+@dirrm %%DOCSDIR%%
--- pircbot-1.2.3-vars.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: leeym 
State-Changed-When: Tue Aug 12 03:57:54 PDT 2003 
State-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=55459 

From: Tim Bishop <tim@bishnet.net>
To: Yen-Ming Lee <leeym@FreeBSD.org>
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: ports/55459: Tidy port: irc/pircbot
Date: Tue, 12 Aug 2003 18:19:26 +0100

 On Tue, Aug 12, 2003 at 03:58:00AM -0700, Yen-Ming Lee wrote:
 > Synopsis: Tidy port: irc/pircbot
 > 
 > State-Changed-From-To: open->closed
 > State-Changed-By: leeym
 > State-Changed-When: Tue Aug 12 03:57:54 PDT 2003
 > State-Changed-Why: 
 > Committed, thanks.
 > 
 > http://www.freebsd.org/cgi/query-pr.cgi?pr=55459
 
 Hi,
 
 My diff has not been applied correctly. Lines in the pkg-plist now
 look like:
 
 %%PORTDOCS%%%%DOCSDIR%%/constant-values.html
 
 That "%%PORTDOCS%%" should not be on the front.
 
 Tim.
 
 -- 
 Tim Bishop
 http://www.bishnet.net/tim
 PGP Key: 0x5AE7D984
>Unformatted:
