aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwg <wg@FreeBSD.org>2013-06-16 19:27:34 +0800
committerwg <wg@FreeBSD.org>2013-06-16 19:27:34 +0800
commitd2115a17a2396eabff73b56329d9ff9384c68c54 (patch)
treefd8379ed56a0ae952c805add2888426aa7923ad1
parent8bb17ab1ef629a6f206e66d6984bc89b7cf1f55c (diff)
downloadfreebsd-ports-gnome-d2115a17a2396eabff73b56329d9ff9384c68c54.tar.gz
freebsd-ports-gnome-d2115a17a2396eabff73b56329d9ff9384c68c54.tar.zst
freebsd-ports-gnome-d2115a17a2396eabff73b56329d9ff9384c68c54.zip
security/slurpie: fix build with clang
- Fix build with clang, main int arg - NOPORTDOCS -> PORT_OPTIONS:MDOCS - Trim Makefile header Approved by: culot / jpaetzel (mentors, implicit)
-rw-r--r--security/slurpie/Makefile11
-rw-r--r--security/slurpie/files/patch-src_mater.c13
-rw-r--r--security/slurpie/files/patch-src_node.c13
3 files changed, 30 insertions, 7 deletions
diff --git a/security/slurpie/Makefile b/security/slurpie/Makefile
index 89bc88773809..126f937ace5e 100644
--- a/security/slurpie/Makefile
+++ b/security/slurpie/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for: slurpie
-# Date created: Sun Feb 12, 2000
-# Whom: David O'Brien (obrien@NUXI.com)
-#
+# Created by: David O'Brien (obrien@NUXI.com)
# $FreeBSD$
-#
PORTNAME= slurpie
PORTVERSION= 2.0b
@@ -20,6 +15,8 @@ COMMENT= A passwd file cracker (supports distributed nodes)
PLIST_FILES= sbin/slurp sbin/slurpie
PORTDOCS= README
+.include <bsd.port.options.mk>
+
post-patch:
# Fix for GCC 4.2
@${REINPLACE_CMD} -e \
@@ -28,7 +25,7 @@ post-patch:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/slurp* ${PREFIX}/sbin
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
.endif
diff --git a/security/slurpie/files/patch-src_mater.c b/security/slurpie/files/patch-src_mater.c
new file mode 100644
index 000000000000..393a3dbf45d9
--- /dev/null
+++ b/security/slurpie/files/patch-src_mater.c
@@ -0,0 +1,13 @@
+diff --git src/master.c src/master.c
+index 4b24f9b..683d9a6 100644
+--- src/master.c
++++ src/master.c
+@@ -132,7 +132,7 @@ char *get_time_str( u_int seconds )
+ return timestr;
+ }
+
+-int main( int argc, u_char **argv )
++int main( int argc, char **argv )
+ {
+ static unsigned id, init_time;
+
diff --git a/security/slurpie/files/patch-src_node.c b/security/slurpie/files/patch-src_node.c
new file mode 100644
index 000000000000..10862a84ffb5
--- /dev/null
+++ b/security/slurpie/files/patch-src_node.c
@@ -0,0 +1,13 @@
+diff --git src/node.c src/node.c
+index 28d5d8a..3135ea0 100644
+--- src/node.c
++++ src/node.c
+@@ -102,7 +102,7 @@ void clean_up( int exit_status )
+
+
+ /////////////////////////////
+-int main( int argc, u_char **argv )
++int main( int argc, char **argv )
+ {
+ u_int exit_state = 0;
+ global.self.addr.sin_port = 0;