From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Sep 20 16:10:11 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9FA951065670 for ; Thu, 20 Sep 2012 16:10:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 773D98FC08 for ; Thu, 20 Sep 2012 16:10:11 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q8KGAA2t037947 for ; Thu, 20 Sep 2012 16:10:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q8KGAAao037946; Thu, 20 Sep 2012 16:10:10 GMT (envelope-from gnats) Resent-Date: Thu, 20 Sep 2012 16:10:10 GMT Resent-Message-Id: <201209201610.q8KGAAao037946@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Steve Wills Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D673C106566B for ; Thu, 20 Sep 2012 16:09:40 +0000 (UTC) (envelope-from steve@mouf.net) Received: from mouf.net (mouf.net [IPv6:2607:fc50:0:4400:216:3eff:fe69:33b3]) by mx1.freebsd.org (Postfix) with ESMTP id 6A9988FC08 for ; Thu, 20 Sep 2012 16:09:40 +0000 (UTC) Received: from meatwad.mouf.net ([IPv6:2001:470:8:58f:21f:d0ff:feaf:1a4d]) by mouf.net (8.14.5/8.14.5) with ESMTP id q8KG5H9Z047184 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Thu, 20 Sep 2012 12:05:28 -0400 (EDT) (envelope-from steve@meatwad.mouf.net) Received: (from steve@localhost) by meatwad.mouf.net (8.14.5/8.14.5/Submit) id q8KG8xi2072939; Thu, 20 Sep 2012 12:08:59 -0400 (EDT) (envelope-from steve) Message-Id: <201209201608.q8KG8xi2072939@meatwad.mouf.net> Date: Thu, 20 Sep 2012 12:08:59 -0400 (EDT) From: Steve Wills To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: mi@aldan.algebra.com Subject: ports/171812: [PATCH] graphics/libfpx: update to 1.3.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Sep 2012 16:10:11 -0000 >Number: 171812 >Category: ports >Synopsis: [PATCH] graphics/libfpx: update to 1.3.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Sep 20 16:10:10 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Steve Wills >Release: FreeBSD 10.0-CURRENT amd64 >Organization: >Environment: System: FreeBSD meatwad.mouf.net 10.0-CURRENT FreeBSD 10.0-CURRENT #7 r239244M: Mon Aug 13 23:21:42 EDT >Description: - Update to 1.3.1 Port maintainer (mi@aldan.algebra.com) is cc'd. Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: SVN) >How-To-Repeat: >Fix: --- libfpx-1.3.1.patch begins here --- Index: files/patch-aa =================================================================== --- files/patch-aa (revision 304584) +++ files/patch-aa (working copy) @@ -1,10 +0,0 @@ ---- fpx/f_fpxvw.cpp 2005-02-25 21:23:05.000000000 -0500 -+++ fpx/f_fpxvw.cpp 2012-01-19 19:44:34.425688599 +0200 -@@ -613,6 +613,7 @@ HRESULT OleRegGetUserType(REFCLSID clsid - const OLECHAR *src=OLESTR("Flashpix Toolkit Application"); - OLECHAR *dest=*pszUserType; - while(*src) *dest++=*src++; -+ *dest=(OLECHAR)0; - - return S_OK; - } Index: files/Makefile.bsd =================================================================== --- files/Makefile.bsd (revision 304584) +++ files/Makefile.bsd (working copy) @@ -1,47 +0,0 @@ -LIB = fpx -INCS = fpxlib.h -SHLIB_MAJOR= 2 -SHLIB_MINOR= 7 -WARNS= 3 - -LIBDIR = ${LOCALBASE}/lib -INCSDIR = ${LOCALBASE}/include -INCDIR = ${INCSDIR} # for pre-bsd.incs.mk API - -NO_PROFILE= Don't want it -NOPROFILE= ${NO_PROFILE} -HAVES= -DHAVE_WCHAR_H -DHAVE_DLFCN_H \ - -DHAVE_SYS_TIME_H \ - -DHAVE_SYS_PARAM_H -DHAVE_SYS_MOUNT_H -CFLAGS+= ${HAVES} - -CPPS != find ${.CURDIR} -name \*.cpp -print -# Some of the .cxx files are #include-ed into others, so can't use `find' here: -OLESS := ascii.cxx cdocfile.cxx chinst.cxx dffuncs.cxx dfiter.cxx \ - dfstream.cxx difat.cxx dir.cxx dirp.cxx docfile.cxx entry.cxx \ - expdf.cxx expiter.cxx expst.cxx fat.cxx funcs.cxx header.cxx \ - iter.cxx mem.cxx msf.cxx msfiter.cxx mstream.cxx page.cxx \ - refilb.cxx rexpdf.cxx sstream.cxx storage.cxx time.cxx \ - vect.cxx wchar.c -JPGS != find ${.CURDIR}/jpeg -name \*.c - -CPPS += ${OLESS:S/^/${.CURDIR}\/oless\//} ${JPGS} - -SRCS = ${CPPS:T:Nejpeg.c} - -CXXFLAGS+= -fno-rtti -fno-exceptions -fno-strict-aliasing ${HAVES} -LDADD += -L${LOCALBASE}/lib -lm -lstdc++ - -.PATH: ${CPPS:H} - -.for d in oless/h jpeg ole basics ri_image oless fpx . -CXXFLAGS+= -I${.CURDIR}/$d -.endfor - -CXXFLAGS+= -I${LOCALBASE}/include -D_UNIX - -.include - -# Work-around the bug in g++4.2's system header: -# /usr/include/c++/4.2/bits/basic_ios.h:156: warning: empty body in an if-statement -CXXFLAGS:= ${CXXFLAGS:N-Wsystem-headers} Index: Makefile =================================================================== --- Makefile (revision 304584) +++ Makefile (working copy) @@ -6,33 +6,20 @@ # PORTNAME= libfpx -PORTVERSION= 1.2.0.12 -PORTREVISION= 2 +PORTVERSION= 1.3.1 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= ehaupt +MASTER_SITES= http://www.imagemagick.org/download/delegates/ +DISTNAME= ${PORTNAME}-${PORTVERSION}-1 -PATCHFILES= fpx.mega-patch.2007-11-01.bz2 -PATCH_SITES= http://aldan.algebra.com/~mi/ - MAINTAINER= mi@aldan.algebra.com COMMENT= Library routines for working with Flashpix images USE_BZIP2= yes - -post-patch: - ${RM} ${WRKSRC}/ri_image/wchar.c ${WRKSRC}/fpx/fpxlib.h - -PLIST_FILES=lib/libfpx.so.2 lib/libfpx.so lib/libfpx.a include/fpxlib.h +PLIST_FILES= lib/libfpx.so.1 lib/libfpx.so lib/libfpx.a include/fpxlib.h \ + include/fpxlib-config.h lib/libfpx.la USE_LDCONFIG= yes -MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_JOBS_SAFE= yes +GNU_CONFIGURE= yes .include -# We want the port's Makefile to build compiler-flags from scratch -# (based on WARNS= in particular) instead of being influenced by -# the environment... There is no obvious way to prevent bsd.port.mk -# from adding CFLAGS and CXXFLAGS to the build environment, so we -# remove them here. -MAKE_ENV:= ${MAKE_ENV:NCFLAGS=*:NCXXFLAGS=*} Index: distinfo =================================================================== --- distinfo (revision 304584) +++ distinfo (working copy) @@ -1,4 +1,2 @@ -SHA256 (libfpx-1.2.0.12.tar.bz2) = c9b5ec94c255cbfebcefa6a045f5c7ca3c8ab9de2ad17b88ba4bfce924b91a97 -SIZE (libfpx-1.2.0.12.tar.bz2) = 2301747 -SHA256 (fpx.mega-patch.2007-11-01.bz2) = 1b71d5178c2b85d673e5fece161834d27942c829918ff2c04840f07ffecfab6d -SIZE (fpx.mega-patch.2007-11-01.bz2) = 122232 +SHA256 (libfpx-1.3.1-1.tar.bz2) = 4e08834db7a4f4a9f5261ee526bbe8ed6be3c23fde62b752e9b5bec2014f5cd3 +SIZE (libfpx-1.3.1-1.tar.bz2) = 2335759 --- libfpx-1.3.1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: