From owner-svn-ports-all@FreeBSD.ORG  Mon Sep 16 13:33:31 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 1BC2D74C;
 Mon, 16 Sep 2013 13:33:31 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 094602DA7;
 Mon, 16 Sep 2013 13:33:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8GDXUlh074099;
 Mon, 16 Sep 2013 13:33:30 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8GDXUUR074091;
 Mon, 16 Sep 2013 13:33:30 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201309161333.r8GDXUUR074091@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 16 Sep 2013 13:33:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r327390 - in head: security/hydra www/hydra
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Sep 2013 13:33:31 -0000

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@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