summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2013-09-16 13:33:30 +0000
committerbapt <bapt@FreeBSD.org>2013-09-16 13:33:30 +0000
commitb10c86aa2518c9f0ceb621e0ea3d06e3648f2332 (patch)
treec4e0cd54938bf21f0f68f87c8cf529662c48ddb0
parent7f3220fca46e93e88b2fee51293dab633d0a7ca6 (diff)
downloadFreeBSD-ports-b10c86aa2518c9f0ceb621e0ea3d06e3648f2332.zip
FreeBSD-ports-b10c86aa2518c9f0ceb621e0ea3d06e3648f2332.tar.gz
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
-rw-r--r--security/hydra/Makefile3
-rw-r--r--www/hydra/Makefile12
2 files changed, 6 insertions, 9 deletions
diff --git a/security/hydra/Makefile b/security/hydra/Makefile
index 72e7be7..841d490 100644
--- a/security/hydra/Makefile
+++ b/security/hydra/Makefile
@@ -16,9 +16,8 @@ LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn \
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
diff --git a/www/hydra/Makefile b/www/hydra/Makefile
index 44689b5..7a7378c 100644
--- a/www/hydra/Makefile
+++ b/www/hydra/Makefile
@@ -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
OpenPOWER on IntegriCloud