ports/152261: [PATCH] security/cyrus-sasl: remove invalid option, use dirrmtry, pet portlint

[Sunpoet Po-Chuan Hsieh]

>Number:         152261
>Category:       ports
>Synopsis:       [PATCH] security/cyrus-sasl: remove invalid option, use dirrmtry, pet portlint
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 15 14:40:09 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Sunpoet Po-Chuan Hsieh
>Release:        FreeBSD 8.1-STABLE amd64
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD bonjour.sunpoet.net 8.1-STABLE FreeBSD 8.1-STABLE #0: Sat Oct 23 16:01:16 CST 2010
>Description:
- Remove invalid KERBEROS4 option which depends on a removed port (security/krb4)
- Use dirrmtry on PREFIX/lib/sasl2 where configurations may stay [1]
- Pet portlint

[1]
===>  Deinstalling for security/cyrus-sasl2
===>   Deinstalling cyrus-sasl-2.1.23
pkg_delete: unable to completely remove directory '/usr/local/lib/sasl2'
pkg_delete: couldn't entirely delete package (perhaps the packing list is incorrectly specified?)
To delete Cyrus user permanently, use 'pw userdel cyrus'
To delete Cyrus group permanently, use 'pw groupdel cyrus'

% ls -A`l /usr/local/lib/sasl2/
total 1
drwxr-xr-x   2 root  wheel   1024 Oct  8 10:41 .
drwxr-xr-x  66 root  wheel  41472 Nov 15 22:06 ..
-rwxr-xr-x   1 root  wheel     43 May 13  2008 smtpd.conf

Port maintainer (ume at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- cyrus-sasl-2.1.23.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/security/cyrus-sasl2/Makefile,v
retrieving revision 1.141
diff -u -u -r1.141 Makefile
--- Makefile	2 Aug 2009 19:35:25 -0000	1.141
+++ Makefile	15 Nov 2010 14:20:20 -0000
@@ -137,7 +137,7 @@
 
 .if defined(WITHOUT_PLAIN)
 CONFIGURE_ARGS+=--disable-plain
-PLAIN= "@comment "
+PLAIN=	"@comment "
 .endif
 
 .if defined(WITHOUT_OTP)
@@ -177,15 +177,6 @@
 GSSAPI=	"@comment "
 .endif
 
-# KERBEROS 4 was removed in FreeBSD 5.0-CURRENT
-.if defined(WITH_KERBEROS4)
-LIB_DEPENDS+=	krb.2:${PORTSDIR}/security/krb4
-CONFIGURE_ARGS+=--enable-krb4=${LOCALBASE}/krb4
-.else
-CONFIGURE_ARGS+=--disable-krb4
-EBONES=	"@comment "
-.endif
-
 .if ${OPENSSLBASE} == /usr
 CONFIGURE_ARGS+=--with-openssl=yes
 .else
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/security/cyrus-sasl2/distinfo,v
retrieving revision 1.29
diff -u -u -r1.29 distinfo
--- distinfo	15 May 2009 01:17:57 -0000	1.29
+++ distinfo	15 Nov 2010 14:20:20 -0000
@@ -1,3 +1,2 @@
-MD5 (cyrus-sasl-2.1.23.tar.gz) = 2eb0e48106f0e9cd8001e654f267ecbc
 SHA256 (cyrus-sasl-2.1.23.tar.gz) = 20efcc4040cbab6e89a636a07dcf5720ee07b5c62359a4e7bf2500ef6020b136
 SIZE (cyrus-sasl-2.1.23.tar.gz) = 1613642
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/security/cyrus-sasl2/pkg-plist,v
retrieving revision 1.39
diff -u -u -r1.39 pkg-plist
--- pkg-plist	1 Feb 2007 02:41:55 -0000	1.39
+++ pkg-plist	15 Nov 2010 14:20:20 -0000
@@ -109,5 +109,5 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/windows.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm lib/sasl2
+ at dirrmtry lib/sasl2
 @cwd %%PREFIX%%
--- cyrus-sasl-2.1.23.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: