From admin@wbiW09.westbend.net  Thu Aug  2 20:30:48 2001
Return-Path: <admin@wbiW09.westbend.net>
Received: from wbiW09.westbend.net (unknown [216.47.253.29])
	by hub.freebsd.org (Postfix) with ESMTP id CDA9B37B403
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  2 Aug 2001 20:30:40 -0700 (PDT)
	(envelope-from admin@wbiW09.westbend.net)
Received: (from root@localhost)
	by wbiW09.westbend.net (8.11.4/8.11.4) id f733TqH31227;
	Thu, 2 Aug 2001 22:29:52 -0500 (CDT)
	(envelope-from admin)
Message-Id: <200108030329.f733TqH31227@wbiW09.westbend.net>
Date: Thu, 2 Aug 2001 22:29:52 -0500 (CDT)
From: "Scot W. Hetzel" <hetzels@westbend.net>
Reply-To: "Scot W. Hetzel" <hetzels@westbend.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Change Cyrus-SASL port to use PORTDOCS, DOCSDIR
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         29404
>Category:       ports
>Synopsis:       Change Cyrus-SASL port to use PORTDOCS, DOCSDIR
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dwcjr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 02 20:40:01 PDT 2001
>Closed-Date:    Sun Aug 12 21:03:48 PDT 2001
>Last-Modified:  Sun Aug 12 21:03:56 PDT 2001
>Originator:     Scot W. Hetzel
>Release:        FreeBSD 4.3-STABLE i386
>Organization:
West Bend Internet
>Environment:
System: FreeBSD wbiW09.westbend.net 4.3-STABLE FreeBSD 4.3-STABLE #6: Sun Jul 22 17:21:04 CDT 2001 root@wbiW09.westbend.net:/usr/obj/usr/src/sys/WBIW09-SMP i386


>Description:
	Change cyrus-sasl port to use the DOCSDIR & PORTDOCS variables.

	This changes the DOCSDIR from share/doc/SASL to share/doc/cyrus-sasl.

	No revision bump needed.

>How-To-Repeat:

>Fix:
	Changed Files:
	    Makefile
	    pkg-plist

diff -ruN cyrus-sasl.orig/Makefile cyrus-sasl/Makefile
--- cyrus-sasl.orig/Makefile	Sat Jun  2 19:06:05 2001
+++ cyrus-sasl/Makefile	Thu Aug  2 22:11:49 2001
@@ -98,14 +98,10 @@
 
 HTDOCS=	gssapi index programming sysadmin
 
-.if defined(NOPORTDOCS)
-NODOCS=	"@comment "
-.endif
-
 PLIST_SUB=	PREFIX=${PREFIX} \
 		GSSAPI=${GSSAPI} \
 		EBONES=${EBONES} \
