security/nessus-libnasl:

- Remove BROKEN and fix building with newer OpenSSL versions.
- Add LICENSE.
- Use new LIB_DEPENDS syntax.
- Support staging.  This exposed a bug in security/nessus-libraries.
- Fix an issue in a Makefile to support parallel building.

security/nessus-libraries:
- Add LICENSE.
- Support staging.
- Remove pointyhat references.
- Remove DESTDIR from the nessus-config script.

PR:		ports/175868
Approved by:	"Schweigert, Udo" <Udo.Schweigert@siemens.com> (maintainer)

7 files changed, 93 insertions, 13 deletions

diff --git a/security/nessus-libnasl/Makefile b/security/nessus-libnasl/Makefile
index dd2ec2af7f4e..ccab3da32772 100644
--- a/security/nessus-libnasl/Makefile
+++ b/security/nessus-libnasl/Makefile
@@ -15,9 +15,9 @@ DISTNAME=	libnasl-${PORTVERSION}
 MAINTAINER=	udo.schweigert@siemens.com
 COMMENT=	Nessus Attack Scripting Language
 
-BROKEN=		Does not build
+LICENSE=	GPLv2
 
-LIB_DEPENDS=	nessus.4:${PORTSDIR}/security/nessus-libraries
+LIB_DEPENDS=	libnessus.so:${PORTSDIR}/security/nessus-libraries
 
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/libnasl
@@ -29,5 +29,4 @@ USE_LDCONFIG=	YES
 
 MAN1=		nasl.1 nasl-config.1
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/security/nessus-libnasl/files/patch-libtool b/security/nessus-libnasl/files/patch-libtool
index 1e190cc05a32..bf833f83d89c 100644
--- a/security/nessus-libnasl/files/patch-libtool
+++ b/security/nessus-libnasl/files/patch-libtool
@@ -1,6 +1,6 @@
 --- nasl/Makefile.orig	2005-02-10 17:03:51.000000000 +0100
 +++ nasl/Makefile	2012-01-29 10:29:13.000000000 +0100
-@@ -88,7 +88,8 @@
+@@ -88,10 +88,11 @@
  	nasl_server.c \
  	nasl_debug.c
  
@@ -9,7 +9,11 @@
 +LINK = $(LIBTOOL) --mode link $(CC) $(CFLAGS) $(NESSUS_INCLUDE)
  all : cflags libnasl.la nasl
  
- .c.o:
+-.c.o:
++.c.o: cflags
+ 	$(COMPILE) -c $<
+ cflags : 
+ 	@echo "echo \"$(NESSUS_CFLAGS) $(include) $(DEFS) \"" > cflags
 @@ -101,7 +102,7 @@
  	$(CC) $(CFLAGS)  $(NESSUS_INCLUDE) $(include) -o nasl -DVERSION=\"$(VERSION)\" nasl.c $(OBJS) $(NESSUS_LIBS) 
  
diff --git a/security/nessus-libnasl/files/patch-nomd2 b/security/nessus-libnasl/files/patch-nomd2
new file mode 100644
index 000000000000..7897538a5f1f
--- /dev/null
+++ b/security/nessus-libnasl/files/patch-nomd2
@@ -0,0 +1,62 @@
+--- nasl/nasl_crypto.c.orig	2005-07-07 08:14:26.000000000 +0800
++++ nasl/nasl_crypto.c	2013-05-21 18:09:58.000000000 +0800
+@@ -22,7 +22,9 @@
+   */
+ #include <includes.h>
+ #ifdef HAVE_SSL
++#ifdef HAVE_OPENSSL_MD2_H
+ #include <openssl/md2.h>
++#endif
+ #include <openssl/md4.h>
+ #include <openssl/md5.h>
+ #include <openssl/ripemd.h>
+@@ -45,6 +47,7 @@
+ 
+ 
+ /*-------------------[  Std. HASH ]-------------------------------------*/
++#ifdef HAVE_OPENSSL_MD2_H
+ tree_cell * nasl_md2(lex_ctxt * lexic)
+ {
+  char * data = get_str_var_by_num(lexic, 0);
+@@ -63,6 +66,7 @@
+  retc->size = MD2_DIGEST_LENGTH;
+  return retc;
+ }
++#endif
+ 
+ tree_cell * nasl_md4(lex_ctxt * lexic)
+ {
+@@ -192,11 +196,12 @@
+  return retc;
+ }
+ 
+-
++#ifdef HAVE_OPENSSL_MD2_H
+ tree_cell * nasl_hmac_md2(lex_ctxt * lexic)
+ {
+  return nasl_hmac(lexic, EVP_md2());
+ }
++#endif
+ 
+ 
+ tree_cell * nasl_hmac_md5(lex_ctxt * lexic)
+--- nasl/nasl_crypto.h.orig	2005-02-11 00:03:52.000000000 +0800
++++ nasl/nasl_crypto.h	2013-05-21 18:11:23.000000000 +0800
+@@ -2,13 +2,17 @@
+ #define NASL_CRYPTO_H
+ 
+ #ifdef HAVE_SSL
++#ifdef HAVE_OPENSSL_MD2_H
+ tree_cell * nasl_md2(lex_ctxt *);
++#endif
+ tree_cell * nasl_md4(lex_ctxt *);
+ tree_cell * nasl_md5(lex_ctxt *);
+ tree_cell * nasl_sha(lex_ctxt *);
+ tree_cell * nasl_sha1(lex_ctxt *);
+ tree_cell * nasl_ripemd160(lex_ctxt *);
++#ifdef HAVE_OPENSSL_MD2_H
+ tree_cell * nasl_hmac_md2(lex_ctxt * );
++#endif
+ tree_cell * nasl_hmac_md5(lex_ctxt * );
+ tree_cell * nasl_hmac_sha(lex_ctxt *);
+ tree_cell * nasl_hmac_sha1(lex_ctxt * );
diff --git a/security/nessus-libnasl/pkg-plist b/security/nessus-libnasl/pkg-plist
index 10ccab19c3c0..d2bbb33a170d 100644
--- a/security/nessus-libnasl/pkg-plist
+++ b/security/nessus-libnasl/pkg-plist
@@ -5,6 +5,8 @@ lib/libnasl.a
 lib/libnasl.la
 lib/libnasl.so
 lib/libnasl.so.4
