Date: Sun, 12 Jan 2014 22:54:00 +0000 (UTC) From: Christian Weisgerber <naddy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339558 - in head/graphics: ImageMagick enfle fv Message-ID: <201401122254.s0CMs0Y2054605@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: naddy Date: Sun Jan 12 22:53:59 2014 New Revision: 339558 URL: http://svnweb.freebsd.org/changeset/ports/339558 Log: xz has been in base long enough, drop workarounds for unsupported releases. Modified: head/graphics/ImageMagick/Makefile head/graphics/enfle/Makefile head/graphics/fv/Makefile Modified: head/graphics/ImageMagick/Makefile ============================================================================== --- head/graphics/ImageMagick/Makefile Sun Jan 12 22:42:44 2014 (r339557) +++ head/graphics/ImageMagick/Makefile Sun Jan 12 22:53:59 2014 (r339558) @@ -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 Modified: head/graphics/enfle/Makefile ============================================================================== --- head/graphics/enfle/Makefile Sun Jan 12 22:42:44 2014 (r339557) +++ head/graphics/enfle/Makefile Sun Jan 12 22:53:59 2014 (r339558) @@ -63,10 +63,6 @@ CONFIGURE_ARGS+= --disable-system-avcode 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 ; \ Modified: head/graphics/fv/Makefile ============================================================================== --- head/graphics/fv/Makefile Sun Jan 12 22:42:44 2014 (r339557) +++ head/graphics/fv/Makefile Sun Jan 12 22:53:59 2014 (r339558) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401122254.s0CMs0Y2054605>