Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 30 Mar 2021 06:27:22 +0000 (UTC)
From:      Nuno Teixeira <eduardo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r569542 - in head/graphics/freeimage: . files
Message-ID:  <202103300627.12U6RMm8031900@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: eduardo
Date: Tue Mar 30 06:27:21 2021
New Revision: 569542
URL: https://svnweb.freebsd.org/changeset/ports/569542

Log:
  graphics/freeimage: Add pkgconf support
  
  While here:
    - Take MAINTAINER'ship
    - reorder Makefile (portclippy)
  
  PR:		254340
  Submitted by:	Freddy DISSAUX <dsx@bsdsx.fr>
  Approved by:	dbaio (mentor)
  Differential Revision:	https://reviews.freebsd.org/D29311

Added:
  head/graphics/freeimage/files/freeimage.pc.in   (contents, props changed)
Modified:
  head/graphics/freeimage/Makefile

Modified: head/graphics/freeimage/Makefile
==============================================================================
--- head/graphics/freeimage/Makefile	Tue Mar 30 06:10:50 2021	(r569541)
+++ head/graphics/freeimage/Makefile	Tue Mar 30 06:27:21 2021	(r569542)
@@ -3,12 +3,12 @@
 
 PORTNAME=	freeimage
 PORTVERSION=	3.18.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/Source%20Distribution/${PORTVERSION}
 DISTNAME=	FreeImage${PORTVERSION:S/.//g}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Simple C/C++ bitmap graphics library
 
 LICENSE=		FIPL GPLv2 GPLv3
@@ -23,19 +23,25 @@ BROKEN_mips=		fails to compile: section referenced in 
 BROKEN_mips64=		fails to compile: opcode not supported on this processor: mips3 (mips3) 'madd $4,$5'
 
 USES=		dos2unix gmake zip
-USE_LDCONFIG=	yes
 DOS2UNIX_FILES=	Source/LibOpenJPEG/opj_malloc.h \
 		Source/LibRawLite/dcraw/dcraw.c \
 		Source/LibRawLite/internal/dcraw_common.cpp \
 		Source/FreeImage/PluginBMP.cpp \
 		Source/FreeImage/PluginDDS.cpp \
 		Source/LibPNG/pngpriv.h
+USE_LDCONFIG=	yes
 
-WRKSRC=		${WRKDIR}/FreeImage
 MAKE_ARGS=	CC="${CC}" CPP="${CPP}" CXX="${CXX}"
 CFLAGS+=	-DPNG_ARM_NEON_OPT=0 -fexceptions -fvisibility=hidden -fPIC
 CXXFLAGS+=	-DPNG_ARM_NEON_OPT=0 -fexceptions -fvisibility=hidden -fPIC
 
+SUB_FILES=	freeimage.pc
+SUB_LIST=	name="${PORTNAME}" \
+		description="${COMMENT}" \
+		version="${PORTVERSION}"
+
+WRKSRC=		${WRKDIR}/FreeImage
+
 PLIST_FILES=	include/FreeImage.h \
 		include/FreeImagePlus.h \
 		lib/libfreeimage.a \
@@ -45,8 +51,11 @@ PLIST_FILES=	include/FreeImage.h \
 		lib/libfreeimageplus.a \
 		lib/libfreeimageplus-${PORTVERSION}.so \
 		lib/libfreeimageplus.so.3 \
-		lib/libfreeimageplus.so
+		lib/libfreeimageplus.so \
+		libdata/pkgconfig/freeimage.pc
 
+PKGCONFIGDIR?=	${PREFIX}/libdata/pkgconfig
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}| ; s|-o root -g root || ; \
 		/^-fPIC/d' ${WRKSRC}/Makefile.gnu ${WRKSRC}/Makefile.fip
@@ -62,5 +71,6 @@ post-install:
 		${STAGEDIR}${PREFIX}/lib/libfreeimageplus.so
 	${LN} -sf libfreeimageplus-${PORTVERSION}.so \
 		${STAGEDIR}${PREFIX}/lib/libfreeimageplus.so.3
+	${INSTALL_DATA} ${WRKDIR}/freeimage.pc ${STAGEDIR}${PKGCONFIGDIR}/
 
 .include <bsd.port.mk>

Added: head/graphics/freeimage/files/freeimage.pc.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/freeimage/files/freeimage.pc.in	Tue Mar 30 06:27:21 2021	(r569542)
@@ -0,0 +1,11 @@
+$FreeBSD$
+prefix=%%PREFIX%%
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: %%name%%
+Description: %%description%%
+Version: %%version%%
+Libs: -L${libdir} -lfreeimage
+Cflags: -I${includedir}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103300627.12U6RMm8031900>