- Fix build on 7.x (objformat removal)

- Move Makefile.common from server to libraries port
- Minor fixes

PR:		ports/124331 ports/124335-7 ports/124371
Submitted by:	Tomoyuki Sakurai <cherry@trombik.org> (maintainer)

4 files changed, 154 insertions, 16 deletions

diff --git a/security/openvas-server/Makefile b/security/openvas-server/Makefile
index f0e4bc0082f1..e2f41e942730 100644
--- a/security/openvas-server/Makefile
+++ b/security/openvas-server/Makefile
@@ -17,6 +17,9 @@ COMMENT=	A security scanner: a fork of Nessus
 LIB_DEPENDS=	openvas.1:${PORTSDIR}/security/openvas-libraries \
 		openvasnasl.1:${PORTSDIR}/security/openvas-libnasl
 
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 GNU_CONFIGURE=	yes
 # XXX openvas-mkcert uses gettext
 USE_GETTEXT=	yes
@@ -25,6 +28,6 @@ USE_RC_SUBR=	openvasd
 MAN1=		openvas-check-signature.1 openvas-mkrand.1
 MAN8=		openvasd.8 openvas-adduser.8 openvas-rmuser.8 openvas-mkcert.8
 
-.include "${.CURDIR}/../../security/openvas-server/Makefile.common"
+.include "${.CURDIR}/../../security/openvas-libraries/Makefile.common"
 
 .include <bsd.port.mk>
