Upgrade graphics/cimg to 1.6.4, as it moved to GitHub. It also uses the newer

options helpers and fixes the EXAMPLES do-install case.

PR:		ports/202634
Submitted by:	Naram Qashat

3 files changed, 32 insertions, 34 deletions

diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index e539d523166d..ba18b38cbafc 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -2,16 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	cimg
-PORTVERSION=	1.6.2
+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=	The C++ Template Image Processing Library
+COMMENT=	C++ Template Image Processing Library
 
 LICENSE=	CeCILL_C CeCILL
 LICENSE_COMB=	dual
@@ -25,8 +22,9 @@ LICENSE_PERMS_CeCILL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	"invokes i386 asm"
 
-TARBALLREVISION=0
-USES=		zip
+USE_GITHUB=	yes
+GH_ACCOUNT=	dtschump
+GH_PROJECT=	CImg
 
 .if !defined(WITHOUT_LAPACK)
 . if defined(WITH_ATLAS)
@@ -36,18 +34,17 @@ USES+=		blaslapack
 . 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}
+.if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MEXAMPLES}
 USES+=		gmake
+.endif
+
+.if ${PORT_OPTIONS:MDOCS}
 REINPLACE_ARGS=	-i ""
 LIB_DEPENDS+=	libboard.so:${PORTSDIR}/graphics/libboard
 
@@ -100,12 +97,13 @@ NO_BUILD=	yes
 
 .include <bsd.port.pre.mk>
 
-pre-configure:
-.if ${PORT_OPTIONS:MDOCS}
+pre-configure-DOCS-on:
 	${REINPLACE_CMD} -e 's|make|${MAKE_CMD}|' ${BUILD_WRKSRC}/Makefile
-.else
+
+pre-configure-DOCS-off:
 	${REINPLACE_CMD} -e 's|^OPTFLAGS|#OPTFLAGS|' ${BUILD_WRKSRC}/Makefile
-.endif
+
+pre-configure:
 . if !defined(WITHOUT_FFMPEG)
 	${REINPLACE_CMD} -e 's|#CIMG_FFMPEG_CFLAGS|CIMG_FFMPEG_CFLAGS|'	\
 		-e 's|#CIMG_FFMPEG_LDFLAGS|CIMG_FFMPEG_LDFLAGS|'	\
@@ -126,16 +124,16 @@ pre-configure:
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/CImg.h ${STAGEDIR}${PREFIX}/include
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	${INSTALL_PROGRAM} ${PROGS:C|^|${BUILD_WRKSRC}/|} ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCBASE:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+
+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>
diff --git a/graphics/cimg/distinfo b/graphics/cimg/distinfo
index 4d697ff9fcc4..85dcfcfebb74 100644
--- a/graphics/cimg/distinfo
+++ b/graphics/cimg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cimg-1.6.2_0/CImg_1.6.2.zip) = 5c3f465b431566e82d9aeb0ca5dd18d925d3733861c735f4edf7f4e715748813
-SIZE (cimg-1.6.2_0/CImg_1.6.2.zip) = 3255583
+SHA256 (dtschump-CImg-v1.6.4_GH0.tar.gz) = 57274f9623468da7841eeda2ccf73c7645e728f9fefa8a46d6931c2cc47f0c11
+SIZE (dtschump-CImg-v1.6.4_GH0.tar.gz) = 18656533
diff --git a/graphics/cimg/files/patch-examples__Makefile b/graphics/cimg/files/patch-examples__Makefile
index d5a7c020aba5..084a20b6f28e 100644
--- a/graphics/cimg/files/patch-examples__Makefile
+++ b/graphics/cimg/files/patch-examples__Makefile
@@ -1,12 +1,12 @@
---- examples/Makefile.orig	2015-04-15 07:50:13 UTC
+--- 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 = 1.6.2
+ CIMG_VERSION = _cimg_version
 -X11PATH      = /usr/X11R6
 -CC           = g++
-+#X11PATH      = $(X11PATH)
++X11PATH      = $(LOCALBASE)
 +CC           = $(CXX)
  EXEPFX       =
  CCVER       = $(CC)
@@ -112,16 +112,16 @@
  # Flags to compile on Sun Solaris
  CIMG_SOLARIS_LIBS = -R$(X11PATH)/lib -lrt -lnsl -lsocket
  
-@@ -335,7 +338,8 @@ $(CIMG_X11_CFLAGS) \
- $(CIMG_XSHM_CFLAGS)" \
+@@ -309,7 +312,8 @@ $(CIMG_XSHM_CFLAGS)" \
  "CONF_LIBS = \
  $(CIMG_X11_LIBS) \
+ $(CIMG_TIFF_LIBS) \
 -$(CIMG_XSHM_LIBS)" \
 +$(CIMG_XSHM_LIBS) \
 +$(PTHREAD_LIBS)" \
- all
+ all $(CIMG_EXTRA_FILES)
  
- olinux:
+ # Linux/BSD/Mac OSX targets, with X11 display.
 @@ -378,8 +382,10 @@ $(CIMG_ZLIB_CFLAGS) \
  $(CIMG_CURL_CFLAGS) \
  $(CIMG_OPENCV_CFLAGS) \
@@ -133,11 +133,11 @@
  $(CIMG_X11_LIBS) \
  $(CIMG_XSHM_LIBS) \
  $(CIMG_XRANDR_LIBS) \
-@@ -389,6 +395,7 @@ $(CIMG_PNG_LIBS) \
- $(CIMG_JPEG_LIBS) \
- $(CIMG_ZLIB_LIBS) \
+@@ -391,6 +397,7 @@ $(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)