mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00
Code Issues Releases Activity

- Update to 4.2.5P1

Browse Source 
- Switch to new 'created by' header

Feature safe:	yes
This commit is contained in:
Ryan Steinmetz 2013-04-18 01:25:41 +00:00
parent ab0080196f
commit c4cf2c5b8f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=316014
10 changed files with 21 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/isc-dhcp42-client/Makefile
View File

@ -1,9 +1,5 @@
# Ports collection makefile for: isc-dhcp42-client
# Date created: 29 June 2011
# Whom: Ryan Steinmetz <rpsfa@rit.edu>
#
# Created by: Ryan Steinmetz <rpsfa@rit.edu>
# $FreeBSD$
#
COMMENT= The ISC Dynamic Host Configuration Protocol client

4
net/isc-dhcp42-client/pkg-plist
View File

@ -1,8 +1,8 @@
@comment $FreeBSD$
sbin/dhclient
sbin/dhclient-script
@unexec if cmp -s %D/etc/dhclient.conf.sample %D/etc/dhclient.conf; then rm -f %D/etc/dhclient.conf; fi
etc/dhclient.conf.sample
@unexec if cmp -s %D/etc/dhclient.conf.example %D/etc/dhclient.conf; then rm -f %D/etc/dhclient.conf; fi
etc/dhclient.conf.example
@exec if [ ! -f %D/etc/dhclient.conf ] ; then cp -p %D/%F %B/dhclient.conf; fi
@exec [ -f /var/run/dhclient.leases ] || touch /var/run/dhclient.leases
@unexec [ -s /var/run/dhclient.leases ] || rm -f /var/run/dhclient.leases

6
net/isc-dhcp42-relay/Makefile
View File

@ -1,9 +1,5 @@
# Ports collection makefile for: isc-dhcp42-relay
# Date created: 29 June 2011
# Whom: Ryan Steinmetz <rpsfa@rit.edu>
#
# Created by: Ryan Steinmetz <rpsfa@rit.edu>
# $FreeBSD$
#
COMMENT= The ISC Dynamic Host Configuration Protocol relay

22
net/isc-dhcp42-server/Makefile
View File

@ -1,12 +1,8 @@
# Ports collection makefile for: isc-dhcp42-server
# Date created: 29 June 2011
# Whom: Ryan Steinmetz <rpsfa@rit.edu>
#
# Created by: Ryan Steinmetz <rpsfa@rit.edu>
# $FreeBSD$
#
PORTNAME= dhcp
DISTVERSION= 4.2.4
DISTVERSION= 4.2.5
PORTREVISION= ${DHCP_PORTREVISION}
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_ISC}
@ -22,8 +18,8 @@ LICENSE= ISCL
USE_GMAKE= yes
PATCHLEVEL= P2
PORTREVISION_SERVER= 2
PATCHLEVEL= P1
PORTREVISION_SERVER= 0
PORTREVISION_CLIENT= 0
PORTREVISION_RELAY= 0
@ -70,7 +66,7 @@ SCRIPTS_ENV+= PKG_PREFIX=${PREFIX}
.if ${SUBSYS} == client
MAN5+= dhclient.conf.5 dhclient.leases.5
MAN8+= dhclient.8 dhclient-script.8
CONF_FILE= dhclient.conf
CONF_FILE= dhclient.conf.example
.elif ${SUBSYS} == server
CONFIGURE_ARGS+=--localstatedir=/var
MAN5+= dhcpd.conf.5 dhcpd.leases.5 dhcp-eval.5 dhcp-options.5
@ -152,7 +148,7 @@ post-patch:
@${REINPLACE_CMD} -e 's|/usr/local||g' \
${WRKSRC}/doc/examples/dhcpd-dhcpv6.conf
@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
${WRKSRC}/client/dhclient.conf
${WRKSRC}/client/dhclient.conf.example
do-install:
${MAKE} -C ${WRKSRC}/${SUBSYS} install
@ -165,14 +161,14 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/dhcpctl/dhcpctl.h ${PREFIX}/include
.if ${PORT_OPTIONS:MIPV6}
${INSTALL_DATA} ${WRKSRC}/doc/examples/dhcpd-dhcpv6.conf \
${PREFIX}/etc/dhcpd6.conf.sample
${PREFIX}/etc/dhcpd6.conf.example
.endif
.if ${PORT_OPTIONS:MLDAP}
@${MKDIR} ${SCHEMA_DIR}
${INSTALL_DATA} ${LDAP_SCHEMA} ${SCHEMA_DIR}
${INSTALL_SCRIPT} ${LDAP_SCRIPT} ${PREFIX}/bin
.endif
.if ${PORT_OPTIONS:MLDAP} && !defined(NOPORTDOCS)
.if ${PORT_OPTIONS:MLDAP} && empty(PORT_OPTIONS:MDOCS)
${MKDIR} ${DOCSDIR}
${INSTALL_MAN} ${WRKSRC}/contrib/ldap/README.ldap ${DOCSDIR}
.endif
@ -182,7 +178,7 @@ post-install:
.if defined(CONF_FILE)
.for FILE in ${CONF_FILE}
if [ ! -f ${PREFIX}/etc/${FILE} ]; then \
${CP} -p ${PREFIX}/etc/${FILE}.sample ${PREFIX}/etc/${FILE} ; \
${CP} -p ${PREFIX}/etc/${FILE}.example ${PREFIX}/etc/${FILE} ; \
fi
.endfor
.endif

