From gahr@FreeBSD.org  Thu May  9 15:14:44 2013
Return-Path: <gahr@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id 904197EC;
	Thu,  9 May 2013 15:14:44 +0000 (UTC)
	(envelope-from gahr@FreeBSD.org)
Received: from cpanel09.rubas.ch (cpanel09.rubas.ch [195.182.222.79])
	by mx1.freebsd.org (Postfix) with ESMTP id 4C5E9D23;
	Thu,  9 May 2013 15:14:44 +0000 (UTC)
Received: from 98-41.199-178.cust.bluewin.ch ([178.199.41.98]:56023 helo=gahrfit.gahr.ch)
	by cpanel09.rubas.ch with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256)
	(Exim 4.80)
	(envelope-from <gahr@FreeBSD.org>)
	id 1UaSYM-003Y96-L7; Thu, 09 May 2013 17:14:43 +0200
Message-Id: <20130509151439.GG15016@gahrfit.gahr.ch>
Date: Thu, 9 May 2013 17:14:39 +0200
From: Pietro Cerutti <gahr@FreeBSD.org>
Reply-To: gahr@FreeBSD.org
To: Thierry Thomas <thierry@FreeBSD.org>
Cc: FreeBSD-gnats-submit@freebsd.org
In-Reply-To: <20130509144804.GL65720@graf.pompo.net>
Subject: Re: graphics/freeimage: packaging freeimageplus
References: <20130509122704.8BF4A42D258E@graf.pompo.net>
 <20130509142559.GF15016@gahrfit.gahr.ch>
 <20130509144804.GL65720@graf.pompo.net>

>Number:         178456
>Category:       ports
>Synopsis:       Re: graphics/freeimage: packaging freeimageplus
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 09 15:20:00 UTC 2013
>Closed-Date:    Fri May 10 03:49:15 UTC 2013
>Last-Modified:  Fri May 10 03:49:15 UTC 2013
>Originator:     
>Release:        
>Organization:
>Environment:
>Description:
 --Wb5NtZlyOqqy58h0
 Content-Type: multipart/mixed; boundary="TD8GDToEDw0WLGOL"
 Content-Disposition: inline
 
 
 --TD8GDToEDw0WLGOL
 Content-Type: text/plain; charset=utf-8
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 On 2013-May-09, 16:48, Thierry Thomas wrote:
 > On thu 9 may 13 at 16:26:00 +0200, Pietro Cerutti <gahr@FreeBSD.org>
 >  wrote:
 >=20
 > > Thanks for this Thierry. I'm fine with it as a solution, but did you
 > > also consider just adding the c++ wrapper to the original port, so that
 > > both the C and the C++ interfaces are installed? It's just matter of an
 > > extra header file and an extra library (plus symlinks), no big deal for
 > > users.
 >=20
 > Yes, could be so. But since upstream considers it as an optional
 > wrapper, I just did so myself.
 
 I see your point, but I still consider it an overkill to handle it as
 master/slave ports. The small patch attached is in my opinion a simpler
 solution. If you have no strong arguments against it, I'm going to
 commit it later today or tomorrow.
 
 --=20
 Pietro Cerutti
 The FreeBSD Project
 gahr@FreeBSD.org
 
 PGP Public Key:
 http://gahr.ch/pgp
 
 --TD8GDToEDw0WLGOL
 Content-Type: text/x-diff; charset=utf-8
 Content-Disposition: attachment; filename="freeimageplus.diff"
 Content-Transfer-Encoding: quoted-printable
 
 Index: Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- Makefile	(revision 317737)
 +++ Makefile	(working copy)
 @@ -8,7 +8,7 @@
  DISTNAME=3D	FreeImage${PORTVERSION:S/.//g}
 =20
  MAINTAINER=3D	gahr@FreeBSD.org
 -COMMENT=3D	An open source graphics library
 +COMMENT=3D	Simple C/C++ bitmap graphics library
 =20
  USE_ZIP=3D	yes
  USE_DOS2UNIX=3D	Source/LibOpenJPEG/opj_malloc.h
 @@ -16,13 +16,18 @@
  USE_LDCONFIG=3D	yes
  WRKSRC=3D		${WRKDIR}/FreeImage
 =20
 -CFLAGS+=3D -fexceptions -fvisibility=3Dhidden
 +CFLAGS+=3D	-fexceptions -fvisibility=3Dhidden
 =20
  PLIST_FILES=3D	include/FreeImage.h \
 +		include/FreeImagePlus.h \
  		lib/libfreeimage.a \
  		lib/libfreeimage-${PORTVERSION}.so \
  		lib/libfreeimage.so.3 \
 -		lib/libfreeimage.so
 +		lib/libfreeimage.so \
 +		lib/libfreeimageplus.a \
 +		lib/libfreeimageplus-${PORTVERSION}.so \
 +		lib/libfreeimageplus.so.3 \
 +		lib/libfreeimageplus.so
 =20
  .include <bsd.port.pre.mk>
 =20
 @@ -32,6 +37,14 @@
 =20
  post-patch:
  	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}| ; s|-g root|-g wheel|' \
 -		${WRKSRC}/Makefile.gnu
 +		${WRKSRC}/Makefile.gnu ${WRKSRC}/Makefile.fip
 =20
 +post-build:
 +	cd ${WRKSRC} && ${GMAKE} -f Makefile.fip
 +
 +post-install:
 +	cd ${WRKSRC} && ${GMAKE} -f Makefile.fip ${INSTALL_TARGET}
 +	${LN} -s libfreeimageplus-${PORTVERSION} ${PREFIX}/lib/libfreeimageplus.s=
 o.3
 +	${LN} -s libfreeimageplus-${PORTVERSION} ${PREFIX}/lib/libfreeimageplus.so
 +
  .include <bsd.port.post.mk>
 Index: pkg-descr
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- pkg-descr	(revision 317737)
 +++ pkg-descr	(working copy)
 @@ -1,6 +1,7 @@
  FreeImage is an open source library project for developers who would like =
 to
  support popular graphics image formats like PNG, BMP, JPEG, TIFF, and othe=
 rs
  as needed by today's multimedia applications.  FreeImage is easy to use,
 -fast, multithreading safe, and cross-platform.
 +fast, multithreading safe, and cross-platform. This port includes both the
 +original C interface and the C++ wrapper FreeImagePlus.
 =20
  WWW: http://freeimage.sourceforge.net/
 
 --TD8GDToEDw0WLGOL--
 
 --Wb5NtZlyOqqy58h0
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (FreeBSD)
 
 iEYEARECAAYFAlGLvV8ACgkQwMJqmJVx947aVgCg1h9apR8DJxLFu41/jYTCCilU
 W5oAn1zmB4ZorQDe3OrgT1fQepDrI1PJ
 =Z7jy
 -----END PGP SIGNATURE-----
 
 --Wb5NtZlyOqqy58h0--
>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: linimon 
State-Changed-When: Fri May 10 03:47:42 UTC 2013 
State-Changed-Why:  
Misfiled followup to ports/178450; content migrated. 


Responsible-Changed-From-To: gnats-admin->freebsd-ports-bugs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Fri May 10 03:47:42 UTC 2013 
Responsible-Changed-Why:  


http://www.freebsd.org/cgi/query-pr.cgi?pr=178456 
>Unformatted:
