Date: Sun, 28 Jan 2001 20:20:02 -0800 (PST) From: Cyrille Lefevre <root@gits.dyndns.org> To: freebsd-ports@FreeBSD.org Subject: Re: ports/24686: Updated port: net/isc-dhcp3 (beta 2 patch level 15) Message-ID: <200101290420.f0T4K2N82762@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/24686; it has been noted by GNATS.
From: Cyrille Lefevre <root@gits.dyndns.org>
To: freebsd-gnats-submit@FreeBSD.org
Cc:
Subject: Re: ports/24686: Updated port: net/isc-dhcp3 (beta 2 patch level 15)
Date: Mon, 29 Jan 2001 05:13:45 +0100 (CET)
this patch fix possible collisions w/ bsd.*.mk variables.
diff -BurN -x CVS -x work -x *~ -x *.orig -x *.rej -I $Id.*$ -I $FreeBSD.*$ isc-dhcp3-3.0b2pl15/Makefile isc-dhcp3/Makefile
--- isc-dhcp3-3.0b2pl15/Makefile Mon Jan 29 05:04:28 2001
+++ isc-dhcp3/Makefile Mon Jan 29 05:03:25 2001
@@ -39,12 +39,11 @@
DATA_FILES= dhclient.leases dhcpd.leases
CONF_FILES= dhclient.conf
-BINDIR= ${PREFIX}/sbin
-ETCDIR= ${PREFIX}/etc
-ETCRCD= ${PREFIX}/etc/rc.d
-DOCDIR= ${PREFIX}/share/doc/${PORTNAME}
-VARDB= /var/db
-VARRUN= /var/run
+BIN_DIR= ${PREFIX}/sbin
+ETC_DIR= ${PREFIX}/etc
+RCD_DIR= ${PREFIX}/etc/rc.d
+DOC_DIR= ${PREFIX}/share/doc/${PORTNAME}
+VARDB_DIR= /var/db
STRIP?= strip
@@ -75,40 +74,40 @@
strip-binary-files:
.for file in ${BIN_FILES}
-.if exists({BINDIR}/${file})
- @${STRIP} ${BINDIR}/${file}
+.if exists({BIN_DIR}/${file})
+ @${STRIP} ${BIN_DIR}/${file}
.endif
.endfor
install-startup-files:
.for file in ${RCD_FILES}
- @${INSTALL_SCRIPT} ${FILESDIR}/${file} ${ETCRCD}/${file}
+ @${INSTALL_SCRIPT} ${FILESDIR}/${file} ${RCD_DIR}/${file}
.endfor
install-doc-files:
.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCDIR}
+ @${MKDIR} ${DOC_DIR}
.for file in ${DOC_FILES}
- @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCDIR}/${file}
+ @${INSTALL_DATA} ${WRKSRC}/${file} ${DOC_DIR}/${file}
.endfor
.endif
install-sample-files:
.for file in ${SAMP_FILES}
- @${INSTALL_DATA} ${WRKSRC}/${file} ${ETCDIR}/${file:T}.sample
+ @${INSTALL_DATA} ${WRKSRC}/${file} ${ETC_DIR}/${file:T}.sample
.endfor
create-data-files:
.for file in ${DATA_FILES}
-.if !exists(${VARDB}/${file})
- @${TOUCH} ${VARDB}/${file}
+.if !exists(${VARDB_DIR}/${file})
+ @${TOUCH} ${VARDB_DIR}/${file}
.endif
.endfor
create-conf-files:
.for file in ${CONF_FILES}
-.if !exists(${ETCDIR}/${file})
- @${TOUCH} ${ETCDIR}/${file}
+.if !exists(${ETC_DIR}/${file})
+ @${TOUCH} ${ETC_DIR}/${file}
.endif
.endfor
Cyrille.
--
home: mailto:clefevre@citeweb.net UNIX is user-friendly; it's just particular
work: mailto:Cyrille.Lefevre@edf.fr about who it chooses to be friends with.
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200101290420.f0T4K2N82762>