Fix INDEX by removing vs/rcs/??? merge conflicts.
Reported by: QAT
This commit is contained in:
parent
d2164dcf04
commit
b43062e20c
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=232954
1 changed files with 0 additions and 7 deletions
|
@ -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" \
|
||||
|
|
Loading…
Reference in a new issue