-		NOPORTDOCS=${NODOCS}
+		DOCSDIR=${DOCSDIR:S/^${PREFIX}\///} \
 
 pre-fetch:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.sasl
@@ -123,16 +119,16 @@
 	@${CHMOD} 755 ${PREFIX}/etc/rc.d/pwcheck.sh
 	${INSTALL} -d -m 770 -o cyrus -g cyrus /var/pwcheck
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/SASL/html
+	@${MKDIR} ${DOCSDIR}/html
 .for file in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/SASL
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .for file in ${DOC2}
-	@${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/SASL
+	@${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
 .endfor
-	@${INSTALL_DATA} ${FILESDIR}/Sendmail.README ${PREFIX}/share/doc/SASL
+	@${INSTALL_DATA} ${FILESDIR}/Sendmail.README ${DOCSDIR}
 .for file in ${HTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${PREFIX}/share/doc/SASL/html
+	@${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCSDIR}
 .endfor
 .endif
 	@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff -ruN cyrus-sasl.orig/pkg-plist cyrus-sasl/pkg-plist
--- cyrus-sasl.orig/pkg-plist	Wed Nov  1 18:16:45 2000
+++ cyrus-sasl/pkg-plist	Thu Aug  2 22:14:48 2001
@@ -34,27 +34,27 @@
 sbin/sasldblistusers
 sbin/saslpasswd
 sbin/pwcheck
-%%NOPORTDOCS%%share/doc/SASL/AUTHORS
-%%NOPORTDOCS%%share/doc/SASL/COPYING
-%%NOPORTDOCS%%share/doc/SASL/ChangeLog
-%%NOPORTDOCS%%share/doc/SASL/INSTALL
-%%NOPORTDOCS%%share/doc/SASL/NEWS
-%%NOPORTDOCS%%share/doc/SASL/README
-%%NOPORTDOCS%%share/doc/SASL/Sendmail.README
-%%NOPORTDOCS%%share/doc/SASL/TODO
-%%NOPORTDOCS%%share/doc/SASL/draft-leach-digest-sasl-05.txt
-%%NOPORTDOCS%%share/doc/SASL/draft-newman-auth-scram-03.txt
-%%NOPORTDOCS%%share/doc/SASL/rfc1321.txt
-%%NOPORTDOCS%%share/doc/SASL/rfc2095.txt
-%%NOPORTDOCS%%share/doc/SASL/rfc2104.txt
-%%NOPORTDOCS%%share/doc/SASL/rfc2222.txt
-%%NOPORTDOCS%%share/doc/SASL/rfc2245.txt
-%%NOPORTDOCS%%share/doc/SASL/html/gssapi.html
-%%NOPORTDOCS%%share/doc/SASL/html/index.html
-%%NOPORTDOCS%%share/doc/SASL/html/programming.html
-%%NOPORTDOCS%%share/doc/SASL/html/sysadmin.html
-%%NOPORTDOCS%%@dirrm share/doc/SASL/html
-%%NOPORTDOCS%%@dirrm share/doc/SASL
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/Sendmail.README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/draft-leach-digest-sasl-05.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-newman-auth-scram-03.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc1321.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc2095.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc2104.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc2222.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc2245.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/gssapi.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/programming.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sysadmin.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/sasl
 @mode ug=rwx,o=
 @cwd /var
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: gnats-admin->freebsd-ports 
Responsible-Changed-By: lioux 
Responsible-Changed-When: Fri Aug 3 09:38:08 PDT 2001 
Responsible-Changed-Why:  
Wrong category, assign it to ports 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=29404 

From: "Scot W. Hetzel" <hetzels@westbend.net>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: RE: pending/29404: Change Cyrus-SASL port to use PORTDOCS, DOCSDIR
Date: Sat, 11 Aug 2001 17:09:41 -0500 (CDT)

 The following patch to the Cyrus-SASL port adds IPv6 Support
 via a patch from Hajimu UMEMOTO.
 
 Could someone apply the patches in this PR before the ports freeze.
 
 Thanks,
 
 Scot W. Hetzel
 
 diff -ruN cyrus-sasl.orig/Makefile cyrus-sasl/Makefile
 --- cyrus-sasl.orig/Makefile	Thu Aug  2 22:11:49 2001
 +++ cyrus-sasl/Makefile	Sat Aug 11 16:50:47 2001
 @@ -7,11 +7,15 @@
  
  PORTNAME=	cyrus-sasl
  PORTVERSION=	1.5.24
 -PORTREVISION=	4
 +PORTREVISION=	5
  CATEGORIES=	security
  MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
  		${MASTER_SITE_LOCAL} \
  		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
 +
 +PATCH_SITES=    http://www.imasy.or.jp/~ume/ipv6/
 +PATCHFILES=     ${DISTNAME}-ipv6-20010321.diff.gz
 +
  MASTER_SITE_SUBDIR=	stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail
  
  MAINTAINER=	hetzels@westbend.net
 diff -ruN cyrus-sasl.orig/distinfo cyrus-sasl/distinfo
 --- cyrus-sasl.orig/distinfo	Mon Sep 18 21:59:28 2000
 +++ cyrus-sasl/distinfo	Sat Aug 11 15:22:20 2001
 @@ -1 +1,2 @@
  MD5 (cyrus-sasl-1.5.24.tar.gz) = ac3837c071c258b80021325936db2583
 +MD5 (cyrus-sasl-1.5.24-ipv6-20010321.diff.gz) = a306953c91d9fbf2f4676ef394b38449
 diff -ruN cyrus-sasl.orig/scripts/configure.sasl cyrus-sasl/scripts/configure.sasl
 --- cyrus-sasl.orig/scripts/configure.sasl	Mon Jul 16 14:52:22 2001
 +++ cyrus-sasl/scripts/configure.sasl	Sat Aug 11 15:25:03 2001
 @@ -21,8 +21,7 @@
  		set ${OPTIONS}
  	fi
  else
 -
 -	if [ "x${ENABLE_DB3}" = "xYES" -o -f ${PREFIX}/lib/libdb3.so.1 ] ; then
 +	if [ "x${ENABLE_DB3}" = "xYES" -o -f ${PREFIX}/lib/libdb3.so ] ; then
  		SET_DB3="ON"
  	else
  		SET_DB3="OFF"

From: "Scot W. Hetzel" <hetzels@westbend.net>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: RE: pending/29404: Change Cyrus-SASL port to use PORTDOCS, DOCSDIR
Date: Sat, 11 Aug 2001 17:41:46 -0500 (CDT)

 Here's a corrected patch for the Makefile.  PATCH* should be below MASTER*
 
 Scot
 
 --- cyrus-sasl.orig/Makefile	Thu Aug  2 22:11:49 2001
 +++ cyrus-sasl/Makefile	Sat Aug 11 17:37:45 2001
 @@ -7,12 +7,15 @@
  
  PORTNAME=	cyrus-sasl
  PORTVERSION=	1.5.24
 -PORTREVISION=	4
 +PORTREVISION=	5
  CATEGORIES=	security
  MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
  		${MASTER_SITE_LOCAL} \
  		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
  MASTER_SITE_SUBDIR=	stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail
 +
 +PATCH_SITES=    http://www.imasy.or.jp/~ume/ipv6/
 +PATCHFILES=     ${DISTNAME}-ipv6-20010321.diff.gz
  
  MAINTAINER=	hetzels@westbend.net
  
Responsible-Changed-From-To: freebsd-ports->dwcjr 
Responsible-Changed-By: dwcjr 
Responsible-Changed-When: Sun Aug 12 08:31:38 PDT 2001 
Responsible-Changed-Why:  
I'll handle this 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=29404 
State-Changed-From-To: open->closed 
State-Changed-By: dwcjr 
State-Changed-When: Sun Aug 12 21:03:48 PDT 2001 
State-Changed-Why:  
Committed, thanks! 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=29404 
>Unformatted:
