diff options
| author | Ion-Mihai Tetcu <itetcu@FreeBSD.org> | 2009-04-29 18:49:13 +0000 |
|---|---|---|
| committer | Ion-Mihai Tetcu <itetcu@FreeBSD.org> | 2009-04-29 18:49:13 +0000 |
| commit | b43062e20c1dd5b26c39bb619dd333d7cc924c02 (patch) | |
| tree | 611de498b3330f560bc399c0d865d32ba242345b /net/quagga | |
| parent | d2164dcf043cc4c048c7e652cfa881e56dbeffb4 (diff) | |
| download | ports-b43062e20c1dd5b26c39bb619dd333d7cc924c02.tar.gz ports-b43062e20c1dd5b26c39bb619dd333d7cc924c02.zip | |
Fix INDEX by removing vs/rcs/??? merge conflicts.
Reported by: QAT
Notes
Notes:
svn path=/head/; revision=232954
Diffstat (limited to 'net/quagga')
| -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 7d6ff9a7f665..073540e1afd5 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" \ |