xz has been in base long enough, drop workarounds for unsupported releases.

This commit is contained in:
Christian Weisgerber 2014-01-12 22:53:59 +00:00
parent 55dc9b3139
commit 549b01a3f6
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=339558
3 changed files with 3 additions and 18 deletions

View file

@ -264,11 +264,7 @@ CONFIGURE_ARGS+= --without-gvc
.endif
# LZMA support
.if ${PORT_OPTIONS:MLZMA}
. if (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) || (${OSVERSION} < 800505)
LIB_DEPENDS+= lzma:${PORTSDIR}/archivers/xz
. endif
.else
.if ! ${PORT_OPTIONS:MLZMA}
CONFIGURE_ARGS+= --without-lzma
.endif

View file

@ -63,10 +63,6 @@ CONFIGURE_ARGS+= --disable-system-avcodec
PLIST_SUB+= AVCODEC="@comment "
.endif
.if (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) || ${OSVERSION} < 800505
LIB_DEPENDS+= lzma.5:${PORTSDIR}/archivers/xz
.endif
post-patch:
@${REINPLACE_CMD} -e \
's|/usr/local/|${LOCALBASE}/|g ; \

View file

@ -24,7 +24,8 @@ ALL_TARGET= ${PORTNAME}
CXXFLAGS+= $$(pkg-config --cflags libpng15) \
-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= $$(pkg-config --libs libpng15) \
-L${LOCALBASE}/lib -lglut -lGLU -lGL -lbz2 -lm -lz ${PTHREAD_LIBS}
-L${LOCALBASE}/lib -lglut -lGLU -lGL -lbz2 -lm -lz -llzma \
${PTHREAD_LIBS}
PORTDOCS= AUTHORS ChangeLog README
PLIST_FILES= bin/${PORTNAME}
@ -32,14 +33,6 @@ PLIST_FILES= bin/${PORTNAME}
NO_STAGE= yes
.include <bsd.port.options.mk>
.if ((${OSVERSION} >= 900000 && ${OSVERSION} < 900012) || ${OSVERSION} < 800505)
LIB_DEPENDS+= lzma.5:${PORTSDIR}/archivers/xz
CXXFLAGS+= $$(pkg-config --cflags liblzma)
LDFLAGS+= $$(pkg-config --libs liblzma)
.else
LDFLAGS+= -llzma
.endif
.if !defined(WITH_DEBUG)
CXXFLAGS+= -DNDEBUG
.endif