4
net/isc-dhcp42-server/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (dhcp-4.2.4-P2.tar.gz) = 0f75170e323cd9573e6e09a5d9236725f3e56e3cac5a70a01fe2a9d76b436499
SIZE (dhcp-4.2.4-P2.tar.gz) = 8190209
SHA256 (dhcp-4.2.5-P1.tar.gz) = 59b06c9f5d775e46999b422c45b9229402c462b114ce1685617bfb2b8b028250
SIZE (dhcp-4.2.5-P1.tar.gz) = 8255960

13
net/isc-dhcp42-server/files/patch-client__Makefile.in
View File

@ -1,13 +0,0 @@
--- client/Makefile.in.orig 2010-11-24 13:58:02.077206326 -0500
+++ client/Makefile.in 2010-11-24 13:59:01.452202855 -0500
@@ -354,8 +354,8 @@
@list='$(dist_sysconf_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
+ echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f.sample'"; \
+ $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f.sample"; \
done
uninstall-dist_sysconfDATA:

4
net/isc-dhcp42-server/files/patch-client__dhclient.conf → net/isc-dhcp42-server/files/patch-client__dhclient.conf.example
View File

@ -1,5 +1,5 @@
--- ./client/dhclient.conf.orig 2010-05-02 20:39:06.000000000 -0400
+++ ./client/dhclient.conf 2010-05-02 20:39:16.000000000 -0400
--- ./client/dhclient.conf.example.orig 2013-01-25 20:26:40.000000000 -0500
+++ ./client/dhclient.conf.example 2013-01-25 20:26:53.000000000 -0500
@@ -11,7 +11,7 @@
reboot 10;
select-timeout 5;

23
net/isc-dhcp42-server/files/patch-server__Makefile.am
View File

@ -1,23 +0,0 @@
--- server/Makefile.am.orig 2010-10-24 11:42:38.419499721 -0400
+++ server/Makefile.am 2010-10-24 11:44:01.489499357 -0400
@@ -1,6 +1,7 @@
AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
dist_sysconf_DATA = dhcpd.conf
+dist_sysconfDATA_INSTALL = $(INSTALL_DATA)
sbin_PROGRAMS = dhcpd
dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c \
@@ -13,3 +14,12 @@
man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
EXTRA_DIST = $(man_MANS)
+install-dist_sysconfDATA: $(dist_sysconf_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
+ @list='$(dist_sysconf_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ $(am__strip_dir) \
+ echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f.sample'"; \
+ $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f.sample"; \
+ done

13
net/isc-dhcp42-server/files/patch-server__Makefile.in
View File

@ -1,13 +0,0 @@
--- ./server/Makefile.in.orig 2010-01-07 19:47:06.000000000 -0500
+++ ./server/Makefile.in 2010-05-02 20:38:26.000000000 -0400
@@ -370,8 +370,8 @@
@list='$(dist_sysconf_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
+ echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f.sample'"; \
+ $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f.sample"; \
done
uninstall-dist_sysconfDATA:

8
net/isc-dhcp42-server/pkg-plist
View File

@ -1,10 +1,10 @@
@comment $FreeBSD$
@unexec if cmp -s %D/etc/dhcpd.conf.sample %D/etc/dhcpd.conf; then rm -f %D/etc/dhcpd.conf; fi
@unexec if cmp -s %D/etc/dhcpd.conf.example %D/etc/dhcpd.conf; then rm -f %D/etc/dhcpd.conf; fi
@unexec echo "You should stop the dhcpd and dhcpd6 daemons if you are permanently removing this port."
etc/dhcpd.conf.sample
etc/dhcpd.conf.example
@exec if [ ! -f %D/etc/dhcpd.conf ] ; then cp -p %D/%F %B/dhcpd.conf; fi
%%IPV6%%@unexec if cmp -s %D/etc/dhcpd6.conf.sample %D/etc/dhcpd6.conf; then rm -f %D/etc/dhcpd6.conf; fi
%%IPV6%%etc/dhcpd6.conf.sample
%%IPV6%%@unexec if cmp -s %D/etc/dhcpd6.conf.example %D/etc/dhcpd6.conf; then rm -f %D/etc/dhcpd6.conf; fi
%%IPV6%%etc/dhcpd6.conf.example
%%IPV6%%@exec if [ ! -f %D/etc/dhcpd6.conf ] ; then cp -p %D/%F %B/dhcpd6.conf; fi
%%IPV6%%etc/rc.d/isc-dhcpd6
sbin/dhcpd