Attachment #160319 for bug #202634

View | Details | Raw Unified | Return to bug 202634
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	cimg
DISTVERSIONPREFIX=	v
DISTVERSION=	1.6.4
PORTEPOCH=	3
CATEGORIES=	graphics devel
MASTER_SITES=	SF/${PORTNAME}		\
		SF/${PORTNAME}/older_versions
DISTNAME=	CImg_${PORTVERSION}
DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}_${TARBALLREVISION}

MAINTAINER=	thierry@FreeBSD.org
COMMENT=	C++ Template Image Processing Library

LICENSE=	CeCILL_C CeCILL
LICENSE_COMB=	dual

ONLY_FOR_ARCHS=	i386 amd64
ONLY_FOR_ARCHS_REASON=	"invokes i386 asm"

USE_GITHUB=	yes
GH_ACCOUNT=	dtschump
GH_PROJECT=	CImg

.if !defined(WITHOUT_LAPACK)
. if defined(WITH_ATLAS)

. endif
.endif

WRKSRC=		${WRKDIR}/${DISTNAME:C/_/-/}
BUILD_WRKSRC=	${WRKSRC}/examples
MAKE_ENV=	X11PATH=${LOCALBASE} LOCALBASE=${LOCALBASE}
CPPFLAGS+=	${CFLAGS}
LDFLAGS+=	-lpthread

OPTIONS_DEFINE=	DOCS EXAMPLES

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MEXAMPLES}
USES+=		gmake
.endif

.if ${PORT_OPTIONS:MDOCS}
USES+=		gmake
REINPLACE_ARGS=	-i ""
LIB_DEPENDS+=	libboard.so:${PORTSDIR}/graphics/libboard



.include <bsd.port.pre.mk>

pre-configure-DOCS-on:
.if ${PORT_OPTIONS:MDOCS}
	${REINPLACE_CMD} -e 's|make|${MAKE_CMD}|' ${BUILD_WRKSRC}/Makefile

pre-configure-DOCS-off:
	${REINPLACE_CMD} -e 's|^OPTFLAGS|#OPTFLAGS|' ${BUILD_WRKSRC}/Makefile

pre-configure:
. if !defined(WITHOUT_FFMPEG)
	${REINPLACE_CMD} -e 's|#CIMG_FFMPEG_CFLAGS|CIMG_FFMPEG_CFLAGS|'	\
		-e 's|#CIMG_FFMPEG_LDFLAGS|CIMG_FFMPEG_LDFLAGS|'	\


do-install:
	${INSTALL_DATA} ${WRKSRC}/CImg.h ${STAGEDIR}${PREFIX}/include

