diff options
| author | Munechika SUMIKAWA <sumikawa@FreeBSD.org> | 2004-10-27 15:27:36 +0000 |
|---|---|---|
| committer | Munechika SUMIKAWA <sumikawa@FreeBSD.org> | 2004-10-27 15:27:36 +0000 |
| commit | d4626fd9d4819c73a120c79d3d2bc158ac28eeb8 (patch) | |
| tree | ea9b3ce756620d452c2c49157cacb62f0aa17379 /net/zebra | |
| parent | Upgrade to 3.0.2. (diff) | |
- Move Makefile.inc into ${WRKDIR}
- Make compilable when FreeBSD has /dev/ip.
Obtained from: net/quagga
Reported by: swylie@wylie.com
Notes
Notes:
svn path=/head/; revision=120319
Diffstat (limited to 'net/zebra')
| -rw-r--r-- | net/zebra/Makefile | 8 | ||||
| -rw-r--r-- | net/zebra/files/patch-configure | 11 | ||||
| -rw-r--r-- | net/zebra/scripts/configure | 4 |
3 files changed, 17 insertions, 6 deletions
diff --git a/net/zebra/Makefile b/net/zebra/Makefile index a1bf48a62ae9..5fd54b4855e5 100644 --- a/net/zebra/Makefile +++ b/net/zebra/Makefile @@ -78,13 +78,13 @@ PLIST_SUB+= VTYSH="@comment " .if !defined(BATCH) pre-configure: - @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc + @${RM} -f ${WRKDIR}/Makefile.inc post-clean: - @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc + @${RM} -f ${WRKDIR}/Makefile.inc -.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) -.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" +.if exists(${WRKDIR}/Makefile.inc) +.include "${WRKDIR}/Makefile.inc" .endif .endif diff --git a/net/zebra/files/patch-configure b/net/zebra/files/patch-configure new file mode 100644 index 000000000000..f379a613abb0 --- /dev/null +++ b/net/zebra/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Tue Nov 4 18:00:53 2003 ++++ configure Wed Oct 27 16:19:36 2004 +@@ -5669,6 +5669,8 @@ + zebra_ipforward_path="proc";; + "/dev/ip") + case "$host" in ++ *-freebsd*) IPFORWARD=ipforward_sysctl.o ++ zebra_ipforward_path="sysctl";; + *-linux-*) IPFORWARD=ipforward_proc.o + zebra_ipforward_path="proc";; + *-nec-sysv4*) IPFORWARD=ipforward_ews.o diff --git a/net/zebra/scripts/configure b/net/zebra/scripts/configure index 9a5c8a9926f4..a48a5446febc 100644 --- a/net/zebra/scripts/configure +++ b/net/zebra/scripts/configure @@ -37,8 +37,8 @@ case $retval in ;; esac -/bin/mkdir -p ${WRKDIRPREFIX}${CURDIR} -exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc +/bin/mkdir -p ${WRKDIR} +exec > ${WRKDIR}/Makefile.inc while [ "$1" ]; do case $1 in |