ports/105442: security/srp install files in the same place as kerberos ports

[Ruben van Staveren]

>Number:         105442
>Category:       ports
>Synopsis:       security/srp install files in the same place as kerberos ports
>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:   Sun Nov 12 14:50:29 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Ruben van Staveren
>Release:        FreeBSD 6.2-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD helium.verweg.com 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #21: Sat Nov 4 14:31:36 CET 2006 root at helium.verweg.com:/usr/obj/usr/cvsup/6-stable/src/sys/HELIUM-SMP i386


	
>Description:
	security/srp install these files in the same place as the other kerberos
	ports

${PREFIX}/bin/ftp
${PREFIX}/bin/telnet
${PREFIX}/sbin/ftpd
${PREFIX}/sbin/telnetd

>How-To-Repeat:

Install and delete one of the kerberos ports and security/srp. pkg_delete will
complain about missing files

>Fix:

Add srp to CONFLICTS line and vice versa


--- security/srp/Makefile.orig	Sun Nov 12 15:25:20 2006
+++ security/srp/Makefile	Sun Nov 12 15:40:54 2006
@@ -13,6 +13,8 @@
 MAINTAINER=	laszlof at vonostingroup.com
 COMMENT=	Secure Remote Password protocol library, TELNET, and FTP
 
+CONFLICTS=		krb4-[0-9]* krb5-[0-9]* heimdal-[0-9]*
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	INSTALL="/usr/bin/install -C"
 CONFIGURE_ARGS=	--with-openssl=/usr				\
--- security/krb4/Makefile.orig	Sun Nov 12 15:38:44 2006
+++ security/krb4/Makefile	Sun Nov 12 15:40:54 2006
@@ -14,7 +14,7 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	KTH Kerberos 4
 
-CONFLICTS=	krb5-[0-9]* heimdal-[0-9]*
+CONFLICTS=	krb5-[0-9]* heimdal-[0-9]* srp-[0-9]*
 USE_LDCONFIG=	yes
 # Don't remove this.  This port installs several applications
 # which have the same name as some in the base system (e.g.
--- security/krb5/Makefile.orig	Sun Nov 12 15:35:30 2006
+++ security/krb5/Makefile	Sun Nov 12 15:37:34 2006
@@ -17,7 +17,7 @@
 
 BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4
 
-CONFLICTS=		krb4-[0-9]* heimdal-[0-9]*
+CONFLICTS=		krb4-[0-9]* heimdal-[0-9]* srp-[0-9]*
 
 LATEST_LINK=		${PORTNAME}
 KERBEROSV_URL=		http://web.mit.edu/kerberos/
--- security/heimdal/Makefile.orig	Sun Nov 12 15:38:58 2006
+++ security/heimdal/Makefile	Sun Nov 12 15:40:54 2006
@@ -20,7 +20,7 @@
 MAINTAINER=	shaun at FreeBSD.org
 COMMENT=	A popular BSD-licensed implementation of Kerberos 5
 
-CONFLICTS=	krb4-[0-9]* krb5-[0-9]*
+CONFLICTS=	krb4-[0-9]* krb5-[0-9]* srp-[0-9]*
 
 OPTIONS+=	LDAP	 "Use OpenLDAP as the KDC backend"		off
 OPTIONS+=	CRACKLIB "Use CrackLib for password quality checking"	off
>Release-Note:
>Audit-Trail:
>Unformatted: