diff options
author | obrien <obrien@FreeBSD.org> | 2000-06-14 15:43:47 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2000-06-14 15:43:47 +0000 |
commit | 43adb980f8dc3ae026fb1c5713d4170b97dfacd7 (patch) | |
tree | 03e5019da7755dbf0f04c5a48379f6ce2c472457 | |
parent | 74db8e5d6eefd24de7a1ab3944a42d11c6f21d88 (diff) | |
download | FreeBSD-ports-43adb980f8dc3ae026fb1c5713d4170b97dfacd7.zip FreeBSD-ports-43adb980f8dc3ae026fb1c5713d4170b97dfacd7.tar.gz |
This fixes the suposed fix of Makefile rev 1.29 ad patch-aj rev 1.1.
This port is now PREFIX clean and installs files into the right locations
(I previously marked it BROKEN because it wasn't).
Bad "fix" by: JHK
Absent maintainer would would not fix this himself: jseger
-rw-r--r-- | net/isc-dhcp2/Makefile | 3 | ||||
-rw-r--r-- | net/isc-dhcp2/files/patch-aj | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/net/isc-dhcp2/Makefile b/net/isc-dhcp2/Makefile index d9f9255..ace5226 100644 --- a/net/isc-dhcp2/Makefile +++ b/net/isc-dhcp2/Makefile @@ -21,6 +21,9 @@ MAN5= dhclient.conf.5 dhclient.leases.5 dhcp-options.5 dhcpd.conf.5 \ dhcpd.leases.5 MAN8= dhclient.8 dhclient-script.8 dhcpd.8 dhcrelay.8 +post-patch: + @${PERL} -pi.fbsd -e 's.!!PREFIX!!.${PREFIX}.g' ${WRKSRC}/includes/dhcpd.h + post-install: ${TOUCH} /var/db/dhcpd.leases .for file in dhclient dhcpd dhcrelay diff --git a/net/isc-dhcp2/files/patch-aj b/net/isc-dhcp2/files/patch-aj index 4e86342..129fe09 100644 --- a/net/isc-dhcp2/files/patch-aj +++ b/net/isc-dhcp2/files/patch-aj @@ -5,12 +5,12 @@ #else #ifndef _PATH_DHCPD_CONF -#define _PATH_DHCPD_CONF "/etc/dhcpd.conf" -+#define _PATH_DHCPD_CONF "/usr/local/etc/dhcpd.conf" ++#define _PATH_DHCPD_CONF "!!PREFIX!!/etc/dhcpd.conf" #endif #ifndef _PATH_DHCPD_DB -#define _PATH_DHCPD_DB "/etc/dhcpd.leases" -+#define _PATH_DHCPD_DB "/usr/local/etc/dhcpd.leases" ++#define _PATH_DHCPD_DB "!!PREFIX!!/etc/dhcpd.leases" #endif #ifndef _PATH_DHCPD_PID @@ -19,7 +19,7 @@ #ifndef _PATH_DHCLIENT_CONF -#define _PATH_DHCLIENT_CONF "/etc/dhclient.conf" -+#define _PATH_DHCLIENT_CONF "/usr/local/etc/dhclient.conf" ++#define _PATH_DHCLIENT_CONF "!!PREFIX!!/etc/dhclient.conf" #endif #ifndef _PATH_DHCLIENT_PID @@ -28,7 +28,7 @@ #ifndef _PATH_DHCLIENT_DB -#define _PATH_DHCLIENT_DB "/etc/dhclient.leases" -+#define _PATH_DHCLIENT_DB "/usr/local/etc/dhclient.leases" ++#define _PATH_DHCLIENT_DB "!!PREFIX!!/etc/dhclient.leases" #endif #ifndef _PATH_RESOLV_CONF |