diff --git a/security/openvas-server/Makefile.common b/security/openvas-server/Makefile.common
deleted file mode 100644
index f3e23716c281..000000000000
--- a/security/openvas-server/Makefile.common
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIGURE_ARGS+=	--includedir=${LOCALBASE}/include \
-			--localstatedir=${PREFIX}/openvas \
-			--sharedstatedir=${PREFIX}/openvas/com \
-			--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/security/openvas-server/files/patch-openvas.tmpl.in b/security/openvas-server/files/patch-openvas.tmpl.in
index 6836a333dd90..6549a391e990 100644
--- a/security/openvas-server/files/patch-openvas.tmpl.in
+++ b/security/openvas-server/files/patch-openvas.tmpl.in
@@ -1,11 +1,9 @@
---- openvas.tmpl.in.orig	2008-04-27 00:54:18.000000000 +0900
-+++ openvas.tmpl.in	2008-04-27 00:54:45.000000000 +0900
-@@ -36,7 +36,7 @@
- srcdir=${rootdir}/src
- libsdir=${rootdir}/libs
- top_builddir = @PWDD@
--include= -I. -I$(rootdir)/include  
-+include= -I. -I$(rootdir)/include -I$(includedir)
- INSTALL=@INSTALL@
- INSTALL_DIR=@INSTALL_DIR@
- installuser=@installuser@
+--- openvas.tmpl.in.orig	2007-10-18 04:25:43.000000000 +0900
++++ openvas.tmpl.in	2008-04-27 17:52:51.000000000 +0900
+@@ -128,5 +128,6 @@
+ NASLCFLAGS=@NASLCFLAGS@
+ OPENVAS_CFLAGS=$(CWARN) $(include) $(OVSCFLAGS) $(NASLCFLAGS) $(OPENVAS_DIRECTORIES)
+ CFLAGS=@CFLAGS@ 
++CPPFLAGS=@CPPFLAGS@
+ 
+ LIBS=@LIBS@
diff --git a/security/openvas-server/files/patch-openvasd-Makefile b/security/openvas-server/files/patch-openvasd-Makefile
new file mode 100644
index 000000000000..16266997267f
--- /dev/null
+++ b/security/openvas-server/files/patch-openvasd-Makefile
@@ -0,0 +1,141 @@
+--- openvasd/Makefile.orig	2008-04-27 17:49:28.000000000 +0900
++++ openvasd/Makefile	2008-04-27 17:50:41.000000000 +0900
+@@ -46,105 +46,105 @@
+ 	@chmod +x cflags
+ 
+ openvasd : cflags $(OBJS)
+-	$(CC) $(LDFLAGS) $(OPENVAS_INCLUDE) $(OBJS)  -o openvasd $(LIBS)
++	$(CC) $(LDFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) $(OBJS)  -o openvasd $(LIBS)
+ 
+ openvas-check-signature : cflags openvas-check-signature.o
+-	$(CC) $(LDFLAGS) $(OPENVAS_INCLUDE) openvas-check-signature.o  -o openvas-check-signature $(LIBS)
++	$(CC) $(LDFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) openvas-check-signature.o  -o openvas-check-signature $(LIBS)
+ 
+ openvas-check-signature.o: openvas-check-signature.c
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c openvas-check-signature.c 
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c openvas-check-signature.c 
+ 
+ users.o : cflags users.c users.h
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c users.c 
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c users.c 
+ 
+ processes.o : cflags processes.c processes.h
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c processes.c 
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c processes.c 
+ 
+ rules.o : cflags rules.c rules.h
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c rules.c 
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c rules.c 
+ 
+ preferences.o : cflags preferences.c preferences.h 
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c preferences.c 
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c preferences.c 
+ 
+ pluginload.o : cflags pluginload.h pluginload.c
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c pluginload.c 
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c pluginload.c 
+ 
+ openvasd.o : cflags openvasd.c 
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c openvasd.c 
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c openvasd.c 
+ 
+ auth.o : cflags auth.c auth.h
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c auth.c 
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c auth.c 
+ 
+ attack.o : cflags attack.c attack.h
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c attack.c 
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c attack.c 
+ 
+ comm.o : cflags comm.c comm.h
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c comm.c 
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c comm.c 
+ 
+ utils.o : cflags utils.c utils.h
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c utils.c 
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c utils.c 
+ 
+ log.o : cflags log.c log.h
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c log.c 
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c log.c 
+ 
+ sighand.o : cflags sighand.c sighand.h
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c sighand.c 
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c sighand.c 
+ 
+ ntp_10.o  : cflags ntp_10.c ntp_10.h
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c ntp_10.c 
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c ntp_10.c 
+ 
+ ntp_11.o  : cflags ntp_11.c ntp_11.h
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c ntp_11.c 
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c ntp_11.c 
+ 
+ parser.o : cflags parser.c parser.h
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c parser.c 
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c parser.c 
+ 
+ piic.o : cflags piic.c piic.h
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c piic.c 
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c piic.c 
+ 
+ nasl_plugins.o : cflags nasl_plugins.c
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c nasl_plugins.c 
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c nasl_plugins.c 
+ 
+ nes_plugins.o : cflags nes_plugins.c
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c nes_plugins.c 
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c nes_plugins.c 
+ 
+ plugs_req.o : cflags plugs_req.c
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c plugs_req.c 
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c plugs_req.c 
+ 
+ save_tests.o : cflags save_tests.c save_tests.h
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c save_tests.c	
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c save_tests.c	
+ 
+ save_kb.o : cflags save_kb.c save_kb.h
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c save_kb.c
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c save_kb.c
+ 
+ detached.o : cflags detached.c detached.h
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c detached.c
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c detached.c
+ 
+ pluginlaunch.o : cflags pluginlaunch.c
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c pluginlaunch.c
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c pluginlaunch.c
+ 
+ locks.o : cflags locks.c 
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c locks.c
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c locks.c
+ 
+ 
+ dirutils.o : cflags dirutils.c 
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c dirutils.c
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c dirutils.c
+ 
+ 
+ plugs_hash.o : cflags plugs_hash.c 
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c plugs_hash.c
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c plugs_hash.c
+ 
+ pluginupload.o : cflags pluginupload.c
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c pluginupload.c
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c pluginupload.c
+ 
+ pluginscheduler.o : cflags pluginscheduler.c
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c pluginscheduler.c
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c pluginscheduler.c
+ 
+ hosts.o : cflags hosts.c
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c hosts.c
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c hosts.c
+ 
+ shared_socket.o : cflags shared_socket.c
+-	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) -c shared_socket.c
++	$(CC) $(CFLAGS) $(OPENVAS_INCLUDE) $(CPPFLAGS) -c shared_socket.c
+ clean :
+ 	rm -f *.o openvasd openvas-check-signature *~ cflags
+