From owner-svn-ports-head@FreeBSD.ORG Fri Oct 3 12:26:46 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1EDFC764; Fri, 3 Oct 2014 12:26:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F3C7C625; Fri, 3 Oct 2014 12:26:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s93CQjne041172; Fri, 3 Oct 2014 12:26:45 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s93CQjgJ041170; Fri, 3 Oct 2014 12:26:45 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201410031226.s93CQjgJ041170@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Fri, 3 Oct 2014 12:26:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369887 - head/graphics/mozjpeg X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Oct 2014 12:26:46 -0000 Author: tijl Date: Fri Oct 3 12:26:44 2014 New Revision: 369887 URL: https://svnweb.freebsd.org/changeset/ports/369887 QAT: https://qat.redports.org/buildarchive/r369887/ Log: - Remove :oldver from USES=libtool - Convert to USES=autoreconf and INSTALL_TARGET=install-strip - Remove jpeg 6 and 7 compatibility options because those versions of jpeg are no longer in the ports tree Modified: head/graphics/mozjpeg/Makefile head/graphics/mozjpeg/pkg-plist Modified: head/graphics/mozjpeg/Makefile ============================================================================== --- head/graphics/mozjpeg/Makefile Fri Oct 3 12:13:43 2014 (r369886) +++ head/graphics/mozjpeg/Makefile Fri Oct 3 12:26:44 2014 (r369887) @@ -3,7 +3,7 @@ PORTNAME= mozjpeg PORTVERSION= 2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MAINTAINER= horia@racoviceanu.com @@ -16,18 +16,16 @@ GH_ACCOUNT= mozilla GH_TAGNAME= ${GH_COMMIT} GH_COMMIT= 594b725 -USES= libtool:oldver -USE_AUTOTOOLS= aclocal autoconf autoheader automake libtoolize -USE_LDCONFIG= ${PREFIX}/include/${PORTNAME} ${PREFIX}/lib/${PORTNAME} +USES= autoreconf libtool +USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} GNU_CONFIGURE= yes CONFIGURE_ARGS= --docdir=${PREFIX}/share/doc/${PORTNAME} \ --includedir=${PREFIX}/include/${PORTNAME} \ - --libdir=${PREFIX}/lib/${PORTNAME} -AUTOMAKE_ARGS+= -fiv --add-missing -LDFLAGS+= -L${PREFIX}/lib/${PORTNAME} + --libdir=${PREFIX}/lib/${PORTNAME} \ + --with-jpeg8 +INSTALL_TARGET= install-strip -PLIST_SUB= PORTNAME=${PORTNAME} \ - VER=${VER} +PLIST_SUB= PORTNAME=${PORTNAME} PORTDOCS= * @@ -43,16 +41,10 @@ PORTEXAMPLES= * OPTIONS_DEFINE= DOCS EXAMPLES GCC SIMD TURBOJPEG -OPTIONS_GROUP= ARITHMETIC_CODING -OPTIONS_GROUP_ARITHMETIC_CODING= DECODING ENCODING - OPTIONS_MULTI= LIBRARIES OPTIONS_MULTI_LIBRARIES= SHARED STATIC -OPTIONS_SINGLE= API_ABI_EMULATION -OPTIONS_SINGLE_API_ABI_EMULATION= JPEG6B JPEG7 JPEG8 - -OPTIONS_DEFAULT= DECODING ENCODING GCC JPEG8 SHARED TURBOJPEG +OPTIONS_DEFAULT=GCC SHARED TURBOJPEG OPTIONS_SUB= yes @@ -60,41 +52,17 @@ GCC_DESC= Use the GNU Compiler Collectio SIMD_DESC= Include SIMD extensions (MMX, SSE2, NEON) TURBOJPEG_DESC= Include the TurboJPEG wrapper library and associated tests -ENCODING_DESC= Enable arithmetic encoding -DECODING_DESC= Enable arithmetic decoding - STATIC_DESC= Build static libraries SHARED_DESC= Build shared libraries -JPEG6B_DESC= API/ABI-compatible with libjpeg v6b -JPEG7_DESC= API/ABI-compatible with libjpeg v7 (implies arith-coding) -JPEG8_DESC= API/ABI-compatible with libjpeg v8 (implies arith-coding) - GCC_USE= GCC=yes SIMD_CONFIGURE_WITH= simd SIMD_BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm TURBOJPEG_CONFIGURE_WITH= turbojpeg -JPEG7_CONFIGURE_WITH= jpeg7 -JPEG8_CONFIGURE_WITH= jpeg8 - STATIC_CONFIGURE_ENABLE= static SHARED_CONFIGURE_ENABLE= shared -.include - -.if ${PORT_OPTIONS:MJPEG6B} -. if ! ${PORT_OPTIONS:MENCODING} -CONFIGURE_ARGS+= --without-arith-enc -. endif -. if ! ${PORT_OPTIONS:MDECODING} -CONFIGURE_ARGS+= --without-arith-dec -. endif -VER= 63 -.else -VER= 8 -.endif - post-patch: @${REINPLACE_CMD} -e 's|docdir = $$(datadir)/doc|&/mozjpeg|; \ /^exampledir/s|=.*|= ${EXAMPLESDIR}|' \ @@ -105,12 +73,4 @@ post-install: ${INSTALL_DATA} ${DOC_FILES:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR1} ${INSTALL_DATA} ${DOC_FILES:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2} -.if ${PORT_OPTIONS:MSHARED} - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/libjpeg.so.${VER} -.endif - -.if ${PORT_OPTIONS:MSHARED} && ${PORT_OPTIONS:MTURBOJPEG} - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/libturbojpeg.so.1 -.endif - .include Modified: head/graphics/mozjpeg/pkg-plist ============================================================================== --- head/graphics/mozjpeg/pkg-plist Fri Oct 3 12:13:43 2014 (r369886) +++ head/graphics/mozjpeg/pkg-plist Fri Oct 3 12:26:44 2014 (r369887) @@ -10,13 +10,13 @@ include/%%PORTNAME%%/jmorecfg.h include/%%PORTNAME%%/jpeglib.h %%TURBOJPEG%%include/%%PORTNAME%%/turbojpeg.h %%STATIC%%lib/%%PORTNAME%%/libjpeg.a -lib/%%PORTNAME%%/libjpeg.la %%SHARED%%lib/%%PORTNAME%%/libjpeg.so -%%SHARED%%lib/%%PORTNAME%%/libjpeg.so.%%VER%% +%%SHARED%%lib/%%PORTNAME%%/libjpeg.so.8 +%%SHARED%%lib/%%PORTNAME%%/libjpeg.so.8.0.2 %%STATIC%%%%TURBOJPEG%%lib/%%PORTNAME%%/libturbojpeg.a -%%TURBOJPEG%%lib/%%PORTNAME%%/libturbojpeg.la %%SHARED%%%%TURBOJPEG%%lib/%%PORTNAME%%/libturbojpeg.so -%%SHARED%%%%TURBOJPEG%%lib/%%PORTNAME%%/libturbojpeg.so.1 +%%SHARED%%%%TURBOJPEG%%lib/%%PORTNAME%%/libturbojpeg.so.0 +%%SHARED%%%%TURBOJPEG%%lib/%%PORTNAME%%/libturbojpeg.so.0.1.0 man/man1/cjpeg.1.gz man/man1/djpeg.1.gz man/man1/jpegtran.1.gz