aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkris <kris@FreeBSD.org>2000-02-06 06:07:51 +0800
committerkris <kris@FreeBSD.org>2000-02-06 06:07:51 +0800
commit193d1698844c5e2893a833d56ac08cadfea8e3c6 (patch)
tree834353f826be9a6cd91737bc22b29eecc5f75352
parentfdc9205e3e96248efd19327016824c3e8ea19744 (diff)
downloadfreebsd-ports-gnome-193d1698844c5e2893a833d56ac08cadfea8e3c6.tar.gz
freebsd-ports-gnome-193d1698844c5e2893a833d56ac08cadfea8e3c6.tar.zst
freebsd-ports-gnome-193d1698844c5e2893a833d56ac08cadfea8e3c6.zip
Unbreak this port by upgrading to dhid 3.1. I don't use this software,
so I had to play it a bit by ear, but I didn't hear back from the maintainer. Noticed by: bento
-rw-r--r--dns/dhid/Makefile12
-rw-r--r--dns/dhid/distinfo2
-rw-r--r--dns/dhid/files/patch-ab13
-rw-r--r--dns/dhid/pkg-plist3
-rw-r--r--net/dhid/Makefile12
-rw-r--r--net/dhid/distinfo2
-rw-r--r--net/dhid/files/patch-ab13
-rw-r--r--net/dhid/pkg-plist3
8 files changed, 28 insertions, 32 deletions
diff --git a/dns/dhid/Makefile b/dns/dhid/Makefile
index 8eea3762a59b..78a4c87bc0d9 100644
--- a/dns/dhid/Makefile
+++ b/dns/dhid/Makefile
@@ -1,31 +1,27 @@
# New ports collection makefile for: dhid
-# Version required: 3.0
+# Version required: 3.1
# Date created: Sat Aug 21 06:13:59 EDT 1999
# Whom: Oryx Gazella <oryx@ungulate.net>
#
# $FreeBSD$
#
-DISTNAME= dhid-3.0
+DISTNAME= dhid-3.1
CATEGORIES= net
MASTER_SITES= ftp://ftp.dhis.org/pub/dhis/
MAINTAINER= oryx@ungulate.net
-MAN1= dtool.1
MAN8= dhid.8
post-patch:
- @${ECHO} "===> Patching dtool script and dhid.h"
- ${PERL} -i -p -e "s^__PREFIX__^${PREFIX}^g" ${WRKSRC}/dtool
+ @${ECHO} "===> Patching dhid.h"
${PERL} -i -p -e "s^__PREFIX__^${PREFIX}^g" ${WRKSRC}/dhid.h
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/dhid ${PREFIX}/sbin
- ${INSTALL_SCRIPT} ${WRKSRC}/dtool ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/dhid.8 ${PREFIX}/man/man8
- ${INSTALL_MAN} ${WRKSRC}/dtool.1 ${PREFIX}/man/man1
- ${INSTALL} ${COPY} -o root -g wheel -m 600 ${WRKSRC}/dhid.conf ${PREFIX}/etc
+ ${INSTALL} ${COPY} -o root -g wheel -m 600 ${WRKSRC}/dhid.conf ${PREFIX}/etc/dhid.conf.sample
post-install:
@if [ ! -f ${PREFIX}/etc/rc.d/dhid.sh ]; then \
diff --git a/dns/dhid/distinfo b/dns/dhid/distinfo
index 308d1382d5e3..096c43f441ba 100644
--- a/dns/dhid/distinfo
+++ b/dns/dhid/distinfo
@@ -1 +1 @@
-MD5 (dhid-3.0.tar.gz) = 36edaabe2d6fe00d88ac9c3c50b46050
+MD5 (dhid-3.1.tar.gz) = f419031035f79936592c8ecf97fbe62c
diff --git a/dns/dhid/files/patch-ab b/dns/dhid/files/patch-ab
index 9b8c48326762..bf91cebbd692 100644
--- a/dns/dhid/files/patch-ab
+++ b/dns/dhid/files/patch-ab
@@ -1,22 +1,25 @@
---- Makefile.orig Tue Jun 22 07:30:37 1999
-+++ Makefile Sat Aug 21 04:41:26 1999
-@@ -25,15 +25,10 @@
+--- Makefile.orig Thu Jan 13 20:15:01 2000
++++ Makefile Sun Jan 30 17:56:18 2000
+@@ -25,17 +25,13 @@
#
- # DHIS(c) Dynamic Host Information System Release 3.0
+ # DHIS(c) Dynamic Host Information System Release 3.1
-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
main.o: dhid.h network.h conf.h main.c
$(CC) $(CFLAGS) -c main.c
-@@ -52,3 +47,5 @@
+@@ -54,3 +50,5 @@
clean:
$(RM) *.core core dhid *.o
diff --git a/dns/dhid/pkg-plist b/dns/dhid/pkg-plist
index 3b4de5246d24..179602d78992 100644
--- a/dns/dhid/pkg-plist
+++ b/dns/dhid/pkg-plist
@@ -1,4 +1,3 @@
-bin/dtool
-etc/dhid.conf
+etc/dhid.conf.sample
etc/rc.d/dhid.sh
sbin/dhid
diff --git a/net/dhid/Makefile b/net/dhid/Makefile
index 8eea3762a59b..78a4c87bc0d9 100644
--- a/net/dhid/Makefile
+++ b/net/dhid/Makefile
@@ -1,31 +1,27 @@
# New ports collection makefile for: dhid
-# Version required: 3.0
+# Version required: 3.1
# Date created: Sat Aug 21 06:13:59 EDT 1999
# Whom: Oryx Gazella <oryx@ungulate.net>
#
# $FreeBSD$
#
-DISTNAME= dhid-3.0
+DISTNAME= dhid-3.1
CATEGORIES= net
MASTER_SITES= ftp://ftp.dhis.org/pub/dhis/
MAINTAINER= oryx@ungulate.net
-MAN1= dtool.1
MAN8= dhid.8
post-patch:
- @${ECHO} "===> Patching dtool script and dhid.h"
- ${PERL} -i -p -e "s^__PREFIX__^${PREFIX}^g" ${WRKSRC}/dtool
+ @${ECHO} "===> Patching dhid.h"
${PERL} -i -p -e "s^__PREFIX__^${PREFIX}^g" ${WRKSRC}/dhid.h
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/dhid ${PREFIX}/sbin
- ${INSTALL_SCRIPT} ${WRKSRC}/dtool ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/dhid.8 ${PREFIX}/man/man8
- ${INSTALL_MAN} ${WRKSRC}/dtool.1 ${PREFIX}/man/man1
- ${INSTALL} ${COPY} -o root -g wheel -m 600 ${WRKSRC}/dhid.conf ${PREFIX}/etc
+ ${INSTALL} ${COPY} -o root -g wheel -m 600 ${WRKSRC}/dhid.conf ${PREFIX}/etc/dhid.conf.sample
post-install:
@if [ ! -f ${PREFIX}/etc/rc.d/dhid.sh ]; then \
diff --git a/net/dhid/distinfo b/net/dhid/distinfo
index 308d1382d5e3..096c43f441ba 100644
--- a/net/dhid/distinfo
+++ b/net/dhid/distinfo
@@ -1 +1 @@
-MD5 (dhid-3.0.tar.gz) = 36edaabe2d6fe00d88ac9c3c50b46050
+MD5 (dhid-3.1.tar.gz) = f419031035f79936592c8ecf97fbe62c
diff --git a/net/dhid/files/patch-ab b/net/dhid/files/patch-ab
index 9b8c48326762..bf91cebbd692 100644
--- a/net/dhid/files/patch-ab
+++ b/net/dhid/files/patch-ab
@@ -1,22 +1,25 @@
---- Makefile.orig Tue Jun 22 07:30:37 1999
-+++ Makefile Sat Aug 21 04:41:26 1999
-@@ -25,15 +25,10 @@
+--- Makefile.orig Thu Jan 13 20:15:01 2000
++++ Makefile Sun Jan 30 17:56:18 2000
+@@ -25,17 +25,13 @@
#
- # DHIS(c) Dynamic Host Information System Release 3.0
+ # DHIS(c) Dynamic Host Information System Release 3.1
-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
main.o: dhid.h network.h conf.h main.c
$(CC) $(CFLAGS) -c main.c
-@@ -52,3 +47,5 @@
+@@ -54,3 +50,5 @@
clean:
$(RM) *.core core dhid *.o
diff --git a/net/dhid/pkg-plist b/net/dhid/pkg-plist
index 3b4de5246d24..179602d78992 100644
--- a/net/dhid/pkg-plist
+++ b/net/dhid/pkg-plist
@@ -1,4 +1,3 @@
-bin/dtool
-etc/dhid.conf
+etc/dhid.conf.sample
etc/rc.d/dhid.sh
sbin/dhid