svn commit: r327390 - in head: security/hydra www/hydra

[Baptiste Daroussin]

Author: bapt
Date: Mon Sep 16 13:33:30 2013
New Revision: 327390
URL: http://svnweb.freebsd.org/changeset/ports/327390

Log:
  Rename www/hydra package name to hydra-web to avoid confusion with security/hydra
  While here adjust CONFLICTS_INSTALL
  modernize lib_depends
  remove leading article in COMMENT

Modified:
  head/security/hydra/Makefile
  head/www/hydra/Makefile

Modified: head/security/hydra/Makefile
==============================================================================
--- head/security/hydra/Makefile	Mon Sep 16 13:11:43 2013	(r327389)
+++ head/security/hydra/Makefile	Mon Sep 16 13:33:30 2013	(r327390)
@@ -16,9 +16,8 @@ LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/l
 		libpcre.so:${PORTSDIR}/devel/pcre \
 		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
 
-CONFLICTS=	hydra-[0-9]*
+CONFLICTS_INSTALL=	hydra-web-[0-9]*
 
-NO_LATEST_LINK=	yes
 PLIST_FILES=	bin/hydra bin/pw-inspector bin/dpl4hydra.sh
 GNU_CONFIGURE=	yes
 USES=		gmake

Modified: head/www/hydra/Makefile
==============================================================================
--- head/www/hydra/Makefile	Mon Sep 16 13:11:43 2013	(r327389)
+++ head/www/hydra/Makefile	Mon Sep 16 13:33:30 2013	(r327390)
@@ -1,7 +1,4 @@
-# ex:ts=8
-# Ports collection makefile for:	hydra
-# Date created:			Apr 2, 2003
-# Whom:				ijliao
+# Created by: ijliao
 #
 # $FreeBSD$
 #
@@ -12,15 +9,16 @@ PORTREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/ \
 		ftp://ftp.hellug.gr/pub/software/hydra/
+PKGNAMESUFFIX=	-web
 
 MAINTAINER=	ports at FreeBSD.org
-COMMENT=	A high performance multi-threaded web server
+COMMENT=	High performance multi-threaded web server
 
-LIB_DEPENDS=	gnutls.26:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
 
 USE_RC_SUBR=	hydra
 
-NO_LATEST_LINK=	yes
+CONFLICTS_INSTALL=	hydra-[0-9]*
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include