aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net-mgmt/wide-dhcp/Makefile30
-rw-r--r--net-mgmt/wide-dhcp/files/patch-aa19
-rw-r--r--net-mgmt/wide-dhcp/files/patch-ae25
-rw-r--r--net-mgmt/wide-dhcp/files/patch-ag22
-rw-r--r--net-mgmt/wide-dhcp/files/patch-aq16
-rw-r--r--net-mgmt/wide-dhcp/pkg-descr2
-rw-r--r--net-mgmt/wide-dhcp/pkg-plist14
-rw-r--r--net/wide-dhcp/Makefile30
-rw-r--r--net/wide-dhcp/files/patch-aa19
-rw-r--r--net/wide-dhcp/files/patch-ae25
-rw-r--r--net/wide-dhcp/files/patch-ag22
-rw-r--r--net/wide-dhcp/files/patch-aq16
-rw-r--r--net/wide-dhcp/pkg-descr2
-rw-r--r--net/wide-dhcp/pkg-plist14
14 files changed, 152 insertions, 104 deletions
diff --git a/net-mgmt/wide-dhcp/Makefile b/net-mgmt/wide-dhcp/Makefile
index a2acd4f74f0c..8ac329ffd9bf 100644
--- a/net-mgmt/wide-dhcp/Makefile
+++ b/net-mgmt/wide-dhcp/Makefile
@@ -3,7 +3,7 @@
# Date created: 21 November 1995
# Whom: Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
#
-# $Id: Makefile,v 1.8 1997/04/04 02:19:46 brian Exp $
+# $Id: Makefile,v 1.9 1997/05/30 18:38:11 max Exp $
#
DISTNAME= dhcp-1.3beta
@@ -19,24 +19,32 @@ EXTRACT_ONLY= dhcp-1.3beta.tar.gz
IGNOREFILES= tzfile.h
MAKE_ENV= OSTYPE=`uname`
+MAN5= dhcpdb.server.5 dhcpdb.pool.5 dhcpdb.relay.5
+MAN8= dhcpc.8 dhcps.8 relay.8 dhcpm.8
+
STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/wide-dhcps.sh.sample
post-patch:
- if [ ! -f ${WRKSRC}/server/tzfile.h ]; then \
+ @if [ ! -f ${WRKSRC}/server/tzfile.h ]; then \
${CP} ${DISTDIR}/tzfile.h ${WRKSRC}/server/; \
fi
post-install:
- @if [ ! -d ${PREFIX}/share/dhcp ]; then \
- ${MKDIR} ${PREFIX}/share/dhcp; \
+.if !defined(NOPORTDOCS)
+ @if [ ! -d ${PREFIX}/share/doc/dhcp ]; then \
+ ${MKDIR} ${PREFIX}/share/doc/dhcp; \
+ fi
+ @if [ ! -d ${PREFIX}/share/examples/dhcp ]; then \
+ ${MKDIR} ${PREFIX}/share/examples/dhcp; \
fi
- @${CP} ${WRKSRC}/README ${PREFIX}/share/dhcp/
- @${CP} ${WRKSRC}/README.jis ${PREFIX}/share/dhcp/
- @${CP} ${WRKSRC}/db_sample/dhcpdb.pool ${PREFIX}/share/dhcp/dhcpdb.pool.sample
- @${CP} ${WRKSRC}/db_sample/dhcpdb.relay ${PREFIX}/share/dhcp/dhcpdb.relay.sample
- @${CP} ${WRKSRC}/db_sample/dhcpdb.server ${PREFIX}/share/dhcp/dhcpdb.server.sample
- @${CP} ${WRKSRC}/db_sample/intro.dhcp ${PREFIX}/share/dhcp/
- @${CP} ${WRKSRC}/db_sample/intro.dhcp.jis ${PREFIX}/share/dhcp/
+ @${CP} ${WRKSRC}/README ${PREFIX}/share/doc/dhcp/
+ @${CP} ${WRKSRC}/README.jis ${PREFIX}/share/doc/dhcp/
+ @${CP} ${WRKSRC}/db_sample/dhcpdb.pool ${PREFIX}/share/examples/dhcp/dhcpdb.pool.sample
+ @${CP} ${WRKSRC}/db_sample/dhcpdb.relay ${PREFIX}/share/examples/dhcp/dhcpdb.relay.sample
+ @${CP} ${WRKSRC}/db_sample/dhcpdb.server ${PREFIX}/share/examples/dhcp/dhcpdb.server.sample
+ @${CP} ${WRKSRC}/db_sample/intro.dhcp ${PREFIX}/share/doc/dhcp/
+ @${CP} ${WRKSRC}/db_sample/intro.dhcp.jis ${PREFIX}/share/doc/dhcp/
+.endif
@if [ ! -f ${STARTUP_SCRIPT} ]; then \
echo "Installing ${STARTUP_SCRIPT} startup file."; \
echo '#!/bin/sh' > ${STARTUP_SCRIPT}; \
diff --git a/net-mgmt/wide-dhcp/files/patch-aa b/net-mgmt/wide-dhcp/files/patch-aa
index 4c7a1baa9d40..551aad975a59 100644
--- a/net-mgmt/wide-dhcp/files/patch-aa
+++ b/net-mgmt/wide-dhcp/files/patch-aa
@@ -1,6 +1,6 @@
--- client/Makefile.FreeBSD.orig Mon Oct 9 14:34:12 1995
-+++ client/Makefile.FreeBSD Fri Mar 28 17:25:06 1997
-@@ -1,14 +1,22 @@
++++ client/Makefile.FreeBSD Fri May 30 22:46:17 1997
+@@ -1,17 +1,26 @@
INCLUDE = ../server/dhcp.h dhcpc.h common.h ../server/common_subr.h dhcpc_subr.h
OBJ = dhcpc_subr.o flushroute.o getmac.o common_subr.o dhcpc.o
-LDFLAGS =
@@ -8,6 +8,8 @@
+SBIN= ${PREFIX}/sbin
+LIBEXEC= ${PREFIX}/libexec
+MAN= ${PREFIX}/man
++CP= /bin/cp
++RM= /bin/rm
-CC = gcc
-CFLAGS = -Wall -g -I. -I../server #-DDEBUG
@@ -19,11 +21,14 @@
dhcpc: ${OBJ}
${CC} ${CFLAGS} -o dhcpc ${OBJ} ${LDFLAGS}
-+
+
+install: dhcpc
+ ${INSTALL} -c -m 755 -s dhcpc ${SBIN}/dhcpc
-+ cp dhcpc.8 ${MAN}/man8/dhcpc.8
-+ gzip -9nf ${MAN}/man8/dhcpc.8
-
++ ${CP} dhcpc.8 ${MAN}/man8/dhcpc.8
++
clean:
- rm -f *~ *.o *core* dhcpc
+- rm -f *~ *.o *core* dhcpc
++ ${RM} -f *~ *.o *core* dhcpc
+
+ dhcpc.o: dhcpc.c config.h ${INCLUDE}
+ dhcpc_subr.o: dhcpc_subr.c ${INCLUDE}
diff --git a/net-mgmt/wide-dhcp/files/patch-ae b/net-mgmt/wide-dhcp/files/patch-ae
index 355586233d15..98387aad7226 100644
--- a/net-mgmt/wide-dhcp/files/patch-ae
+++ b/net-mgmt/wide-dhcp/files/patch-ae
@@ -1,6 +1,6 @@
--- server/Makefile.FreeBSD.orig Mon Nov 6 16:18:41 1995
-+++ server/Makefile.FreeBSD Fri Mar 28 17:26:44 1997
-@@ -1,13 +1,25 @@
++++ server/Makefile.FreeBSD Fri May 30 22:47:17 1997
+@@ -1,16 +1,27 @@
OBJ = dhcps.o database.o hash.o ctime.o getmac.o common_subr.o \
interface.o delarp.o
-LDFLAGS =
@@ -15,18 +15,21 @@
+SBIN= ${PREFIX}/sbin
+LIBEXEC= ${PREFIX}/libexec
+MAN= ${PREFIX}/man
++CP= /bin/cp
++RM= /bin/rm
dhcps: ${OBJ}
${CC} ${CFLAGS} -o dhcps ${OBJ} ${LDFLAGS}
-+
+
+install: dhcps
+ ${INSTALL} -c -m 755 -s dhcps ${SBIN}/dhcps
-+ cp dhcpdb.pool.5 ${MAN}/man5/dhcpdb.pool.5
-+ gzip -9nf ${MAN}/man5/dhcpdb.pool.5
-+ cp dhcpdb.relay.5 ${MAN}/man5/dhcpdb.relay.5
-+ gzip -9nf ${MAN}/man5/dhcpdb.relay.5
-+ cp dhcps.8 ${MAN}/man8/dhcps.8
-+ gzip -9nf ${MAN}/man8/dhcps.8
-
++ ${CP} dhcpdb.pool.5 ${MAN}/man5/dhcpdb.pool.5
++ ${CP} dhcpdb.relay.5 ${MAN}/man5/dhcpdb.relay.5
++ ${CP} dhcps.8 ${MAN}/man8/dhcps.8
++
clean:
- rm -f *~ *.o *core* dhcps
+- rm -f *~ *.o *core* dhcps
++ ${RM} -f *~ *.o *core* dhcps
+
+ dhcps.o: dhcps.c dhcp.h common.h common_subr.h hash.h dhcps.h
+ database.o: database.c dhcp.h common.h hash.h database.h
diff --git a/net-mgmt/wide-dhcp/files/patch-ag b/net-mgmt/wide-dhcp/files/patch-ag
index 8971d5a1c61d..3608eae0c716 100644
--- a/net-mgmt/wide-dhcp/files/patch-ag
+++ b/net-mgmt/wide-dhcp/files/patch-ag
@@ -1,6 +1,6 @@
--- relay/Makefile.FreeBSD.orig Mon Oct 9 15:09:37 1995
-+++ relay/Makefile.FreeBSD Fri Mar 28 17:26:07 1997
-@@ -1,12 +1,22 @@
++++ relay/Makefile.FreeBSD Fri May 30 22:47:02 1997
+@@ -1,17 +1,27 @@
OBJ = relay.o getmac.o common_subr.o interface.o
-CC = gcc
-CFLAGS = -g -Wall -I. -I../server
@@ -14,16 +14,22 @@
+SBIN= ${PREFIX}/sbin
+LIBEXEC= ${PREFIX}/libexec
+MAN= ${PREFIX}/man
++CP= /bin/cp
++RM= /bin/rm
relay: ${OBJ}
${CC} ${CFLAGS} -o relay ${OBJ} ${LDFLAGS}
-+
+
+install: relay
+ ${INSTALL} -c -m 755 -s relay ${SBIN}/relay
-+ cp relay.8 ${MAN}/man8/relay.8
-+ gzip -9nf ${MAN}/man8/relay.8
-+ cp dhcpdb.server.5 ${MAN}/man5/dhcpdb.server.5
-+ gzip -9nf ${MAN}/man5/dhcpdb.server.5
-
++ ${CP} relay.8 ${MAN}/man8/relay.8
++ ${CP} dhcpdb.server.5 ${MAN}/man5/dhcpdb.server.5
++
relay.o: relay.c common.h ../server/dhcp.h ../server/common_subr.h
common_subr.o: ../server/common_subr.c ../server/dhcp.h common.h ../server/common_subr.h
+ interface.o: ../server/interface.c common.h
+ getmac.o: ../server/getmac.c
+
+ clean:
+- rm -f *~ *.o *core* relay
++ ${RM} -f *~ *.o *core* relay
diff --git a/net-mgmt/wide-dhcp/files/patch-aq b/net-mgmt/wide-dhcp/files/patch-aq
index 2ed36637b3b8..ef3fca399aa7 100644
--- a/net-mgmt/wide-dhcp/files/patch-aq
+++ b/net-mgmt/wide-dhcp/files/patch-aq
@@ -1,6 +1,6 @@
--- tools/Makefile.FreeBSD.orig Mon Oct 9 15:00:53 1995
-+++ tools/Makefile.FreeBSD Fri Mar 28 17:27:46 1997
-@@ -1,10 +1,18 @@
++++ tools/Makefile.FreeBSD Fri May 30 22:48:22 1997
+@@ -1,10 +1,19 @@
-CC = gcc
-CFLAGS = -g -Wall -I. -I../server
-#CC = cc
@@ -11,14 +11,16 @@
+SBIN= ${PREFIX}/sbin
+LIBEXEC= ${PREFIX}/libexec
+MAN= ${PREFIX}/man
++CP= /bin/cp
++RM= /bin/rm
dhcpm: dhcpm.c ../server/dhcp.h
$(CC) $(CFLAGS) dhcpm.c -o dhcpm
-+
+
+install: dhcpm
+ ${INSTALL} -c -m 755 -s dhcpm ${SBIN}/dhcpm
-+ cp dhcpm.8 ${MAN}/man8/dhcpm.8
-+ gzip -9nf ${MAN}/man8/dhcpm.8
-
++ ${CP} dhcpm.8 ${MAN}/man8/dhcpm.8
++
clean:
- rm -rf *~ *.o *core* dhcpm
+- rm -rf *~ *.o *core* dhcpm
++ ${RM} -rf *~ *.o *core* dhcpm
diff --git a/net-mgmt/wide-dhcp/pkg-descr b/net-mgmt/wide-dhcp/pkg-descr
index 654d00f2a907..3ba94776cc1a 100644
--- a/net-mgmt/wide-dhcp/pkg-descr
+++ b/net-mgmt/wide-dhcp/pkg-descr
@@ -41,7 +41,7 @@ cd /dev
** dhcpdb.relay file is need without relay agent **
Please read more information in
- /usr/local/share/dhcp/intro.dhcp.
+ /usr/local/share/doc/dhcp/intro.dhcp or intro.dhcp.jis.
** CHECK_SUM Problem under FreeBSD 2.1.x **
diff --git a/net-mgmt/wide-dhcp/pkg-plist b/net-mgmt/wide-dhcp/pkg-plist
index e4cf4b8299b5..1dfaa3c6fb0c 100644
--- a/net-mgmt/wide-dhcp/pkg-plist
+++ b/net-mgmt/wide-dhcp/pkg-plist
@@ -9,13 +9,13 @@ man/man8/dhcpm.8.gz
man/man5/dhcpdb.server.5.gz
man/man5/dhcpdb.pool.5.gz
man/man5/dhcpdb.relay.5.gz
-share/dhcp/README
-share/dhcp/README.jis
-share/dhcp/intro.dhcp
-share/dhcp/intro.dhcp.jis
-share/dhcp/dhcpdb.pool.sample
-share/dhcp/dhcpdb.relay.sample
-share/dhcp/dhcpdb.server.sample
+share/doc/dhcp/README
+share/doc/dhcp/README.jis
+share/doc/dhcp/intro.dhcp
+share/doc/dhcp/intro.dhcp.jis
+share/examples/dhcp/dhcpdb.pool.sample
+share/examples/dhcp/dhcpdb.relay.sample
+share/examples/dhcp/dhcpdb.server.sample
etc/rc.d/wide-dhcps.sh.sample
@exec echo "updating /etc/services"; cp /etc/services /etc/services.bak; (grep -v ^dhcps /etc/services.bak ; echo "dhcps 67/udp # dhcp server") > /etc/services
@unexec echo "updating /etc/services"; cp /etc/services /etc/services.bak; (grep -v ^dhcps /etc/services.bak ) > /etc/services
diff --git a/net/wide-dhcp/Makefile b/net/wide-dhcp/Makefile
index a2acd4f74f0c..8ac329ffd9bf 100644
--- a/net/wide-dhcp/Makefile
+++ b/net/wide-dhcp/Makefile
@@ -3,7 +3,7 @@
# Date created: 21 November 1995
# Whom: Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
#
-# $Id: Makefile,v 1.8 1997/04/04 02:19:46 brian Exp $
+# $Id: Makefile,v 1.9 1997/05/30 18:38:11 max Exp $
#
DISTNAME= dhcp-1.3beta
@@ -19,24 +19,32 @@ EXTRACT_ONLY= dhcp-1.3beta.tar.gz
IGNOREFILES= tzfile.h
MAKE_ENV= OSTYPE=`uname`
+MAN5= dhcpdb.server.5 dhcpdb.pool.5 dhcpdb.relay.5
+MAN8= dhcpc.8 dhcps.8 relay.8 dhcpm.8
+
STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/wide-dhcps.sh.sample
post-patch:
- if [ ! -f ${WRKSRC}/server/tzfile.h ]; then \
+ @if [ ! -f ${WRKSRC}/server/tzfile.h ]; then \
${CP} ${DISTDIR}/tzfile.h ${WRKSRC}/server/; \
fi
post-install:
- @if [ ! -d ${PREFIX}/share/dhcp ]; then \
- ${MKDIR} ${PREFIX}/share/dhcp; \
+.if !defined(NOPORTDOCS)
+ @if [ ! -d ${PREFIX}/share/doc/dhcp ]; then \
+ ${MKDIR} ${PREFIX}/share/doc/dhcp; \
+ fi
+ @if [ ! -d ${PREFIX}/share/examples/dhcp ]; then \
+ ${MKDIR} ${PREFIX}/share/examples/dhcp; \
fi
- @${CP} ${WRKSRC}/README ${PREFIX}/share/dhcp/
- @${CP} ${WRKSRC}/README.jis ${PREFIX}/share/dhcp/
- @${CP} ${WRKSRC}/db_sample/dhcpdb.pool ${PREFIX}/share/dhcp/dhcpdb.pool.sample
- @${CP} ${WRKSRC}/db_sample/dhcpdb.relay ${PREFIX}/share/dhcp/dhcpdb.relay.sample
- @${CP} ${WRKSRC}/db_sample/dhcpdb.server ${PREFIX}/share/dhcp/dhcpdb.server.sample
- @${CP} ${WRKSRC}/db_sample/intro.dhcp ${PREFIX}/share/dhcp/
- @${CP} ${WRKSRC}/db_sample/intro.dhcp.jis ${PREFIX}/share/dhcp/
+ @${CP} ${WRKSRC}/README ${PREFIX}/share/doc/dhcp/
+ @${CP} ${WRKSRC}/README.jis ${PREFIX}/share/doc/dhcp/
+ @${CP} ${WRKSRC}/db_sample/dhcpdb.pool ${PREFIX}/share/examples/dhcp/dhcpdb.pool.sample
+ @${CP} ${WRKSRC}/db_sample/dhcpdb.relay ${PREFIX}/share/examples/dhcp/dhcpdb.relay.sample
+ @${CP} ${WRKSRC}/db_sample/dhcpdb.server ${PREFIX}/share/examples/dhcp/dhcpdb.server.sample
+ @${CP} ${WRKSRC}/db_sample/intro.dhcp ${PREFIX}/share/doc/dhcp/
+ @${CP} ${WRKSRC}/db_sample/intro.dhcp.jis ${PREFIX}/share/doc/dhcp/
+.endif
@if [ ! -f ${STARTUP_SCRIPT} ]; then \
echo "Installing ${STARTUP_SCRIPT} startup file."; \
echo '#!/bin/sh' > ${STARTUP_SCRIPT}; \
diff --git a/net/wide-dhcp/files/patch-aa b/net/wide-dhcp/files/patch-aa
index 4c7a1baa9d40..551aad975a59 100644
--- a/net/wide-dhcp/files/patch-aa
+++ b/net/wide-dhcp/files/patch-aa
@@ -1,6 +1,6 @@
--- client/Makefile.FreeBSD.orig Mon Oct 9 14:34:12 1995
-+++ client/Makefile.FreeBSD Fri Mar 28 17:25:06 1997
-@@ -1,14 +1,22 @@
++++ client/Makefile.FreeBSD Fri May 30 22:46:17 1997
+@@ -1,17 +1,26 @@
INCLUDE = ../server/dhcp.h dhcpc.h common.h ../server/common_subr.h dhcpc_subr.h
OBJ = dhcpc_subr.o flushroute.o getmac.o common_subr.o dhcpc.o
-LDFLAGS =
@@ -8,6 +8,8 @@
+SBIN= ${PREFIX}/sbin
+LIBEXEC= ${PREFIX}/libexec
+MAN= ${PREFIX}/man
++CP= /bin/cp
++RM= /bin/rm
-CC = gcc
-CFLAGS = -Wall -g -I. -I../server #-DDEBUG
@@ -19,11 +21,14 @@
dhcpc: ${OBJ}
${CC} ${CFLAGS} -o dhcpc ${OBJ} ${LDFLAGS}
-+
+
+install: dhcpc
+ ${INSTALL} -c -m 755 -s dhcpc ${SBIN}/dhcpc
-+ cp dhcpc.8 ${MAN}/man8/dhcpc.8
-+ gzip -9nf ${MAN}/man8/dhcpc.8
-
++ ${CP} dhcpc.8 ${MAN}/man8/dhcpc.8
++
clean:
- rm -f *~ *.o *core* dhcpc
+- rm -f *~ *.o *core* dhcpc
++ ${RM} -f *~ *.o *core* dhcpc
+
+ dhcpc.o: dhcpc.c config.h ${INCLUDE}
+ dhcpc_subr.o: dhcpc_subr.c ${INCLUDE}
diff --git a/net/wide-dhcp/files/patch-ae b/net/wide-dhcp/files/patch-ae
index 355586233d15..98387aad7226 100644
--- a/net/wide-dhcp/files/patch-ae
+++ b/net/wide-dhcp/files/patch-ae
@@ -1,6 +1,6 @@
--- server/Makefile.FreeBSD.orig Mon Nov 6 16:18:41 1995
-+++ server/Makefile.FreeBSD Fri Mar 28 17:26:44 1997
-@@ -1,13 +1,25 @@
++++ server/Makefile.FreeBSD Fri May 30 22:47:17 1997
+@@ -1,16 +1,27 @@
OBJ = dhcps.o database.o hash.o ctime.o getmac.o common_subr.o \
interface.o delarp.o
-LDFLAGS =
@@ -15,18 +15,21 @@
+SBIN= ${PREFIX}/sbin
+LIBEXEC= ${PREFIX}/libexec
+MAN= ${PREFIX}/man
++CP= /bin/cp
++RM= /bin/rm
dhcps: ${OBJ}
${CC} ${CFLAGS} -o dhcps ${OBJ} ${LDFLAGS}
-+
+
+install: dhcps
+ ${INSTALL} -c -m 755 -s dhcps ${SBIN}/dhcps
-+ cp dhcpdb.pool.5 ${MAN}/man5/dhcpdb.pool.5
-+ gzip -9nf ${MAN}/man5/dhcpdb.pool.5
-+ cp dhcpdb.relay.5 ${MAN}/man5/dhcpdb.relay.5
-+ gzip -9nf ${MAN}/man5/dhcpdb.relay.5
-+ cp dhcps.8 ${MAN}/man8/dhcps.8
-+ gzip -9nf ${MAN}/man8/dhcps.8
-
++ ${CP} dhcpdb.pool.5 ${MAN}/man5/dhcpdb.pool.5
++ ${CP} dhcpdb.relay.5 ${MAN}/man5/dhcpdb.relay.5
++ ${CP} dhcps.8 ${MAN}/man8/dhcps.8
++
clean:
- rm -f *~ *.o *core* dhcps
+- rm -f *~ *.o *core* dhcps
++ ${RM} -f *~ *.o *core* dhcps
+
+ dhcps.o: dhcps.c dhcp.h common.h common_subr.h hash.h dhcps.h
+ database.o: database.c dhcp.h common.h hash.h database.h
diff --git a/net/wide-dhcp/files/patch-ag b/net/wide-dhcp/files/patch-ag
index 8971d5a1c61d..3608eae0c716 100644
--- a/net/wide-dhcp/files/patch-ag
+++ b/net/wide-dhcp/files/patch-ag
@@ -1,6 +1,6 @@
--- relay/Makefile.FreeBSD.orig Mon Oct 9 15:09:37 1995
-+++ relay/Makefile.FreeBSD Fri Mar 28 17:26:07 1997
-@@ -1,12 +1,22 @@
++++ relay/Makefile.FreeBSD Fri May 30 22:47:02 1997
+@@ -1,17 +1,27 @@
OBJ = relay.o getmac.o common_subr.o interface.o
-CC = gcc
-CFLAGS = -g -Wall -I. -I../server
@@ -14,16 +14,22 @@
+SBIN= ${PREFIX}/sbin
+LIBEXEC= ${PREFIX}/libexec
+MAN= ${PREFIX}/man
++CP= /bin/cp
++RM= /bin/rm
relay: ${OBJ}
${CC} ${CFLAGS} -o relay ${OBJ} ${LDFLAGS}
-+
+
+install: relay
+ ${INSTALL} -c -m 755 -s relay ${SBIN}/relay
-+ cp relay.8 ${MAN}/man8/relay.8
-+ gzip -9nf ${MAN}/man8/relay.8
-+ cp dhcpdb.server.5 ${MAN}/man5/dhcpdb.server.5
-+ gzip -9nf ${MAN}/man5/dhcpdb.server.5
-
++ ${CP} relay.8 ${MAN}/man8/relay.8
++ ${CP} dhcpdb.server.5 ${MAN}/man5/dhcpdb.server.5
++
relay.o: relay.c common.h ../server/dhcp.h ../server/common_subr.h
common_subr.o: ../server/common_subr.c ../server/dhcp.h common.h ../server/common_subr.h
+ interface.o: ../server/interface.c common.h
+ getmac.o: ../server/getmac.c
+
+ clean:
+- rm -f *~ *.o *core* relay
++ ${RM} -f *~ *.o *core* relay
diff --git a/net/wide-dhcp/files/patch-aq b/net/wide-dhcp/files/patch-aq
index 2ed36637b3b8..ef3fca399aa7 100644
--- a/net/wide-dhcp/files/patch-aq
+++ b/net/wide-dhcp/files/patch-aq
@@ -1,6 +1,6 @@
--- tools/Makefile.FreeBSD.orig Mon Oct 9 15:00:53 1995
-+++ tools/Makefile.FreeBSD Fri Mar 28 17:27:46 1997
-@@ -1,10 +1,18 @@
++++ tools/Makefile.FreeBSD Fri May 30 22:48:22 1997
+@@ -1,10 +1,19 @@
-CC = gcc
-CFLAGS = -g -Wall -I. -I../server
-#CC = cc
@@ -11,14 +11,16 @@
+SBIN= ${PREFIX}/sbin
+LIBEXEC= ${PREFIX}/libexec
+MAN= ${PREFIX}/man
++CP= /bin/cp
++RM= /bin/rm
dhcpm: dhcpm.c ../server/dhcp.h
$(CC) $(CFLAGS) dhcpm.c -o dhcpm
-+
+
+install: dhcpm
+ ${INSTALL} -c -m 755 -s dhcpm ${SBIN}/dhcpm
-+ cp dhcpm.8 ${MAN}/man8/dhcpm.8
-+ gzip -9nf ${MAN}/man8/dhcpm.8
-
++ ${CP} dhcpm.8 ${MAN}/man8/dhcpm.8
++
clean:
- rm -rf *~ *.o *core* dhcpm
+- rm -rf *~ *.o *core* dhcpm
++ ${RM} -rf *~ *.o *core* dhcpm
diff --git a/net/wide-dhcp/pkg-descr b/net/wide-dhcp/pkg-descr
index 654d00f2a907..3ba94776cc1a 100644
--- a/net/wide-dhcp/pkg-descr
+++ b/net/wide-dhcp/pkg-descr
@@ -41,7 +41,7 @@ cd /dev
** dhcpdb.relay file is need without relay agent **
Please read more information in
- /usr/local/share/dhcp/intro.dhcp.
+ /usr/local/share/doc/dhcp/intro.dhcp or intro.dhcp.jis.
** CHECK_SUM Problem under FreeBSD 2.1.x **
diff --git a/net/wide-dhcp/pkg-plist b/net/wide-dhcp/pkg-plist
index e4cf4b8299b5..1dfaa3c6fb0c 100644
--- a/net/wide-dhcp/pkg-plist
+++ b/net/wide-dhcp/pkg-plist
@@ -9,13 +9,13 @@ man/man8/dhcpm.8.gz
man/man5/dhcpdb.server.5.gz
man/man5/dhcpdb.pool.5.gz
man/man5/dhcpdb.relay.5.gz
-share/dhcp/README
-share/dhcp/README.jis
-share/dhcp/intro.dhcp
-share/dhcp/intro.dhcp.jis
-share/dhcp/dhcpdb.pool.sample
-share/dhcp/dhcpdb.relay.sample
-share/dhcp/dhcpdb.server.sample
+share/doc/dhcp/README
+share/doc/dhcp/README.jis
+share/doc/dhcp/intro.dhcp
+share/doc/dhcp/intro.dhcp.jis
+share/examples/dhcp/dhcpdb.pool.sample
+share/examples/dhcp/dhcpdb.relay.sample
+share/examples/dhcp/dhcpdb.server.sample
etc/rc.d/wide-dhcps.sh.sample
@exec echo "updating /etc/services"; cp /etc/services /etc/services.bak; (grep -v ^dhcps /etc/services.bak ; echo "dhcps 67/udp # dhcp server") > /etc/services
@unexec echo "updating /etc/services"; cp /etc/services /etc/services.bak; (grep -v ^dhcps /etc/services.bak ) > /etc/services