6 files changed, 29 insertions, 30 deletions

diff --git a/dns/dhid/Makefile b/dns/dhid/Makefile
index e01835a2e849..abe318814d5d 100644
--- a/dns/dhid/Makefile
+++ b/dns/dhid/Makefile
@@ -6,12 +6,16 @@
 #
 
 PORTNAME=		dhid
-PORTVERSION=		3.1
+PORTVERSION=		4.0.2
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.dhis.org/pub/dhis/
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
+			${PORTNAME}-3.1${EXTRACT_SUFX}
 
 MAINTAINER=		oryx@ungulate.net
 
+OLDWRKSRC=		${WRKDIR}/${PORTNAME}-3.1
+
 MAN8=			dhid.8
 
 post-patch:
@@ -20,18 +24,14 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dhid ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/dhid.8 ${PREFIX}/man/man8
-	${INSTALL} ${COPY} -o root -g wheel -m 600 ${WRKSRC}/dhid.conf ${PREFIX}/etc/dhid.conf.sample
+	${INSTALL_MAN} ${OLDWRKSRC}/dhid.8 ${PREFIX}/man/man8
+	${INSTALL} ${COPY} -o root -g wheel -m 600 ${OLDWRKSRC}/dhid.conf ${PREFIX}/etc/dhid.conf.sample
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/dhid.sh ]; then \
 		${ECHO} "===>   Installing ${PREFIX}/etc/rc.d/dhid.sh startup file."; \
 		${INSTALL_SCRIPT} -m 751 ${FILESDIR}/dhid.sh ${PREFIX}/etc/rc.d/dhid.sh; \
 	fi;
-	@${ECHO} "--------------------------------------------------------------------------"
-	@${ECHO} "Before dhid can run, you will need to register with a DHIS provider."
-	@${ECHO} "See http://www.dhis.org/dhis/services/ for a list of providers."
-	@${ECHO} "Enter the DHIS account information into the ${PREFIX}/etc/dhid.conf file."
-	@${ECHO} "--------------------------------------------------------------------------"
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/dns/dhid/distinfo b/dns/dhid/distinfo
index 096c43f441ba..2a1346e93915 100644
--- a/dns/dhid/distinfo
+++ b/dns/dhid/distinfo
@@ -1 +1,2 @@
+MD5 (dhid-4.0.2.tar.gz) = 16532ef68d89ed51a9e57ea9ac886268
 MD5 (dhid-3.1.tar.gz) = f419031035f79936592c8ecf97fbe62c
diff --git a/dns/dhid/files/patch-aa b/dns/dhid/files/patch-aa
index a3a94652f725..ff0171d63d58 100644
--- a/dns/dhid/files/patch-aa
+++ b/dns/dhid/files/patch-aa
@@ -1,8 +1,8 @@
---- dhid.h.orig	Tue Jun 22 20:01:43 1999
-+++ dhid.h	Sat Aug 21 05:28:10 1999
-@@ -63,8 +63,8 @@
+--- dhid.h.orig	Sun Jan 14 19:39:01 2001
++++ dhid.h	Sun Jan 14 19:41:37 2001
+@@ -73,8 +73,8 @@
+ #define	OFFLINE_REQ	0x00000451
  
- #define	POLL_INTERVAL	60
  
 -#define	DHID_CONF	"/etc/dhid.conf"
 -#define	DHID_PID	"/etc/dhid.pid"
@@ -10,4 +10,4 @@
 +#define	DHID_PID	"/var/run/dhid.pid"
  
  #define	DEF_ISPORT	58800
- #define	DEF_MXPORT	58801
+ #define	FAIL_ALLOW	3
diff --git a/dns/dhid/files/patch-ab b/dns/dhid/files/patch-ab
index d04e19c05f80..a818e892bcfd 100644
--- a/dns/dhid/files/patch-ab
+++ b/dns/dhid/files/patch-ab
@@ -1,21 +1,17 @@
---- Makefile.orig	Thu Jan 13 23:15:01 2000
-+++ Makefile	Thu Feb 10 23:13:56 2000
-@@ -25,17 +25,13 @@
+--- Makefile.orig	Sun Jan 14 19:39:56 2001
++++ Makefile	Sun Jan 14 19:40:37 2001
+@@ -25,13 +25,10 @@
  #
- #      DHIS(c)  Dynamic Host Information System Release 3.1
+ #      DHIS(c)  Dynamic Host Information System Release 4.0
  
 -CC=cc
--CFLAGS=
--LFLAGS=
--LIBS=
 +CC?=cc
- RM=rm -f
  
- all:	dhid
- 
- dhid:	conf.o endian.o network.o crypt.o main.o
- 	$(CC) $(LFLAGS) -o dhid conf.o endian.o network.o crypt.o main.o $(LIBS)
--	strip dhid
+ # Add -lnsl and -lsocket to LIBS in SysV systems 
+ #
+-CFLAGS=-I/usr/local/include -DQRC=1 
+-LFLAGS=-L/usr/local/lib
+-LIBS=-lgmp
  
- main.o: dhid.h network.h conf.h main.c
- 	$(CC) $(CFLAGS) -c main.c
+ # Use these and comment the above if you wish to compile dhid without 
+ # secure public key authentication or don't have the GMP library 
diff --git a/dns/dhid/pkg-descr b/dns/dhid/pkg-descr
index bffc18a85acf..1709e04134e1 100644
--- a/dns/dhid/pkg-descr
+++ b/dns/dhid/pkg-descr
@@ -1,5 +1,5 @@
-DHIS Daemon Client release 3.1
-==============================
+DHIS Daemon Client release 4.0.1
+================================
 
 dhid is the DHIS client daemon. dhid is used to update the DNS tables on
 a DHIS provider.
diff --git a/dns/dhid/pkg-message b/dns/dhid/pkg-message
index e430692548f8..c5f73d7ca26a 100644
--- a/dns/dhid/pkg-message
+++ b/dns/dhid/pkg-message
@@ -1,3 +1,5 @@
+
 Before dhid can run, you will need to register with a DHIS provider.
 See http://www.dhis.org/dhis/services/ for a list of providers.
 Enter the DHIS account information into the dhid.conf file.
+