Date: Sun, 24 Aug 2014 21:07:48 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366014 - in head/graphics/libecwj2: . files Message-ID: <201408242107.s7OL7m5x032066@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Sun Aug 24 21:07:47 2014 New Revision: 366014 URL: http://svnweb.freebsd.org/changeset/ports/366014 QAT: https://qat.redports.org/buildarchive/r366014/ Log: - Convert to USES=libtool and add INSTALL_TARGET=install-strip - Remove patches for Makefile.am and patch configure instead of configure.in to avoid USE_AUTOTOOLS - Touch ${WRKSRC}/Source/NCSBuildGnu/NCSGnuConfig.h.in to avoid autoheader Added: head/graphics/libecwj2/files/patch-configure - copied, changed from r365731, head/graphics/libecwj2/files/patch-configure.in Deleted: head/graphics/libecwj2/files/patch-Makefile.am head/graphics/libecwj2/files/patch-configure.in Modified: head/graphics/libecwj2/Makefile head/graphics/libecwj2/pkg-plist Modified: head/graphics/libecwj2/Makefile ============================================================================== --- head/graphics/libecwj2/Makefile Sun Aug 24 20:58:34 2014 (r366013) +++ head/graphics/libecwj2/Makefile Sun Aug 24 21:07:47 2014 (r366014) @@ -3,7 +3,7 @@ PORTNAME= libecwj2 PORTVERSION= 3.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://glebius.int.ru/tmp/403/ DISTFILES= ecw_jpeg_2000_sdk_3_3_source.zip @@ -14,17 +14,14 @@ COMMENT= Erdas ECW and JPEG2000 support RESTRICTED= Registration required to download sources,\ but sources no longer available on ERDAS website -USE_AUTOTOOLS= libtool autoconf +USES= gmake libtool zip USE_LDCONFIG= yes GNU_CONFIGURE= yes - -USES= gmake zip +INSTALL_TARGET= install-strip post-extract: - cd ${WRKDIR} && \ - ${EXTRACT_CMD} ImageCompressionSDKSourceCode3.3Setup_20070509.zip - -post-patch: - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure.in + (cd ${WRKDIR} && \ + ${EXTRACT_CMD} ImageCompressionSDKSourceCode3.3Setup_20070509.zip) + ${TOUCH} ${WRKSRC}/Source/NCSBuildGnu/NCSGnuConfig.h.in .include <bsd.port.mk> Copied and modified: head/graphics/libecwj2/files/patch-configure (from r365731, head/graphics/libecwj2/files/patch-configure.in) ============================================================================== --- head/graphics/libecwj2/files/patch-configure.in Sat Aug 23 13:50:41 2014 (r365731, copy source) +++ head/graphics/libecwj2/files/patch-configure Sun Aug 24 21:07:47 2014 (r366014) @@ -1,13 +1,13 @@ ---- configure.in.orig 2010-07-29 14:03:26.000000000 +0400 -+++ configure.in 2010-07-29 14:02:39.000000000 +0400 -@@ -32,17 +32,6 @@ +--- configure.orig ++++ configure +@@ -19897,17 +19897,6 @@ # Build some standard absolute include paths for the build MAIN_INCLUDE_DIR="$PWD/Source/include" -LCMS_INCLUDE_DIR="$PWD/Source/C/NCSEcw/lcms/include" - --# Run configure in the LCMS directory (using LCMS's own configure script) --# to initialise any platform dependent settings that it uses +-# Run configure in the LCMS directory (using LCMS's own configure script) +-# to initialise any platform dependent settings that it uses -# (e.g. typedefs for int types) - -THISDIR=$PWD @@ -18,7 +18,7 @@ # Build LIBECWJ2_DEFS with all defines, and NCSGnuSystemDefs.h with defines # needed by apps building against libecwj2. -@@ -76,6 +65,12 @@ +@@ -19941,6 +19930,12 @@ PLATFORM_STATIC_LDFLAGS="$PLATFORM_STATIC_LDFLAGS -L/System/Library/Frameworks/Carbon.framework/Carbon" PLATFORM_SHARED_LDFLAGS="$PLATFORM_SHARED_LDFLAGS $PLATFORM_STATIC_LDFLAGS -dynamiclib -single_module" ;; @@ -31,12 +31,12 @@ *) PLATFORM_DEFS="" PLATFORM_STATIC_LDFLAGS="" -@@ -89,7 +84,7 @@ +@@ -19954,7 +19949,7 @@ LIBECWJ2_CFLAGS="$PLATFORM_CFLAGS" LIBECWJ2_STATIC_LDFLAGS="$PLATFORM_STATIC_LDFLAGS" LIBECWJ2_SHARED_LDFLAGS="$PLATFORM_SHARED_LDFLAGS" -LIBECWJ2_INCLUDES="-I$MAIN_INCLUDE_DIR -I$LCMS_INCLUDE_DIR" -+LIBECWJ2_INCLUDES="-I$MAIN_INCLUDE_DIR -I%%LOCALBASE%%/include" ++LIBECWJ2_INCLUDES="-I$MAIN_INCLUDE_DIR" rm -f Source/NCSBuildGnu/NCSGnuSystemDefs.h echo "#ifndef LIBECWJ2" > Source/NCSBuildGnu/NCSGnuSystemDefs.h Modified: head/graphics/libecwj2/pkg-plist ============================================================================== --- head/graphics/libecwj2/pkg-plist Sun Aug 24 20:58:34 2014 (r366013) +++ head/graphics/libecwj2/pkg-plist Sun Aug 24 21:07:47 2014 (r366014) @@ -123,19 +123,19 @@ include/gdt_pub.h include/gdt_stat.h include/pcs_erm.h lib/libNCSCnet.a -lib/libNCSCnet.la lib/libNCSCnet.so lib/libNCSCnet.so.0 +lib/libNCSCnet.so.0.0.0 lib/libNCSEcw.a -lib/libNCSEcw.la lib/libNCSEcw.so lib/libNCSEcw.so.0 +lib/libNCSEcw.so.0.0.0 lib/libNCSEcwC.a -lib/libNCSEcwC.la lib/libNCSEcwC.so lib/libNCSEcwC.so.0 +lib/libNCSEcwC.so.0.0.0 lib/libNCSUtil.a -lib/libNCSUtil.la lib/libNCSUtil.so lib/libNCSUtil.so.0 +lib/libNCSUtil.so.0.0.0 lib/libecwj2.a
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408242107.s7OL7m5x032066>