Fix build on -CURRENT [1]

Respect CC/CFLAGS, fix installation path [2]
Bump PORTREVISION.

PR:		ports/58164
Submitted by:	Samy Al Bahra <samy@kerneled.com> [1],
		osa [2]
Approved by:	Laurent LEVIER <llevier@argosnet.com> (maintainer)

2 files changed, 65 insertions, 10 deletions

diff --git a/security/hydra/Makefile b/security/hydra/Makefile
index bf13da86ee54..a476e8088ba1 100644
--- a/security/hydra/Makefile
+++ b/security/hydra/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	hydra
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.thc.org/releases/ \
 		${MASTER_SITE_PACKETSTORM}
@@ -16,17 +17,15 @@ MASTER_SITE_SUBDIR=	groups/thc
 MAINTAINER=	llevier@argosnet.com
 COMMENT=	Bruce Force Attack Utility working on multiple network services
 
-.include <bsd.port.pre.mk>
-
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
+post-patch:
+	@${REINPLACE_CMD} -e 's|CC = gcc||; \
+		s|-O2|${CFLAGS}|' \
+		${WRKSRC}/Makefile.am
 
-.if !target(post-install) && (${PORTNAME} == "hydra")
-post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/hydra
-.endif
+do-install:
+	@${INSTALL_PROGRAM} ${WRKSRC}/hydra ${PREFIX}/bin
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/hydra/files/patch-hydra.c b/security/hydra/files/patch-hydra.c
new file mode 100644
index 000000000000..9f78dad0920e
--- /dev/null
+++ b/security/hydra/files/patch-hydra.c
@@ -0,0 +1,56 @@
+--- hydra.c.orig	Fri Oct 17 16:25:46 2003
++++ hydra.c	Fri Oct 17 16:25:46 2003
+@@ -55,33 +55,30 @@
+ static pid_t pids[MAXTASKS];
+ 
+ void help() {
+-    printf("%s %s (c) 2002 by %s %s
+-Syntax:  %s [[[-l LOGIN|-L FILE] [-p PASS|-P FILE]] | [-C FILE]] [-o FILE] [-t TASKS] [-g TASKS] [-w TIME] [-f] [-e ns] [-s PORT] [-S] server service [OPT]\n",
++    printf("%s %s (c) 2002 by %s %s\n"\
++"Syntax:  %s [[[-l LOGIN|-L FILE] [-p PASS|-P FILE]] | [-C FILE]] [-o FILE] [-t TASKS] [-g TASKS] [-w TIME] [-f] [-e ns] [-s PORT] [-S] server service [OPT]\n",
+ PROGRAM,VERSION,AUTHOR,EMAIL,prg);
+ printf("\nOptions:");
+ #ifdef HYDRA_SSL
+-printf("
+-    -S        connect via SSL");
++printf("\n    -S        connect via SSL");
+ #endif
+-printf("
+-    -s PORT   if the service is on a different default port, define it here
+-    -l LOGIN or -L FILE login with LOGIN name, or load several logins from FILE
+-    -p PASS  or -P FILE try password PASS, or load several passwords from FILE
+-    -e ns     additional checks, \"n\" for null password, \"s\" try login as pass
+-    -C FILE   colon seperated \"login:pass\" format, instead of -L/-P option
+-    -o FILE   write found login/password pairs to FILE instead of stdout
+-    -f        exit after the first found login/password pair
+-    -t TASKS  run TASKS number of connects in parallel (default: %d)
+-    -g TASKS  start TASKS number per second until -t TASKS are reached
+-    -w TIME   in seconds, defines the max wait reply time (default: %d)
+-    server    the target server
+-    service   the service to crack. Supported protocols: [%s]
+-    OPT       some service modules need additional input, put it here
+-
+-%s is a tool to guess valid login/password pairs on a target server.
+-You can always find the newest version at %s
+-Use this tool only for legal purposes!
+-",TASKS,WAITTIME,SERVICES,PROGRAM,RESSOURCE);
++printf("\n"\
++"    -s PORT   if the service is on a different default port, define it here\n"\
++"    -l LOGIN or -L FILE login with LOGIN name, or load several logins from FILE\n"\
++"    -p PASS  or -P FILE try password PASS, or load several passwords from FILE\n"\
++"    -e ns     additional checks, \"n\" for null password, \"s\" try login as pass\n"\
++"    -C FILE   colon seperated \"login:pass\" format, instead of -L/-P option\n"\
++"    -o FILE   write found login/password pairs to FILE instead of stdout\n"\
++"    -f        exit after the first found login/password pair\n"\
++"    -t TASKS  run TASKS number of connects in parallel (default: %d)\n"\
++"    -g TASKS  start TASKS number per second until -t TASKS are reached\n"\
++"    -w TIME   in seconds, defines the max wait reply time (default: %d)\n"\
++"    server    the target server\n"\
++"    service   the service to crack. Supported protocols: [%s]\n"\
++"    OPT       some service modules need additional input, put it here\n\n"\
++"%s is a tool to guess valid login/password pairs on a target server.\n"\
++"You can always find the newest version at %s\n"\
++"Use this tool only for legal purposes!\n",TASKS,WAITTIME,SERVICES,PROGRAM,RESSOURCE);
+     exit(-1);
+ }
+