do-install-DOCS-on:
	${INSTALL_PROGRAM} ${PROGS:C|^|${BUILD_WRKSRC}/|} ${STAGEDIR}${PREFIX}/bin
	${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${DOCBASE:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}

do-install-EXAMPLES-on:
	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
	${CP} -R ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
	@(cd ${STAGEDIR}${EXAMPLESDIR} && ${MAKE_CMD} clean)
	@${RM} ${STAGEDIR}${EXAMPLESDIR}/*.orig
.endif

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (cimg-1.6.2_0/CImg_1.6.2.zip) = 5c3f465b431566e82d9aeb0ca5dd18d925d3733861c735f4edf7f4e715748813	1	SHA256 (dtschump-CImg-v1.6.4_GH0.tar.gz) = 57274f9623468da7841eeda2ccf73c7645e728f9fefa8a46d6931c2cc47f0c11
2	SIZE (cimg-1.6.2_0/CImg_1.6.2.zip) = 3255583	2	SIZE (dtschump-CImg-v1.6.4_GH0.tar.gz) = 18656533




--- examples/Makefile.orig	2015-06-18 16:40:35 UTC
+++ examples/Makefile
@@ -85,8 +85,8 @@ CIMG_EXTRA_FILES = use_tiff_stream use_j
 # Set correct variables and paths
 #---------------------------------
 CIMG_VERSION = _cimg_version
-X11PATH      = /usr/X11R6
-CC           = g++
+X11PATH      = $(LOCALBASE)
+CC           = $(CXX)
 EXEPFX       =
 CCVER       = $(CC)

 # Flags to compile on Sun Solaris
 CIMG_SOLARIS_LIBS = -R$(X11PATH)/lib -lrt -lnsl -lsocket
 
@@ -309,7 +312,8 @@ $(CIMG_XSHM_CFLAGS)" \
 $(CIMG_XSHM_CFLAGS)" \
 "CONF_LIBS = \
 $(CIMG_X11_LIBS) \
 $(CIMG_TIFF_LIBS) \
-$(CIMG_XSHM_LIBS)" \
+$(CIMG_XSHM_LIBS) \
+$(PTHREAD_LIBS)" \
 all $(CIMG_EXTRA_FILES)
 
 # Linux/BSD/Mac OSX targets, with X11 display.
@@ -378,8 +382,10 @@ $(CIMG_ZLIB_CFLAGS) \
 $(CIMG_CURL_CFLAGS) \
 $(CIMG_OPENCV_CFLAGS) \

 $(CIMG_X11_LIBS) \
 $(CIMG_XSHM_LIBS) \
 $(CIMG_XRANDR_LIBS) \
@@ -391,6 +397,7 @@ $(CIMG_ZLIB_LIBS) \
 $(CIMG_JPEG_LIBS) \
 $(CIMG_ZLIB_LIBS) \
 $(CIMG_CURL_LIBS) \
+$(CIMG_LAPACK_LIBS) \
 $(CIMG_OPENCV_LIBS) \
 $(CIMG_MAGICK_LIBS) \
+$(CIMG_LAPACK_LIBS) \
 $(CIMG_FFTW3_LIBS)" \
 "STRIP_EXE=true" \
 all $(CIMG_EXTRA_FILES)

Return to bug 202634

Lines 2-17 Link Here

(-)Makefile (-21 / +19 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= cimg	4	PORTNAME= cimg
5	PORTVERSION= 1.6.2	5	DISTVERSIONPREFIX= v
		6	DISTVERSION= 1.6.4
6	PORTEPOCH= 3	7	PORTEPOCH= 3
7	CATEGORIES= graphics devel	8	CATEGORIES= graphics devel
8	MASTER_SITES= SF/${PORTNAME} \
9	SF/${PORTNAME}/older_versions
10	DISTNAME= CImg_${PORTVERSION}
11	DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}_${TARBALLREVISION}
12		9
13	MAINTAINER= thierry@FreeBSD.org	10	MAINTAINER= thierry@FreeBSD.org
14	COMMENT= The C++ Template Image Processing Library	11	COMMENT= C++ Template Image Processing Library
15		12
16	LICENSE= CeCILL_C CeCILL	13	LICENSE= CeCILL_C CeCILL
17	LICENSE_COMB= dual	14	LICENSE_COMB= dual
Lines 25-32 Link Here
25	ONLY_FOR_ARCHS= i386 amd64	22	ONLY_FOR_ARCHS= i386 amd64
26	ONLY_FOR_ARCHS_REASON= "invokes i386 asm"	23	ONLY_FOR_ARCHS_REASON= "invokes i386 asm"
27		24
28	TARBALLREVISION=0	25	USE_GITHUB= yes
29	USES= zip	26	GH_ACCOUNT= dtschump
		27	GH_PROJECT= CImg
30		28
31	.if !defined(WITHOUT_LAPACK)	29	.if !defined(WITHOUT_LAPACK)
32	. if defined(WITH_ATLAS)	30	. if defined(WITH_ATLAS)
Lines 36-53 Link Here
36	. endif	34	. endif
37	.endif	35	.endif
38		36
39	WRKSRC= ${WRKDIR}/${DISTNAME:C/_/-/}
40	BUILD_WRKSRC= ${WRKSRC}/examples	37	BUILD_WRKSRC= ${WRKSRC}/examples
41	MAKE_ENV= X11PATH=${LOCALBASE} LOCALBASE=${LOCALBASE}
42	CPPFLAGS+= ${CFLAGS}
43	LDFLAGS+= -lpthread
44		38
45	OPTIONS_DEFINE= DOCS EXAMPLES	39	OPTIONS_DEFINE= DOCS EXAMPLES
46		40
47	.include <bsd.port.options.mk>	41	.include <bsd.port.options.mk>
48		42
		43	.if ${PORT_OPTIONS:MDOCS} \|\| ${PORT_OPTIONS:MEXAMPLES}
		44	USES+= gmake
		45	.endif
		46
49	.if ${PORT_OPTIONS:MDOCS}	47	.if ${PORT_OPTIONS:MDOCS}
50	USES+= gmake
51	REINPLACE_ARGS= -i ""	48	REINPLACE_ARGS= -i ""
52	LIB_DEPENDS+= libboard.so:${PORTSDIR}/graphics/libboard	49	LIB_DEPENDS+= libboard.so:${PORTSDIR}/graphics/libboard
53		50
Lines 100-111 Link Here
100		97
101	.include <bsd.port.pre.mk>	98	.include <bsd.port.pre.mk>
102		99
103	pre-configure:	100	pre-configure-DOCS-on:
104	.if ${PORT_OPTIONS:MDOCS}
105	${REINPLACE_CMD} -e 's\|make\|${MAKE_CMD}\|' ${BUILD_WRKSRC}/Makefile	101	${REINPLACE_CMD} -e 's\|make\|${MAKE_CMD}\|' ${BUILD_WRKSRC}/Makefile
106	.else	102
		103	pre-configure-DOCS-off:
107	${REINPLACE_CMD} -e 's\|^OPTFLAGS\|#OPTFLAGS\|' ${BUILD_WRKSRC}/Makefile	104	${REINPLACE_CMD} -e 's\|^OPTFLAGS\|#OPTFLAGS\|' ${BUILD_WRKSRC}/Makefile
108	.endif	105
		106	pre-configure:
109	. if !defined(WITHOUT_FFMPEG)	107	. if !defined(WITHOUT_FFMPEG)
110	${REINPLACE_CMD} -e 's\|#CIMG_FFMPEG_CFLAGS\|CIMG_FFMPEG_CFLAGS\|' \	108	${REINPLACE_CMD} -e 's\|#CIMG_FFMPEG_CFLAGS\|CIMG_FFMPEG_CFLAGS\|' \
111	-e 's\|#CIMG_FFMPEG_LDFLAGS\|CIMG_FFMPEG_LDFLAGS\|' \	109	-e 's\|#CIMG_FFMPEG_LDFLAGS\|CIMG_FFMPEG_LDFLAGS\|' \
Lines 126-141 Link Here
126		124
127	do-install:	125	do-install:
128	${INSTALL_DATA} ${WRKSRC}/CImg.h ${STAGEDIR}${PREFIX}/include	126	${INSTALL_DATA} ${WRKSRC}/CImg.h ${STAGEDIR}${PREFIX}/include
129	.if ${PORT_OPTIONS:MDOCS}	127
		128	do-install-DOCS-on:
130	${INSTALL_PROGRAM} ${PROGS:C\|^\|${BUILD_WRKSRC}/\|} ${STAGEDIR}${PREFIX}/bin	129	${INSTALL_PROGRAM} ${PROGS:C\|^\|${BUILD_WRKSRC}/\|} ${STAGEDIR}${PREFIX}/bin
131	${MKDIR} ${STAGEDIR}${DOCSDIR}	130	${MKDIR} ${STAGEDIR}${DOCSDIR}
132	${INSTALL_DATA} ${DOCBASE:S\|^\|${WRKSRC}/\|} ${STAGEDIR}${DOCSDIR}	131	${INSTALL_DATA} ${DOCBASE:S\|^\|${WRKSRC}/\|} ${STAGEDIR}${DOCSDIR}
133	.endif	132
134	.if ${PORT_OPTIONS:MEXAMPLES}	133	do-install-EXAMPLES-on:
135	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}	134	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
136	${CP} -R ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}	135	${CP} -R ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
137	@(cd ${STAGEDIR}${EXAMPLESDIR} && ${MAKE_CMD} clean)	136	@(cd ${STAGEDIR}${EXAMPLESDIR} && ${MAKE_CMD} clean)
138	@${RM} ${STAGEDIR}${EXAMPLESDIR}/*.orig	137	@${RM} ${STAGEDIR}${EXAMPLESDIR}/*.orig
139	.endif
140		138
141	.include <bsd.port.post.mk>	139	.include <bsd.port.post.mk>

Lines 1-12 Link Here

(-)files/patch-examples__Makefile (-11 / +11 lines)
1	--- examples/Makefile.orig 2015-04-15 07:50:13 UTC	1	--- examples/Makefile.orig 2015-06-18 16:40:35 UTC
2	+++ examples/Makefile	2	+++ examples/Makefile
3	@@ -85,8 +85,8 @@ CIMG_EXTRA_FILES = use_tiff_stream use_j	3	@@ -85,8 +85,8 @@ CIMG_EXTRA_FILES = use_tiff_stream use_j
4	# Set correct variables and paths	4	# Set correct variables and paths
5	#---------------------------------	5	#---------------------------------
6	CIMG_VERSION = 1.6.2	6	CIMG_VERSION = _cimg_version
7	-X11PATH = /usr/X11R6	7	-X11PATH = /usr/X11R6
8	-CC = g++	8	-CC = g++
9	+#X11PATH = $(X11PATH)	9	+X11PATH = $(LOCALBASE)
10	+CC = $(CXX)	10	+CC = $(CXX)
11	EXEPFX =	11	EXEPFX =
12	CCVER = $(CC)	12	CCVER = $(CC)
Lines 112-127 Link Here
112	# Flags to compile on Sun Solaris	112	# Flags to compile on Sun Solaris
113	CIMG_SOLARIS_LIBS = -R$(X11PATH)/lib -lrt -lnsl -lsocket	113	CIMG_SOLARIS_LIBS = -R$(X11PATH)/lib -lrt -lnsl -lsocket
114		114
115	@@ -335,7 +338,8 @@ $(CIMG_X11_CFLAGS) \	115	@@ -309,7 +312,8 @@ $(CIMG_XSHM_CFLAGS)" \
116	$(CIMG_XSHM_CFLAGS)" \
117	"CONF_LIBS = \	116	"CONF_LIBS = \
118	$(CIMG_X11_LIBS) \	117	$(CIMG_X11_LIBS) \
		118	$(CIMG_TIFF_LIBS) \
119	-$(CIMG_XSHM_LIBS)" \	119	-$(CIMG_XSHM_LIBS)" \
120	+$(CIMG_XSHM_LIBS) \	120	+$(CIMG_XSHM_LIBS) \
121	+$(PTHREAD_LIBS)" \	121	+$(PTHREAD_LIBS)" \
122	all	122	all $(CIMG_EXTRA_FILES)
123		123
124	olinux:	124	# Linux/BSD/Mac OSX targets, with X11 display.
125	@@ -378,8 +382,10 @@ $(CIMG_ZLIB_CFLAGS) \	125	@@ -378,8 +382,10 @@ $(CIMG_ZLIB_CFLAGS) \
126	$(CIMG_CURL_CFLAGS) \	126	$(CIMG_CURL_CFLAGS) \
127	$(CIMG_OPENCV_CFLAGS) \	127	$(CIMG_OPENCV_CFLAGS) \
Lines 133-143 Link Here
133	$(CIMG_X11_LIBS) \	133	$(CIMG_X11_LIBS) \
134	$(CIMG_XSHM_LIBS) \	134	$(CIMG_XSHM_LIBS) \
135	$(CIMG_XRANDR_LIBS) \	135	$(CIMG_XRANDR_LIBS) \
136	@@ -389,6 +395,7 @@ $(CIMG_PNG_LIBS) \	136	@@ -391,6 +397,7 @@ $(CIMG_ZLIB_LIBS) \
137	$(CIMG_JPEG_LIBS) \
138	$(CIMG_ZLIB_LIBS) \
139	$(CIMG_CURL_LIBS) \	137	$(CIMG_CURL_LIBS) \
140	+$(CIMG_LAPACK_LIBS) \
141	$(CIMG_OPENCV_LIBS) \	138	$(CIMG_OPENCV_LIBS) \
142	$(CIMG_MAGICK_LIBS) \	139	$(CIMG_MAGICK_LIBS) \
		140	+$(CIMG_LAPACK_LIBS) \
143	$(CIMG_FFTW3_LIBS)" \	141	$(CIMG_FFTW3_LIBS)" \
		142	"STRIP_EXE=true" \
		143	all $(CIMG_EXTRA_FILES)