Page MenuHomeFreeBSD

D29311.diff
No OneTemporary

D29311.diff

Index: head/graphics/freeimage/Makefile
===================================================================
--- head/graphics/freeimage/Makefile
+++ head/graphics/freeimage/Makefile
@@ -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_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 @@
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 @@
${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>
Index: head/graphics/freeimage/files/freeimage.pc.in
===================================================================
--- head/graphics/freeimage/files/freeimage.pc.in
+++ head/graphics/freeimage/files/freeimage.pc.in
@@ -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}

File Metadata

Mime Type
text/plain
Expires
Tue, Jul 7, 2:12 AM (14 h, 23 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34703716
Default Alt Text
D29311.diff (2 KB)

Event Timeline