diff options
author | itetcu <itetcu@FreeBSD.org> | 2009-04-30 02:49:13 +0800 |
---|---|---|
committer | itetcu <itetcu@FreeBSD.org> | 2009-04-30 02:49:13 +0800 |
commit | cdb8b618ef15336f99b198c320ed6292933fad4e (patch) | |
tree | 1b12784b10cabcd40f69a907175efac7113430a5 /net | |
parent | 2dbfc52496b756af822a6b2a9aff233ce1e0ba03 (diff) | |
download | freebsd-ports-graphics-cdb8b618ef15336f99b198c320ed6292933fad4e.tar.gz freebsd-ports-graphics-cdb8b618ef15336f99b198c320ed6292933fad4e.tar.zst freebsd-ports-graphics-cdb8b618ef15336f99b198c320ed6292933fad4e.zip |
Fix INDEX by removing vs/rcs/??? merge conflicts.
Reported by: QAT
Diffstat (limited to 'net')
-rw-r--r-- | net/quagga/Makefile | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/net/quagga/Makefile b/net/quagga/Makefile index 7d6ff9a7f66..073540e1afd 100644 --- a/net/quagga/Makefile +++ b/net/quagga/Makefile @@ -43,13 +43,6 @@ OPTIONS= ISISD "Enable experimental ISIS daemon" off \ .include <bsd.port.pre.mk> -<<<<<<< Makefile -.if ${OSVERSION} >= 800059 -#BROKEN= does not build -.endif - -======= ->>>>>>> 1.80 CONFIGURE_ARGS+=--includedir=${PREFIX}/include --enable-exampledir=${PREFIX}/share/examples/quagga --enable-pidfile-mask=0644 CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \ |