Finish updating port to 3.1:

* Correct executable name in etc/rc.d/dhid.sh
* Provide users with more information about configuring

Obtained from:	Maintainer

10 files changed, 32 insertions, 28 deletions

diff --git a/dns/dhid/Makefile b/dns/dhid/Makefile
index 78a4c87bc0d9..f2ed00222c1d 100644
--- a/dns/dhid/Makefile
+++ b/dns/dhid/Makefile
@@ -27,8 +27,13 @@ post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/dhid.sh ]; then \
 		${ECHO} "===>   Installing ${PREFIX}/etc/rc.d/dhid.sh startup file."; \
 		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/dhid.sh; \
-		${ECHO} "[ -x ${PREFIX}/bin/dtool ] && ${PREFIX}/bin/dtool -s > /dev/null && echo -n ' dhid'" >> ${PREFIX}/etc/rc.d/dhid.sh; \
+		${ECHO} "[ -x \"${PREFIX}/sbin/dhid\" -a -f \"${PREFIX}/etc/dhid.conf\" ] && ${PREFIX}/sbin/dhid > /dev/null && echo -n ' dhid'" >> ${PREFIX}/etc/rc.d/dhid.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/dhid.sh; \
-	fi
+	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} "--------------------------------------------------------------------------"
 
 .include <bsd.port.mk>
diff --git a/dns/dhid/files/patch-ab b/dns/dhid/files/patch-ab
index bf91cebbd692..d04e19c05f80 100644
--- a/dns/dhid/files/patch-ab
+++ b/dns/dhid/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.orig	Thu Jan 13 20:15:01 2000
-+++ Makefile	Sun Jan 30 17:56:18 2000
+--- Makefile.orig	Thu Jan 13 23:15:01 2000
++++ Makefile	Thu Feb 10 23:13:56 2000
 @@ -25,17 +25,13 @@
  #
  #      DHIS(c)  Dynamic Host Information System Release 3.1
@@ -19,9 +19,3 @@
  
  main.o: dhid.h network.h conf.h main.c
  	$(CC) $(CFLAGS) -c main.c
-@@ -54,3 +50,5 @@
- 
- clean:
- 	$(RM) *.core core dhid *.o
-+
-+all:	dhid
diff --git a/dns/dhid/pkg-comment b/dns/dhid/pkg-comment
index b2f562e50e50..edea8d6cf8d1 100644
--- a/dns/dhid/pkg-comment
+++ b/dns/dhid/pkg-comment
@@ -1 +1 @@
-dhis client for updating dynamic DNS entries in dhisd DNS tables
+DHIS client for updating dynamic DNS entries in dhisd DNS tables
diff --git a/dns/dhid/pkg-descr b/dns/dhid/pkg-descr
index 809dd988445e..88cb4024e488 100644
--- a/dns/dhid/pkg-descr
+++ b/dns/dhid/pkg-descr
@@ -1,14 +1,14 @@
-DHIS Daemon Client release 3.0
+DHIS Daemon Client release 3.1
 ==============================
 
 dhid is the DHIS client daemon. dhid is used to update the DNS tables on
 a DHIS provider.
 
 If you haven't done so yet, you will need to register your host with a
-DHIS provider. http://www.dhis.org/
+DHIS provider. http://www.dhis.org/dhis/services/
 
 dhid.conf should be configured according to the provider's assigned
-parameters.
+parameters. Use the dhid.conf.sample for a template.
 
 - Oryx
 oryx@ungulate.net
diff --git a/dns/dhid/pkg-message b/dns/dhid/pkg-message
new file mode 100644
index 000000000000..e430692548f8
--- /dev/null
+++ b/dns/dhid/pkg-message
@@ -0,0 +1,3 @@
+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.
diff --git a/net/dhid/Makefile b/net/dhid/Makefile
index 78a4c87bc0d9..f2ed00222c1d 100644
--- a/net/dhid/Makefile
+++ b/net/dhid/Makefile
@@ -27,8 +27,13 @@ post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/dhid.sh ]; then \
 		${ECHO} "===>   Installing ${PREFIX}/etc/rc.d/dhid.sh startup file."; \
 		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/dhid.sh; \
-		${ECHO} "[ -x ${PREFIX}/bin/dtool ] && ${PREFIX}/bin/dtool -s > /dev/null && echo -n ' dhid'" >> ${PREFIX}/etc/rc.d/dhid.sh; \
+		${ECHO} "[ -x \"${PREFIX}/sbin/dhid\" -a -f \"${PREFIX}/etc/dhid.conf\" ] && ${PREFIX}/sbin/dhid > /dev/null && echo -n ' dhid'" >> ${PREFIX}/etc/rc.d/dhid.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/dhid.sh; \
-	fi
+	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} "--------------------------------------------------------------------------"
 
 .include <bsd.port.mk>
diff --git a/net/dhid/files/patch-ab b/net/dhid/files/patch-ab
index bf91cebbd692..d04e19c05f80 100644
--- a/net/dhid/files/patch-ab
+++ b/net/dhid/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.orig	Thu Jan 13 20:15:01 2000
-+++ Makefile	Sun Jan 30 17:56:18 2000
+--- Makefile.orig	Thu Jan 13 23:15:01 2000
++++ Makefile	Thu Feb 10 23:13:56 2000
 @@ -25,17 +25,13 @@
  #
  #      DHIS(c)  Dynamic Host Information System Release 3.1
@@ -19,9 +19,3 @@
  
  main.o: dhid.h network.h conf.h main.c
  	$(CC) $(CFLAGS) -c main.c
-@@ -54,3 +50,5 @@
- 
- clean:
- 	$(RM) *.core core dhid *.o
-+
-+all:	dhid
diff --git a/net/dhid/pkg-comment b/net/dhid/pkg-comment
index b2f562e50e50..edea8d6cf8d1 100644
--- a/net/dhid/pkg-comment
+++ b/net/dhid/pkg-comment
@@ -1 +1 @@
-dhis client for updating dynamic DNS entries in dhisd DNS tables
+DHIS client for updating dynamic DNS entries in dhisd DNS tables
diff --git a/net/dhid/pkg-descr b/net/dhid/pkg-descr
index 809dd988445e..88cb4024e488 100644
--- a/net/dhid/pkg-descr
+++ b/net/dhid/pkg-descr
@@ -1,14 +1,14 @@
-DHIS Daemon Client release 3.0
+DHIS Daemon Client release 3.1
 ==============================
 
 dhid is the DHIS client daemon. dhid is used to update the DNS tables on
 a DHIS provider.
 
 If you haven't done so yet, you will need to register your host with a
-DHIS provider. http://www.dhis.org/
+DHIS provider. http://www.dhis.org/dhis/services/
 
 dhid.conf should be configured according to the provider's assigned
-parameters.
+parameters. Use the dhid.conf.sample for a template.
 
 - Oryx
 oryx@ungulate.net
diff --git a/net/dhid/pkg-message b/net/dhid/pkg-message
new file mode 100644
index 000000000000..e430692548f8
--- /dev/null
+++ b/net/dhid/pkg-message
@@ -0,0 +1,3 @@
+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.