From dab498c54369570b99f7b34a00be28b2cf9801d2 Mon Sep 17 00:00:00 2001 From: wxs Date: Sat, 15 May 2010 02:58:48 +0000 Subject: Add the headers and libraries to net/isc-dhcp41-server. There will be no net/isc-dhcp4-devel port as it would conflict with the server (installs some of the same files). For this reason I decided to just make net/isc-dhcp41-server install the development libraries and headers. Based upon a patch from: Attila Nagy (private mail) --- net/isc-dhcp41-server/Makefile | 19 +++++++++++++------ net/isc-dhcp41-server/pkg-plist | 26 ++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 6 deletions(-) (limited to 'net') diff --git a/net/isc-dhcp41-server/Makefile b/net/isc-dhcp41-server/Makefile index 3b9cfba7f9e4..d46824204c42 100644 --- a/net/isc-dhcp41-server/Makefile +++ b/net/isc-dhcp41-server/Makefile @@ -18,10 +18,9 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= wxs@FreeBSD.org COMMENT?= The ISC Dynamic Host Configuration Protocol server -PORTREVISION_SERVER= 0 +PORTREVISION_SERVER= 1 PORTREVISION_CLIENT= 0 PORTREVISION_RELAY= 0 -PORTREVISION_DEVEL= 0 SUBSYS?= server @@ -31,7 +30,7 @@ UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} OPTIONS= DHCP_PARANOIA "Enable support for chroot" on .endif -# PORTREVISION handling +# PORTREVISION and CONFLICTS handling .if ${SUBSYS} == client CONFLICTS= isc-dhcp3?-client* DHCP_PORTREVISION= ${PORTREVISION_CLIENT} @@ -62,11 +61,12 @@ CONF_FILE= dhclient.conf CONFIGURE_ARGS+= --localstatedir=/var MAN5= dhcpd.conf.5 dhcpd.leases.5 MAN8= dhcpd.8 +MAN1= omshell.1 +MAN3= dhcpctl.3 omapi.3 +CFLAGS+= -fPIC CONF_FILE= dhcpd.conf -.elif ${SUBSYS} == relay -MAN8= dhcrelay.8 .else -MAN3= dhcpctl.3 omapi.3 +MAN8= dhcrelay.8 .endif DESCR= ${.CURDIR}/pkg-descr @@ -108,6 +108,13 @@ post-patch: do-install: ${MAKE} -C ${WRKSRC}/${SUBSYS} install +.if ${SUBSYS} == server + ${MAKE} -C ${WRKSRC}/dhcpctl install + ${MAKE} -C ${WRKSRC}/dst install + ${MAKE} -C ${WRKSRC}/omapip install + ${MAKE} -C ${WRKSRC}/includes install + ${INSTALL_DATA} ${WRKSRC}/dhcpctl/dhcpctl.h ${PREFIX}/include +.endif post-install: .if defined(CONF_FILE) diff --git a/net/isc-dhcp41-server/pkg-plist b/net/isc-dhcp41-server/pkg-plist index 41ded80b23ed..03eb7103e62e 100644 --- a/net/isc-dhcp41-server/pkg-plist +++ b/net/isc-dhcp41-server/pkg-plist @@ -4,3 +4,29 @@ etc/dhcpd.conf.sample @exec if [ ! -f %D/etc/dhcpd.conf ] ; then cp -p %D/%F %B/dhcpd.conf; fi sbin/dhcpd +bin/omshell +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/isc-dhcp/string.h +include/isc-dhcp/print.h +include/isc-dhcp/commandline.h +include/isc-dhcp/mem.h +include/isc-dhcp/formatcheck.h +include/omapip/alloc.h +include/omapip/buffer.h +include/omapip/omapip.h +include/omapip/omapip_p.h +include/omapip/hash.h +include/omapip/trace.h +include/omapip/convert.h +lib/libdhcpctl.a +lib/libomapi.a +lib/libdst.a +@dirrm include/omapip +@dirrm include/isc-dhcp -- cgit