net/isc-dhcp3 is splitted to 1 master port and 3 slaves ports : - net/isc-dhcp3-server (master) - net/isc-dhcp3-client (slave) - net/isc-dhcp3-devel (slave) - net/isc-dhcp3-relay (slave) to do this, a lot of changes has been made Makefile toomany changes to describe :) pkg-descr updated pkg-message pkg-plist shrinked files/omshell::Makefile.dist files/patch-dhcpctl::Makefile.dist new files -- since dhcpctl is splitted in 2 directories, a new Makefile is needed for the new directory files/patch-Makefile files/patch-Makefile.dist files/patch-configure new files -- sub-targets added Fix: first of all, ports/net/isc-dhcp3 should be moved to isc-dhcp3-server (repo-copy). take care, this patch set is in three parts. the first one is a cvs diff, the second one a diff against /dev/null and the third one are 3 shar archives. ==========----------========== cvs diff ==========----------========== ==========----------========== devel shar ==========----------========== ==========----------========== relay shar ==========----------========== ==========----------========== end of PR ==========----------==========--Law2g4QmsKY2z0DZyXDESRgasvtjIBK4h9IknLYRDKn5qXkD Content-Type: text/plain; name="file.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="file.diff" Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/isc-dhcp3/Makefile,v retrieving revision 1.86 diff -u -I$Id.*$ -I$.+BSD.*$ -r1.86 Makefile --- Makefile 21 Feb 2003 13:14:46 -0000 1.86 +++ Makefile 28 Apr 2003 21:23:00 -0000 @@ -13,14 +13,14 @@ MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= dhcp dhcp/dhcp-3.0-history PKGNAMEPREFIX= isc- -PKGNAMESUFFIX= 3 +PKGNAMESUFFIX= 3-${SUBSYS} DISTNAME= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL} PATCH_SITES= http://security.debian.org/pool/updates/main/d/dhcp3/ PATCHFILES= dhcp3_3.0+3.0.1rc9-2.2.diff.gz PATCH_DIST_STRIP=-p1 MAINTAINER= cyrille.lefevre@laposte.net -COMMENT= ISC Dynamic Host Configuration Protocol client and server code +COMMENT?= The ISC Dynamic Host Configuration Protocol server USE_REINPLACE= yes @@ -30,16 +30,32 @@ # HAS_CONFIGURE= yes - +CONFIGURE_ARGS= --subsys ${SUBSYS} +ALL_TARGET= all.${SUBSYS} +INSTALL_TARGET= install.${SUBSYS} + +SUBSYS?= server + +.if ${SUBSYS} == client +MAN5= dhclient.conf.5 dhclient.leases.5 +MAN8= dhclient.8 dhclient-script.8 +.elif ${SUBSYS} == server MAN1= omshell.1 -MAN3= dhcpctl.3 omapi.3 omshell.3 -MAN5= dhclient.conf.5 dhclient.leases.5 \ - dhcp-eval.5 dhcp-options.5 dhcpd.conf.5 \ - dhcpd.leases.5 -MAN8= dhclient.8 dhclient-script.8 dhcpd.8 dhcrelay.8 +MAN5= dhcpd.conf.5 dhcpd.leases.5 +MAN8= dhcpd.8 +.elif ${SUBSYS} == relay +MAN8= dhcrelay.8 +.else +MAN3= dhcpctl.3 omapi.3 +.endif +.if ${SUBSYS} != relay +MAN5+= dhcp-eval.5 dhcp-options.5 +.endif -MSG_FILE= ${PKGDIR}/pkg-message +DESCR= ${.CURDIR}/pkg-descr +MSG_FILE= ${.CURDIR}/pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message +PLIST= ${.CURDIR}/pkg-plist # Local variables # @@ -65,14 +81,32 @@ RELEASE= ${PORTVERSION} .endif -PATCH_SUBDIRS= common minires dst omapip server client relay dhcpctl +PATCH_SUBDIRS= common minires dst omapip +.if ${SUBSYS} == server || ${SUBSYS} == devel +PATCH_SUBDIRS+= dhcpctl +.endif +.if ${SUBSYS} != devel +PATCH_SUBDIRS+= ${SUBSYS} +.endif +.if ${SUBSYS} == server +PATCH_SUBDIRS+= omshell +.endif -BIN_FILES= dhclient dhcpd dhcrelay omshell +.if ${SUBSYS} == client +BIN_FILES= dhclient CONF_FILES= dhclient.conf -RC_FILES= isc-dhcpd isc-dhcrelay +SAMP_FILES= client/dhclient.conf +DATA_FILES= dhclient.leases +.elif ${SUBSYS} == server +BIN_FILES= dhcpd omshell +RC_FILES= isc-dhcpd +SAMP_FILES= server/dhcpd.conf +DATA_FILES= dhcpd.leases +.elif ${SUBSYS} == relay +BIN_FILES= dhcrelay +RC_FILES= isc-dhcrelay +.endif DOC_FILES= ANONCVS CHANGES COPYRIGHT README RELNOTES -SAMP_FILES= client/dhclient.conf server/dhcpd.conf -DATA_FILES= dhclient.leases dhcpd.leases SAMP_SUFX= .sample @@ -82,6 +116,17 @@ DATADIR= /var/db STRIP_CMD?= strip + +# Post-extract +# + +post-extract: extract-omshell + +extract-omshell: + @${MKDIR} ${WRKSRC}/omshell + @${MV} ${WRKSRC}/dhcpctl/omshell.? ${WRKSRC}/omshell + @${CP} ${FILESDIR}/omshell::Makefile.dist \ + ${WRKSRC}/omshell/Makefile.dist # Post-patch # Index: pkg-descr =================================================================== RCS file: /home/ncvs/ports/net/isc-dhcp3/pkg-descr,v retrieving revision 1.8 diff -u -I$Id.*$ -I$.+BSD.*$ -r1.8 pkg-descr --- pkg-descr 20 Apr 2001 16:14:52 -0000 1.8 +++ pkg-descr 28 Apr 2003 11:00:11 -0000 @@ -2,7 +2,7 @@ freely redistributable reference implementation of all aspects of the DHCP protocol, through a suite of DHCP tools: - * A DHCP server + * A DHCP server (this port) * A DHCP client * A DHCP relay agent Index: pkg-message =================================================================== RCS file: /home/ncvs/ports/net/isc-dhcp3/pkg-message,v retrieving revision 1.2 diff -u -I$Id.*$ -I$.+BSD.*$ -r1.2 pkg-message --- pkg-message 19 Oct 2001 03:12:25 -0000 1.2 +++ pkg-message 28 Apr 2003 11:00:46 -0000 @@ -1,11 +1,3 @@ -**** To setup dhclient, you may need to edit /etc/rc.conf to replace the - base system dhclient, such as : - dhcp_program="%%PREFIX%%/sbin/dhclient" - dhcp_flags="-q" - See dhclient(8), using the following command, for details about other - possible options: - MANPATH=%%MAN1PREFIX%%/man man 8 dhclient - **** To setup dhcpd, you may have to copy %%PREFIX%%/etc/dhcpd.conf.sample to %%PREFIX%%/etc/dhcpd.conf for editing. You also have to rename %%PREFIX%%/etc/rc.d/isc-dhcpd.sh.sample to %%PREFIX%%/etc/rc.d/isc-\ @@ -13,11 +5,3 @@ %%PREFIX%%/etc/rc.isc-dhcpd.conf may be edited to tune some startup variables such as `dhcpd_options' or `dhcpd_ifaces', both defaulted to `nothing'. See dhcpd(8) for details about possible options. - -**** To setup dhcrelay, you have to rename %%PREFIX%%/etc/rc.d/isc-\ - dhcrelay.sh.sample to %%PREFIX%%/etc/rc.d/isc-dhcrelay.sh to - enable automatic startup. - %%PREFIX%%/etc/rc.isc-dhcrelay.conf may need to be edited to setup - the `dhcrelay_servers' as required. If needed, you may also tune - `dhcrelay_options' and `dhcrelay_ifaces', both defaulted to `nothing'. - See dhcrelay(8) for details about possible options. Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/net/isc-dhcp3/pkg-plist,v retrieving revision 1.20 diff -u -I$Id.*$ -I$.+BSD.*$ -r1.20 pkg-plist --- pkg-plist 19 Oct 2001 03:12:25 -0000 1.20 +++ pkg-plist 28 Apr 2003 21:13:05 -0000 @@ -1,45 +1,17 @@ -@comment $FreeBSD: ports/net/isc-dhcp3/pkg-plist,v 1.19 2001/10/15 13:33:15 roam Exp $ +@comment $FreeBSD: ports/net/isc-dhcp3/pkg-plist,v 1.20 2001/10/19 03:12:25 dwcjr Exp $ bin/omshell -etc/dhclient.conf.sample -@exec [ -f %D/etc/dhclient.conf ] || touch %D/etc/dhclient.conf -@unexec [ -L %D/etc/dhclient.conf -o -s %D/etc/dhclient.conf ] || rm -f %D/etc/dhclient.conf etc/dhcpd.conf.sample @unexec if cmp -s %D/etc/rc.isc-dhcpd.conf %D/etc/rc.isc-dhcpd.conf.sample; then rm -f %D/etc/rc.isc-dhcpd.conf; fi etc/rc.isc-dhcpd.conf.sample @exec [ -f %D/etc/rc.isc-dhcpd.conf ] || cp %D/etc/rc.isc-dhcpd.conf.sample %D/etc/rc.isc-dhcpd.conf -@unexec if cmp -s %D/etc/rc.isc-dhcrelay.conf %D/etc/rc.isc-dhcrelay.conf.sample; then rm -f %D/etc/rc.isc-dhcrelay.conf; fi -etc/rc.isc-dhcrelay.conf.sample -@exec [ -f %D/etc/rc.isc-dhcrelay.conf ] || cp %D/etc/rc.isc-dhcrelay.conf.sample %D/etc/rc.isc-dhcrelay.conf etc/rc.d/isc-dhcpd.sh.sample @unexec rm -f etc/rc.d/isc-dhcpd.sh -etc/rc.d/isc-dhcrelay.sh.sample -@unexec rm -f etc/rc.d/isc-dhcrelay.sh -include/dhcpctl.h -include/isc-dhcp/boolean.h -include/isc-dhcp/dst.h -include/isc-dhcp/int.h -include/isc-dhcp/lang.h -include/isc-dhcp/list.h -include/isc-dhcp/result.h -include/isc-dhcp/types.h -include/omapip/alloc.h -include/omapip/buffer.h -include/omapip/omapip.h -lib/libdhcpctl.a -lib/libomapi.a -sbin/dhclient -sbin/dhclient-script sbin/dhcpd -sbin/dhcrelay -%%PORTDOCS%%share/doc/isc-dhcp3/ANONCVS -%%PORTDOCS%%share/doc/isc-dhcp3/CHANGES -%%PORTDOCS%%share/doc/isc-dhcp3/COPYRIGHT -%%PORTDOCS%%share/doc/isc-dhcp3/README -%%PORTDOCS%%share/doc/isc-dhcp3/RELNOTES -%%PORTDOCS%%@dirrm share/doc/isc-dhcp3 -@dirrm include/omapip -@dirrm include/isc-dhcp -@exec [ -f /var/run/dhclient.leases ] || touch /var/run/dhclient.leases -@unexec [ -s /var/run/dhclient.leases ] || rm -f /var/run/dhclient.leases +%%PORTDOCS%%share/doc/isc-dhcp3-server/ANONCVS +%%PORTDOCS%%share/doc/isc-dhcp3-server/CHANGES +%%PORTDOCS%%share/doc/isc-dhcp3-server/COPYRIGHT +%%PORTDOCS%%share/doc/isc-dhcp3-server/README +%%PORTDOCS%%share/doc/isc-dhcp3-server/RELNOTES +%%PORTDOCS%%@dirrm share/doc/isc-dhcp3-server @exec [ -f /var/run/dhcpd.leases ] || touch /var/run/dhcpd.leases @unexec [ -s /var/run/dhcpd.leases ] || rm -f /var/run/dhcpd.leases ==========----------========== null diff ==========----------========== --- /dev/null Mon Apr 28 23:35:09 2003 +++ files/omshell::Makefile.dist Mon Apr 28 16:20:54 2003 @@ -0,0 +1,80 @@ +# Makefile.dist +# +# Copyright (c) 1996-2002 Internet Software Consortium. +# Use is subject to license terms which appear in the file named +# ISC-LICENSE that should have accompanied this file when you +# received it. If a file named ISC-LICENSE did not accompany this +# file, or you are not sure the one you have is correct, you may +# obtain an applicable copy of the license at: +# +# http://www.isc.org/isc-license-1.0.html. +# +# This file is part of the ISC DHCP distribution. The documentation +# associated with this file is listed in the file DOCUMENTATION, +# included in the top-level directory of this release. +# +# Support and other services are available for ISC products - see +# http://www.isc.org for more information. +# + +CATMANPAGES = omshell.cat1 +SEDMANPAGES = omshell.man1 +SRCS = omshell.c +OBJS = omshell.o +PROG = omshell +MAN = omshell.1 + +INCLUDES = -I$(TOP)/dhcpctl $(BINDINC) -I$(TOP)/includes +CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS) +DHCPCTLLIBS = ../dhcpctl/libdhcpctl.a ../common/libdhcp.a $(BINDLIB) \ + ../omapip/libomapi.a ../dst/libdst.a + +all: $(PROG) $(CATMANPAGES) + +$(PROG): $(OBJS) $(DHCPCTLLIBS) + $(CC) $(DEBUG) $(LFLAGS) -o $(PROG) $(OBJS) $(DHCPCTLLIBS) $(LIBS) + +install: all $(CATMANPAGES) + for dir in $(USRMANDIR) $(USERBINDIR); do \ + foo=""; \ + for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \ + foo=$${foo}/$$bar; \ + if [ ! -d $$foo ]; then \ + mkdir $$foo; \ + chmod 755 $$foo; \ + fi; \ + done; \ + done + $(INSTALL) omshell $(DESTDIR)$(USERBINDIR) + $(CHMOD) 755 $(DESTDIR)$(USERBINDIR)/omshell + $(MANINSTALL) $(MANFROM) omshell.$(MANCAT)1 $(MANTO) \ + $(DESTDIR)$(USRMANDIR)/omshell$(USRMANEXT) + +depend: + $(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRCS) + +clean: + -rm -f $(OBJS) + +realclean: clean + -rm -f $(PROG) *~ $(CATMANPAGES) $(SEDMANPAGES) #* + +distclean: realclean + -rm -f Makefile + +links: + @for foo in $(SRCS) $(MAN); do \ + if [ ! -b $$foo ]; then \ + rm -f $$foo; \ + fi; \ + ln -s $(TOP)/omshell/$$foo $$foo; \ + done + +omshell.cat1: omshell.man1 + nroff -man omshell.man1 >omshell.cat1 + +omshell.man1: omshell.1 + sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \ + -e "s#RUNDIR#$(VARRUN)#g" < omshell.1 >omshell.man1 + +# Dependencies (semi-automatically-generated) --- /dev/null Mon Apr 28 23:35:09 2003 +++ files/patch-Makefile Mon Apr 28 16:19:37 2003 @@ -0,0 +1,76 @@ +--- Makefile.orig Fri Nov 8 00:10:07 2002 ++++ Makefile Mon Apr 28 15:04:50 2003 +@@ -38,59 +38,59 @@ + # ``http://www.nominum.com''. + # + +-all: ++all all.devel all.server all.relay all.client: + @sysname=`./configure --print-sysname`; \ + if [ ! -d work.$$sysname ]; then \ + echo No build directory for $$sysname - please run ./configure.; \ + else \ +- (cd work.$$sysname; make all); \ ++ (cd work.$$sysname; make $@); \ + fi + +-install: ++install install.devel install.server install.relay install.client: + @sysname=`./configure --print-sysname`; \ + if [ ! -d work.$$sysname ]; then \ + echo No build directory for $$sysname - please run ./configure.; \ + else \ +- (cd work.$$sysname; make install); \ ++ (cd work.$$sysname; make $@); \ + fi + +-depend: ++depend depend.devel depend.server depend.relay depend.client: + @sysname=`./configure --print-sysname`; \ + if [ ! -d work.$$sysname ]; then \ + echo No build directory for $$sysname - please run ./configure.; \ + else \ +- (cd work.$$sysname; make depend); \ ++ (cd work.$$sysname; make $@); \ + fi + +-clean: ++clean clean.devel clean.server clean.relay clean.client: + @sysname=`./configure --print-sysname`; \ + if [ ! -d work.$$sysname ]; then \ + echo No build directory for $$sysname - please run ./configure.; \ + else \ +- (cd work.$$sysname; make clean); \ ++ (cd work.$$sysname; make $@); \ + fi + +-realclean: ++realclean realclean.devel realclean.server realclean.relay realclean.client: + @sysname=`./configure --print-sysname`; \ + if [ ! -d work.$$sysname ]; then \ + echo No build directory for $$sysname - please run ./configure.; \ + else \ +- (cd work.$$sysname; make realclean); \ ++ (cd work.$$sysname; make $@); \ + fi + +-distclean: ++distclean distclean.devel distclean.server distclean.relay distclean.client: + @sysname=`./configure --print-sysname`; \ + if [ ! -d work.$$sysname ]; then \ + echo No build directory for $$sysname - please run ./configure.; \ + else \ +- (cd work.$$sysname; make distclean); \ ++ (cd work.$$sysname; make $@); \ + fi + +-links: ++links links.devel links.server links.relay links.client: + @sysname=`./configure --print-sysname`; \ + if [ ! -d work.$$sysname ]; then \ + echo No build directory for $$sysname - please run ./configure.; \ + else \ +- (cd work.$$sysname; make links); \ ++ (cd work.$$sysname; make $@); \ + fi + --- /dev/null Tue Apr 29 00:05:57 2003 +++ files/patch-Makefile.dist Tue Apr 29 00:07:58 2003 @@ -0,0 +1,243 @@ +--- Makefile.dist.orig Fri Nov 8 00:10:08 2002 ++++ Makefile.dist Tue Apr 29 00:07:43 2003 +@@ -3,13 +3,13 @@ + # Copyright (c) 1996-2002 Internet Software Consortium. + # Use is subject to license terms which appear in the file named + # ISC-LICENSE that should have accompanied this file when you +-# received it. If a file named ISC-LICENSE did not accompany this ++# received it. If a file named ISC-LICENSE did not accompany this + # file, or you are not sure the one you have is correct, you may + # obtain an applicable copy of the license at: + # +-# http://www.isc.org/isc-license-1.0.html. ++# http://www.isc.org/isc-license-1.0.html. + # +-# This file is part of the ISC DHCP distribution. The documentation ++# This file is part of the ISC DHCP distribution. The documentation + # associated with this file is listed in the file DOCUMENTATION, + # included in the top-level directory of this release. + # +@@ -17,47 +17,200 @@ + # http://www.isc.org for more information. + # + +-SUBDIRS= common $(MINIRES) dst omapip server client relay dhcpctl ++COMMON_SUBDIRS= common ++DEVEL_SUBDIRS= $(MINIRES) dst omapip dhcpctl ++SERVER_SUBDIRS= omshell server ++RELAY_SUBDIRS= relay ++CLIENT_SUBDIRS= client ++ ++DEVEL_BUILD_SUBDIRS= ${COMMON_SUBDIRS} ${DEVEL_SUBDIRS} ++SERVER_BUILD_SUBDIRS= ${SERVER_SUBDIRS} ++RELAY_BUILD_SUBDIRS= ${RELAY_SUBDIRS} ++CLIENT_BUILD_SUBDIRS= ${CLIENT_SUBDIRS} ++ ++DEVEL_INSTALL_SUBDIRS= ${COMMON_SUBDIRS} ${DEVEL_SUBDIRS} ++SERVER_INSTALL_SUBDIRS= ${COMMON_SUBDIRS} ${SERVER_SUBDIRS} ++RELAY_INSTALL_SUBDIRS= ${RELAY_SUBDIRS} ++CLIENT_INSTALL_SUBDIRS= ${COMMON_SUBDIRS} ${CLIENT_SUBDIRS} + +-all: +- @for dir in ${SUBDIRS}; do \ ++all: all.server all.relay all.client ++ ++all.devel: ++ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \ ++ echo "Making all in $$dir"; \ ++ (cd $$dir; $(MAKE) all) || exit 1; \ ++ done ++ ++all.server: all.devel ++ @for dir in ${SERVER_BUILD_SUBDIRS}; do \ ++ echo "Making all in $$dir"; \ ++ (cd $$dir; $(MAKE) all) || exit 1; \ ++ done ++ ++all.relay: all.devel ++ @for dir in ${RELAY_BUILD_SUBDIRS}; do \ ++ echo "Making all in $$dir"; \ ++ (cd $$dir; $(MAKE) all) || exit 1; \ ++ done ++ ++all.client: all.devel ++ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \ + echo "Making all in $$dir"; \ + (cd $$dir; $(MAKE) all) || exit 1; \ +- done ++ done ++ ++install: install.devel install.server install.relay install.client ++ ++install.devel: ++ @for dir in ${DEVEL_INSTALL_SUBDIRS}; do \ ++ echo "Installing in $$dir"; \ ++ (cd $$dir; $(MAKE) install) || exit 1; \ ++ done + +-install: +- @for dir in ${SUBDIRS}; do \ ++install.server: ++ @for dir in ${SERVER_INSTALL_SUBDIRS}; do \ + echo "Installing in $$dir"; \ + (cd $$dir; $(MAKE) install) || exit 1; \ +- done ++ done + +-depend: +- @for dir in ${SUBDIRS}; do \ ++install.relay: ++ @for dir in ${RELAY_INSTALL_SUBDIRS}; do \ ++ echo "Installing in $$dir"; \ ++ (cd $$dir; $(MAKE) install) || exit 1; \ ++ done ++ ++install.client: ++ @for dir in ${CLIENT_INSTALL_SUBDIRS}; do \ ++ echo "Installing in $$dir"; \ ++ (cd $$dir; $(MAKE) install) || exit 1; \ ++ done ++ ++depend: depend.server depend.relay depend.client ++ ++depend.devel: ++ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \ ++ echo "Making dependencies in $$dir"; \ ++ (cd $$dir; $(MAKE) depend) || exit 1; \ ++ done ++ ++depend.server: depend.devel ++ @for dir in ${SERVER_BUILD_SUBDIRS}; do \ ++ echo "Making dependencies in $$dir"; \ ++ (cd $$dir; $(MAKE) depend) || exit 1; \ ++ done ++ ++depend.relay: depend.devel ++ @for dir in ${RELAY_BUILD_SUBDIRS}; do \ + echo "Making dependencies in $$dir"; \ + (cd $$dir; $(MAKE) depend) || exit 1; \ +- done ++ done ++ ++depend.client: depend.devel ++ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \ ++ echo "Making dependencies in $$dir"; \ ++ (cd $$dir; $(MAKE) depend) || exit 1; \ ++ done ++ ++clean: clean.server clean.relay clean.client ++ ++clean.devel: ++ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \ ++ echo "Cleaning in $$dir"; \ ++ (cd $$dir; $(MAKE) clean) || exit 1; \ ++ done ++ ++clean.server: clean.devel ++ @for dir in ${SERVER_BUILD_SUBDIRS}; do \ ++ echo "Cleaning in $$dir"; \ ++ (cd $$dir; $(MAKE) clean) || exit 1; \ ++ done ++ ++clean.relay: clean.devel ++ @for dir in ${RELAY_BUILD_SUBDIRS}; do \ ++ echo "Cleaning in $$dir"; \ ++ (cd $$dir; $(MAKE) clean) || exit 1; \ ++ done + +-clean: +- @for dir in ${SUBDIRS}; do \ ++clean.client: clean.devel ++ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \ + echo "Cleaning in $$dir"; \ + (cd $$dir; $(MAKE) clean) || exit 1; \ +- done ++ done ++ ++realclean: realclean.server realclean.relay realclean.client ++ ++realclean.devel: ++ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \ ++ echo "Really cleaning in $$dir"; \ ++ (cd $$dir; $(MAKE) realclean) || exit 1; \ ++ done + +-realclean: +- @for dir in ${SUBDIRS}; do \ ++realclean.server: realclean.devel ++ @for dir in ${SERVER_BUILD_SUBDIRS}; do \ + echo "Really cleaning in $$dir"; \ + (cd $$dir; $(MAKE) realclean) || exit 1; \ +- done ++ done + +-distclean: +- @for dir in ${SUBDIRS}; do \ ++realclean.relay: realclean.devel ++ @for dir in ${RELAY_BUILD_SUBDIRS}; do \ ++ echo "Really cleaning in $$dir"; \ ++ (cd $$dir; $(MAKE) realclean) || exit 1; \ ++ done ++ ++realclean.client: realclean.devel ++ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \ ++ echo "Really cleaning in $$dir"; \ ++ (cd $$dir; $(MAKE) realclean) || exit 1; \ ++ done ++ ++distclean: distclean.server distclean.relay distclean.client ++ ++distclean.devel: ++ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \ + echo "Really, really cleaning in $$dir"; \ + (cd $$dir; $(MAKE) distclean) || exit 1; \ +- done +- @rm -f Makefile ++ done ++ ++distclean.server: distclean.devel ++ @for dir in ${SERVER_BUILD_SUBDIRS}; do \ ++ echo "Really, really cleaning in $$dir"; \ ++ (cd $$dir; $(MAKE) distclean) || exit 1; \ ++ done ++ ++distclean.relay: distclean.devel ++ @for dir in ${RELAY_BUILD_SUBDIRS}; do \ ++ echo "Really, really cleaning in $$dir"; \ ++ (cd $$dir; $(MAKE) distclean) || exit 1; \ ++ done ++ ++distclean.client: distclean.devel ++ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \ ++ echo "Really, really cleaning in $$dir"; \ ++ (cd $$dir; $(MAKE) distclean) || exit 1; \ ++ done ++ ++links: links.server links.relay links.client ++ ++links.devel: ++ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \ ++ echo "Making links in $$dir"; \ ++ (cd $$dir; $(MAKE) links) || exit 1; \ ++ done ++ ++links.server: links.devel ++ @for dir in ${SERVER_BUILD_SUBDIRS}; do \ ++ echo "Making links in $$dir"; \ ++ (cd $$dir; $(MAKE) links) || exit 1; \ ++ done ++ ++links.relay: links.devel ++ @for dir in ${RELAY_BUILD_SUBDIRS}; do \ ++ echo "Making links in $$dir"; \ ++ (cd $$dir; $(MAKE) links) || exit 1; \ ++ done + +-links: +- @for dir in ${SUBDIRS}; do \ ++links.client: links.devel ++ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \ + echo "Making links in $$dir"; \ + (cd $$dir; $(MAKE) links) || exit 1; \ +- done ++ done --- /dev/null Mon Apr 28 23:35:09 2003 +++ files/patch-configure Mon Apr 28 23:02:14 2003 @@ -0,0 +1,41 @@ +--- configure.orig Sat Apr 20 23:44:13 2002 ++++ configure Mon Apr 28 23:02:10 2003 +@@ -13,6 +13,9 @@ + elif [ x$1 = x--dirs ]; then + dirs=$2 + shift ++ elif [ x$1 = x--subsys ]; then ++ subsys=$2 ++ shift + elif [ x$1 = x--no-links ]; then + nolinks=YES + elif [ x$1 = x--copts ]; then +@@ -233,7 +236,14 @@ + fi + + if [ x"$dirs" = x ]; then +- dirs=". client server relay common omapip dhcpctl minires dst" ++ dirs=". common minires dst omapip dhcpctl" ++ if [ x$subsys = x ]; then ++ dirs="$dirs server omshell client relay" ++ elif [ x$subsys = xserver ]; then ++ dirs="$dirs server omshell" ++ elif [ x$subsys = xclient -o x$subsys = xrelay ]; then ++ dirs="$dirs $subsys" ++ fi + fi + + for foo in $dirs; do +@@ -253,7 +263,11 @@ + + # Make the link tree in which to actually build. + if [ x$nolinks = x ]; then +- make links ++ if [ x$subsys = x ]; then ++ make links ++ else ++ make links.$subsys ++ fi + fi + + exit 0 --- /dev/null Mon Apr 28 23:35:09 2003 +++ files/patch-dhcpctl::Makefile.dist Mon Apr 28 16:32:04 2003 @@ -0,0 +1,79 @@ +--- dhcpctl/Makefile.dist.orig Mon Apr 28 16:31:57 2003 ++++ dhcpctl/Makefile.dist Mon Apr 28 16:24:20 2003 +@@ -17,11 +17,11 @@ + # http://www.isc.org for more information. + # + +-CATMANPAGES = dhcpctl.cat3 omshell.cat1 +-SEDMANPAGES = dhcpctl.man3 omshell.man1 ++CATMANPAGES = dhcpctl.cat3 ++SEDMANPAGES = dhcpctl.man3 + SRC = dhcpctl.c callback.c remote.c + OBJ = dhcpctl.o callback.o remote.o +-MAN = dhcpctl.3 omshell.1 ++MAN = dhcpctl.3 + HDRS = dhcpctl.h + + INCLUDES = $(BINDINC) -I$(TOP)/includes +@@ -29,10 +29,7 @@ + DHCPCTLLIBS = libdhcpctl.a ../common/libdhcp.a $(BINDLIB) \ + ../omapip/libomapi.a ../dst/libdst.a + +-all: libdhcpctl.a omshell cltest $(CATMANPAGES) +- +-omshell: omshell.o $(DHCPCTLLIBS) +- $(CC) $(DEBUG) $(LFLAGS) -o omshell omshell.o $(DHCPCTLLIBS) $(LIBS) ++all: libdhcpctl.a cltest $(CATMANPAGES) + + cltest: cltest.o $(DHCPCTLLIBS) + $(CC) $(DEBUG) $(LFLAGS) -o cltest cltest.o $(DHCPCTLLIBS) $(LIBS) +@@ -43,8 +40,7 @@ + $(RANLIB) libdhcpctl.a + + install: all $(CATMANPAGES) +- for dir in $(LIBDIR) $(LIBMANDIR) $(INCDIR) $(USRMANDIR) \ +- $(USERBINDIR); do \ ++ for dir in $(LIBDIR) $(LIBMANDIR) $(INCDIR); do \ + foo=""; \ + for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \ + foo=$${foo}/$$bar; \ +@@ -64,16 +60,12 @@ + $(MANINSTALL) $(MANFROM) $${prefix}.$(MANCAT)$${suffix} $(MANTO) \ + $(DESTDIR)$(LIBMANDIR)/$${prefix}$(LIBMANEXT); \ + done +- $(INSTALL) omshell $(DESTDIR)$(USERBINDIR) +- $(CHMOD) 755 $(DESTDIR)$(USERBINDIR)/omshell +- $(MANINSTALL) $(MANFROM) omshell.$(MANCAT)1 $(MANTO) \ +- $(DESTDIR)$(USRMANDIR)/omshell$(USRMANEXT) + + depend: + $(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRC) + + clean: +- -rm -f $(OBJ) test.o svtest cltest.o cltest ++ -rm -f $(OBJ) cltest.o cltest + + realclean: clean + -rm -f libdhcpctl.a *~ $(CATMANPAGES) $(SEDMANPAGES) +@@ -82,7 +74,7 @@ + -rm -f Makefile + + links: +- @for foo in $(SRC) $(MAN) omshell.c cltest.c $(HDRS); do \ ++ @for foo in $(SRC) $(MAN) cltest.c $(HDRS); do \ + if [ ! -b $$foo ]; then \ + rm -f $$foo; \ + fi; \ +@@ -95,12 +87,5 @@ + dhcpctl.man3: dhcpctl.3 + sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \ + -e "s#RUNDIR#$(VARRUN)#g" < dhcpctl.3 >dhcpctl.man3 +- +-omshell.cat1: omshell.man1 +- nroff -man omshell.man1 >omshell.cat1 +- +-omshell.man1: omshell.1 +- sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \ +- -e "s#RUNDIR#$(VARRUN)#g" < omshell.1 >omshell.man1 + + # Dependencies (semi-automatically-generated) ==========----------========== client shar ==========----------========== # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # isc-dhcp3-client/Makefile # isc-dhcp3-client/pkg-descr # isc-dhcp3-client/pkg-message # isc-dhcp3-client/pkg-plist # echo x - isc-dhcp3-client/Makefile sed 's/^X//' >isc-dhcp3-client/Makefile << 'END-of-isc-dhcp3-client/Makefile' X# ex:ts=8 X# Ports collection makefile for: dhcp X# Date created: 28 April 2003 X# Whom: cyrille.lefevre@laposte.net X# X# $FreeBSD$ X# X XMAINTAINER= cyrille.lefevre@laposte.net XCOMMENT= The ISC Dynamic Host Configuration Protocol client X X# Local variables X# X XSUBSYS= client X X# Local overrides X# X XMASTERDIR= ${.CURDIR}/../isc-dhcp3-server X X.include "${MASTERDIR}/Makefile" END-of-isc-dhcp3-client/Makefile echo x - isc-dhcp3-client/pkg-descr sed 's/^X//' >isc-dhcp3-client/pkg-descr << 'END-of-isc-dhcp3-client/pkg-descr' XThe ISC Dynamic Host Configuration Protocol Distribution provides a Xfreely redistributable reference implementation of all aspects of the XDHCP protocol, through a suite of DHCP tools: X X * A DHCP server X * A DHCP client (this port) X * A DHCP relay agent X XVersion 3 of the ISC DHCP Distribution includes the following features Xthat are new since version 2.0: X X * DHCP Failover Protocol support X * OMAPI, an API for accessing and modifying the DHCP server and client state X * Conditional behaviour X * Storing arbitrary information on leases X * Address pools with access control X * Client classing X * Address allocation restriction by class X * Relay agent information option support X * Dynamic DNS updates X * Many bug fixes, performance enhancements, and minor new DHCP protocol X features. X XWWW: http://www.isc.org/products/DHCP/ END-of-isc-dhcp3-client/pkg-descr echo x - isc-dhcp3-client/pkg-message sed 's/^X//' >isc-dhcp3-client/pkg-message << 'END-of-isc-dhcp3-client/pkg-message' X**** To setup dhclient, you may need to edit /etc/rc.conf to replace the X base system dhclient, such as : X dhcp_program="%%PREFIX%%/sbin/dhclient" X dhcp_flags="-q" X See dhclient(8), using the following command, for details about other X possible options: X MANPATH=%%MAN1PREFIX%%/man man 8 dhclient END-of-isc-dhcp3-client/pkg-message echo x - isc-dhcp3-client/pkg-plist sed 's/^X//' >isc-dhcp3-client/pkg-plist << 'END-of-isc-dhcp3-client/pkg-plist' X@comment $FreeBSD: ports/net/isc-dhcp3/pkg-plist,v 1.20 2001/10/19 03:12:25 dwcjr Exp $ Xetc/dhclient.conf.sample X@exec [ -f %D/etc/dhclient.conf ] || touch %D/etc/dhclient.conf X@unexec [ -L %D/etc/dhclient.conf -o -s %D/etc/dhclient.conf ] || rm -f %D/etc/dhclient.conf Xsbin/dhclient Xsbin/dhclient-script X%%PORTDOCS%%share/doc/isc-dhcp3-client/ANONCVS X%%PORTDOCS%%share/doc/isc-dhcp3-client/CHANGES X%%PORTDOCS%%share/doc/isc-dhcp3-client/COPYRIGHT X%%PORTDOCS%%share/doc/isc-dhcp3-client/README X%%PORTDOCS%%share/doc/isc-dhcp3-client/RELNOTES X%%PORTDOCS%%@dirrm share/doc/isc-dhcp3-client X@exec [ -f /var/run/dhclient.leases ] || touch /var/run/dhclient.leases X@unexec [ -s /var/run/dhclient.leases ] || rm -f /var/run/dhclient.leases END-of-isc-dhcp3-client/pkg-plist exit How-To-Repeat: n/a
Responsible Changed From-To: freebsd-ports-bugs->edwin Asked for repocopy.
With regarding to ports/51757 (Maintainer update: isc-dhcp3 splitted to -server, -client, -relay and -devel sub-ports), please repocopy net/isc-dhcp3 into net/isc-dhcp3-server. Edwin -- Edwin Groothuis | Personal website: http://www.mavetju.org edwin@freebsd.org | Weblog: http://weblog.barnet.com.au/edwin/
State Changed From-To: open->closed Commited, thanks!