- Fix compilation on FreeBSD 5.2-BETA.

- Switch LIB_DEPENDS from math/libgmp-freebsd to math/libgmp4 on FreeBSD 5
  only (the base libgmp 2.0.1 on FreeBSD 4 is fine) so this port buils on
  architectures other than alpha and i386 (tested on FreeBSD/sparc64).
- Respect CC and CFLAGS.
- Remove broken URL forgotten in Makefile 1.16 and pkg-descr 1.5.
- Give maintainership to submitter.

Submitted by:	marius@alchemy.franken.de
Approved by:	portmgr

4 files changed, 44 insertions, 11 deletions

diff --git a/dns/dhisd/Makefile b/dns/dhisd/Makefile
index da86d5d82ed3..eb3013329174 100644
--- a/dns/dhisd/Makefile
+++ b/dns/dhisd/Makefile
@@ -7,14 +7,21 @@
 
 PORTNAME=	dhisd
 PORTVERSION=	5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns
 MASTER_SITES=	ftp://ftp.dhis.org/pub/dhis/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	marius@alchemy.franken.de
 COMMENT=	DHIS server for dynamic updates on the server using specific engines
 
-LIB_DEPENDS=	gmp.3:${PORTSDIR}/math/libgmp-freebsd
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 500023
+LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
+CFLAGS+=	-I${PREFIX}/include
+LDFLAGS+=	-L${PREFIX}/lib
+MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
+.endif
 
 DOCFILES=	CONTRIBUTORS COPYRIGHT INSTALL MODULES README
 USE_REINPLACE=	yes
@@ -69,9 +76,6 @@ post-install:
 	@${ECHO} "or the files in ${DOCSDIR}"
 	@${ECHO} "Read INSTALL and INSTALL.bsd at least for the setup information of dhisd."
 .endif
-	@${ECHO} ""
-	@${ECHO} "For information on this port, check the following site:"
-	@${ECHO} "http://bsltwr.dhis.org/dhis/"
 	@${ECHO} "--------------------------------------------------------------------------"
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/dns/dhisd/files/patch-Makefile b/dns/dhisd/files/patch-Makefile
index 0ed1c068d789..c5b62cb3dd4b 100644
--- a/dns/dhisd/files/patch-Makefile
+++ b/dns/dhisd/files/patch-Makefile
@@ -1,7 +1,15 @@
 --- Makefile.orig	Sun Nov  4 20:48:12 2001
 +++ Makefile	Sun Nov  4 20:49:08 2001
-@@ -30,7 +30,7 @@
- LFLAGS=-L/usr/local/lib 
+@@ -25,12 +25,12 @@
+ #
+ #      DHIS(c)  Dynamic Host Information System Release 5.1
+ 
+-CC=gcc
+-CFLAGS=-Wall -Wformat -I/usr/local/include # -DDONT_FORK
+-LFLAGS=-L/usr/local/lib 
++CC?=gcc
++#CFLAGS=-Wall -Wformat -I/usr/local/include # -DDONT_FORK
++#LDFLAGS=-L/usr/local/lib 
  CP=cp
  
 -INSTALLDIR=/etc/dhis/bin
@@ -9,3 +17,17 @@
  MODE=700
  OWNER=root
  MKDIR=mkdir -p
+@@ -46,11 +46,11 @@
+ all: dhisd genkeys
+ 
+ dhisd:	$(OBJS)
+-	$(CC) $(LFLAGS) -o dhisd $(OBJS) $(LIBS)
++	$(CC) $(LDFLAGS) -o dhisd $(OBJS) $(LIBS)
+ 	strip dhisd
+ 
+ genkeys:
+-	$(CC) $(CFLAGS) $(LFLAGS) genkeys.c -DQRC=1 -o genkeys -lgmp
++	$(CC) $(CFLAGS) $(LDFLAGS) genkeys.c -DQRC=1 -o genkeys -lgmp
+ 
+ install: dhisd genkeys
+ 	$(MKDIR) $(INSTALLDIR)
diff --git a/dns/dhisd/files/patch-dhisd.h b/dns/dhisd/files/patch-dhisd.h
index 0adddde3844a..01b4c929829f 100644
--- a/dns/dhisd/files/patch-dhisd.h
+++ b/dns/dhisd/files/patch-dhisd.h
@@ -1,5 +1,14 @@
 --- dhisd.h.orig	Sun Nov  4 20:50:14 2001
 +++ dhisd.h	Sun Nov  4 20:51:05 2001
+@@ -47,7 +47,7 @@
+ #include<sys/signal.h>
+ #include<sys/wait.h>
+ #include<syslog.h>
+-#include<varargs.h>
++#include<stdarg.h>
+ #include<gmp.h>
+ 
+ #define	BOURNE_SHELL		"/bin/sh"
 @@ -64,10 +64,10 @@
  #define	CHECK_FAILS	3		/* maximum check fails */
  
diff --git a/dns/dhisd/pkg-descr b/dns/dhisd/pkg-descr
index a14107fdd59d..6bffcb91276d 100644
--- a/dns/dhisd/pkg-descr
+++ b/dns/dhisd/pkg-descr
@@ -19,6 +19,4 @@ For more information on the services of DHIS, you should look at the
 official DHIS site: 
 	http://www.dhis.org/dhis/services/
 
-For more info on the FreeBSD port: http://bsltwr.dhis.org/dhis
-
 WWW: http://www.dhis.org/r5/