Attachment 223353 Details for Bug 254340 – refreshed patch to install pkgconf file

[patch] refreshed patch to install pkgconf file

freeimage.diff (text/plain), 3.41 KB, created by Nuno Teixeira on 2021-03-17 08:23:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nuno Teixeira

Created: 2021-03-17 08:23:02 UTC

Size: 3.41 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 568548)
>+++ Makefile	(working copy)
>@@ -1,66 +1,76 @@
> # Created by: Choe, Cheng-Dae <whitekid@gmail.com>
> # $FreeBSD$
> 
> 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
> LICENSE_COMB=		multi
> LICENSE_NAME_FIPL=	FreeImage Public License
> LICENSE_FILE_FIPL=	${WRKSRC}/license-fi.txt
> LICENSE_FILE_GPLv2=	${WRKSRC}/license-gplv2.txt
> LICENSE_FILE_GPLv3=	${WRKSRC}/license-gplv3.txt
> LICENSE_PERMS_FIPL=	dist-mirror pkg-mirror auto-accept
> 
> BROKEN_mips=		fails to compile: section referenced in discarded section
> 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=	prefix="${PREFIX}" \
>+		name="${PORTNAME}" \
>+		description="${COMMENT}" \
>+		version="${PORTVERSION}"
>+
>+WRKSRC=		${WRKDIR}/FreeImage
>+
> PLIST_FILES=	include/FreeImage.h \
> 		include/FreeImagePlus.h \
> 		lib/libfreeimage.a \
> 		lib/libfreeimage-${PORTVERSION}.so \
> 		lib/libfreeimage.so.3 \
> 		lib/libfreeimage.so \
> 		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
> 
> post-build:
> 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -f Makefile.fip ${_MAKE_JOBS} \
> 		${MAKE_ARGS} -C ${BUILD_WRKSRC}
> 
> post-install:
> 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -f Makefile.fip ${MAKE_ARGS} \
> 		-C ${INSTALL_WRKSRC} ${INSTALL_TARGET}
> 	${LN} -sf libfreeimageplus.so.3 \
> 		${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: files/freeimage.pc.in
>===================================================================
>--- files/freeimage.pc.in	(nonexistent)
>+++ files/freeimage.pc.in	(working copy)
>@@ -0,0 +1,10 @@
>+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}
>
>Property changes on: files/freeimage.pc.in
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 254340: 223328 | 223329 | 223353