+man/man1/nasl.1.gz
+man/man1/nasl-config.1.gz
 var/nessus/nessus_org.pem
 @dirrmtry var/nessus
 @dirrmtry var
diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile
index a57e47c59694..39a32e8d57f2 100644
--- a/security/nessus-libraries/Makefile
+++ b/security/nessus-libraries/Makefile
@@ -6,24 +6,24 @@
 
 PORTNAME=	nessus-libraries
 PORTVERSION=	2.2.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
 		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.ayamura.org/pub/nessus/nessus-${PORTVERSION}/src/
-DISTNAME=	nessus-libraries-${PORTVERSION}
 
 MAINTAINER=	udo.schweigert@siemens.com
 COMMENT=	Libraries for Nessus, the security scanner
 
+LICENSE=	LGPL20
+
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-libraries
 
 USES=		bison
 USE_AUTOTOOLS=	libtool
-NO_STAGE=	yes
 CONFIGURE_ARGS=	--enable-cipher
 .if defined(WITH_NESSUS_BPF_SHARE)
 CONFIGURE_ARGS+=	--enable-bpf-sharing
@@ -31,11 +31,8 @@ CONFIGURE_ARGS+=	--enable-bpf-sharing
 
 USE_LDCONFIG=	YES
 
-MAN1=		nessus-config.1
-
-.if ! defined(NESSUS_CLIENT_ONLY) && ! defined(PACKAGE_BUILDING)
-MANUAL_PACKAGE_BUILD=	needs /dev/bpf which is not available in pointyhat jail
-pre-configure:
+.if ! defined(NESSUS_CLIENT_ONLY)
+pre-everything::
 	@if [ ! -c /dev/bpf ]; then \
 	    ${ECHO} "********************************************************";\
 	    ${ECHO} "*                   W a r n i n g                      *";\
diff --git a/security/nessus-libraries/files/patch-destdir b/security/nessus-libraries/files/patch-destdir
new file mode 100644
index 000000000000..8ebfd487912a
--- /dev/null
+++ b/security/nessus-libraries/files/patch-destdir
@@ -0,0 +1,15 @@
+--- nessus-config.pre.in.orig	2013-10-24 18:49:26.000000000 +0200
++++ nessus-config.pre.in	2013-10-24 18:49:47.000000000 +0200
+@@ -48,10 +48,10 @@
+ 		;;
+ 	--libs)
+ 	
+-		echo $Xn "-L$DESTDIR$LIBDIR -lnessus -lhosts_gatherer @pcap_flag@ $CIPHER $EXTRA $Xc"
++		echo $Xn "-L$LIBDIR -lnessus -lhosts_gatherer @pcap_flag@ $CIPHER $EXTRA $Xc"
+ 		;;
+ 	--cflags)
+-		echo $Xn "$DEFS -I$DESTDIR$INCLUDEDIR/nessus $CIPHER_CFLAGS $SSL_CFLAGS $Xc"
++		echo $Xn "$DEFS -I$INCLUDEDIR/nessus $CIPHER_CFLAGS $SSL_CFLAGS $Xc"
+ 		;;
+ 	--egd)
+ 		echo $Xn "$EGDPATH" $Xc
diff --git a/security/nessus-libraries/pkg-plist b/security/nessus-libraries/pkg-plist
index c3728f83d7f5..2062b7850691 100644
--- a/security/nessus-libraries/pkg-plist
+++ b/security/nessus-libraries/pkg-plist
@@ -18,6 +18,7 @@ lib/libpcap-nessus.a
 lib/libpcap-nessus.la
 lib/libpcap-nessus.so
 lib/libpcap-nessus.so.4
+man/man1/nessus-config.1.gz
 sbin/uninstall-nessus
 @dirrm include/nessus/net
 @dirrm include/nessus