diff options
| author | Christian Weisgerber <naddy@FreeBSD.org> | 2014-01-12 22:53:59 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@FreeBSD.org> | 2014-01-12 22:53:59 +0000 |
| commit | 549b01a3f6b6ad073b753027471283dcbd7c15ec (patch) | |
| tree | 93b1a7c430df2cb39811b345040a27a83110a9fd | |
| parent | 55dc9b3139a9cdd0175408e6845025ca9c461051 (diff) | |
| download | ports-549b01a3f6b6ad073b753027471283dcbd7c15ec.tar.gz ports-549b01a3f6b6ad073b753027471283dcbd7c15ec.zip | |
xz has been in base long enough, drop workarounds for unsupported releases.
Notes
Notes:
svn path=/head/; revision=339558
| -rw-r--r-- | graphics/ImageMagick/Makefile | 6 | ||||
| -rw-r--r-- | graphics/enfle/Makefile | 4 | ||||
| -rw-r--r-- | graphics/fv/Makefile | 11 |
3 files changed, 3 insertions, 18 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 5b984fa48c60..8e1f63b19fe8 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -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 diff --git a/graphics/enfle/Makefile b/graphics/enfle/Makefile index 3b36df1737ac..b3bb0415515e 100644 --- a/graphics/enfle/Makefile +++ b/graphics/enfle/Makefile @@ -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 ; \ diff --git a/graphics/fv/Makefile b/graphics/fv/Makefile index eb85bec57c14..59e2918aa2d0 100644 --- a/graphics/fv/Makefile +++ b/graphics/fv/Makefile @@ -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 |