Fix paths harder. Also populate more depends from verifypc output.

PKGREVISION -> 4 since it might have built previously on some platforms.

3 files changed, 42 insertions, 5 deletions

diff --git a/graphics/gmic/Makefile b/graphics/gmic/Makefile
index c450d5a08b0..01aeaf696f2 100644
--- a/graphics/gmic/Makefile
+++ b/graphics/gmic/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2016/08/03 10:22:52 adam Exp $
+# $NetBSD: Makefile,v 1.5 2016/09/18 06:57:24 dholland Exp $
 
 DISTNAME=	gmic_1.5.9.3
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gmic/}
 
@@ -16,11 +16,19 @@ BUILD_DIRS=	src
 USE_LANGUAGES=	c++
 USE_TOOLS+=	gmake gunzip pkg-config
 CFLAGS+=	-I${BUILDLINK_PREFIX.openexr}/include/OpenEXR
+MAKE_ENV+=	BUILDLINK_PREFIX.fftw3=${BUILDLINK_PREFIX.fftw3}
 
 post-install:
 	cd ${DESTDIR}${PREFIX}/${PKGMANDIR}/fr/man1 && gunzip gmic.1.gz
 	cd ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 && gunzip gmic.1.gz
 
+.include "../../devel/atk/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
@@ -28,5 +36,6 @@ post-install:
 .include "../../graphics/gimp/buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXfixes/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gmic/distinfo b/graphics/gmic/distinfo
index 44cc572678d..ad9e8175b23 100644
--- a/graphics/gmic/distinfo
+++ b/graphics/gmic/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 21:34:01 agc Exp $
+$NetBSD: distinfo,v 1.4 2016/09/18 06:57:24 dholland Exp $
 
 SHA1 (gmic_1.5.9.3.tar.gz) = c795fd628a4e416538dd5521581307326d1785df
 RMD160 (gmic_1.5.9.3.tar.gz) = 19f7edd3200ec1fb199d1584b2999d6137a1273f
 SHA512 (gmic_1.5.9.3.tar.gz) = e8f9128ae819d07dbd87f0b13fd7b96926efad02ee8cf4371247912a47332d199aa1572fd06f62423af394f7921c4d772d8c79253f74e06a48721a4ad387829c
 Size (gmic_1.5.9.3.tar.gz) = 2791352 bytes
-SHA1 (patch-src_Makefile) = c84a9719023dfdaac512ee85acd104d633e103d8
+SHA1 (patch-src_Makefile) = 8d6518d6517a1601419067546be46e0d9156f40b
diff --git a/graphics/gmic/patches/patch-src_Makefile b/graphics/gmic/patches/patch-src_Makefile
index 9b546cfde29..e13c1ab8b9d 100644
--- a/graphics/gmic/patches/patch-src_Makefile
+++ b/graphics/gmic/patches/patch-src_Makefile
@@ -1,8 +1,9 @@
-$NetBSD: patch-src_Makefile,v 1.2 2014/08/19 13:34:00 joerg Exp $
+$NetBSD: patch-src_Makefile,v 1.3 2016/09/18 06:57:24 dholland Exp $
 
 Add NetBSD.
 Adapt installation paths.
 Add compiler rpath flag.
+Use X11BASE instead of hardcoding /usr/X11R6.
 
 --- src/Makefile.orig	2014-06-20 13:02:38.000000000 +0000
 +++ src/Makefile
@@ -43,6 +44,33 @@ Add compiler rpath flag.
  endif
  ifeq ($(CC),clang++)
  OPT_CFLAGS = -O2
+@@ -124,14 +127,14 @@ OPENMP_CFLAGS = -fopenmp -Dcimg_use_open
+ # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
+ # This requires the presence of the X11 include and library files.
+ # (package 'libx11-dev' on Debian).
+-X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr
+-X11_LDFLAGS = -L/usr/X11R6/lib -lX11 -lpthread #-lXrandr
++X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I$(X11BASE)/include #-Dcimg_use_xrandr
++X11_LDFLAGS = -L$(X11BASE)/lib ${COMPILER_RPATH_FLAG}$(X11BASE)/lib -lX11 -lpthread #-lXrandr
+ 
+ # Flags to enable fast display, using XShm.
+ # This requires the presence of the X11 extension include and library files.
+ # (package 'libx11-dev' on Debian).
+ XSHM_CFLAGS = -Dcimg_use_xshm
+-XSHM_LDFLAGS = -L$(USR)/X11R6/lib -lXext
++XSHM_LDFLAGS = -L$(X11BASE)/lib -lXext
+ 
+ # Flags to enable image display, using GDI32.
+ # This requires the presence of the GDI32 include and library files.
+@@ -327,7 +330,7 @@ linux:
+ 	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic
+ 
+ solaris:
+-	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic
++	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS) -R$(X11BASE)/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic
+ 
+ macosx:
+ 	$(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_MACOSX_LDFLAGS) $(OPT_LDFLAGS)" gmic
 @@ -422,11 +425,11 @@ ifneq ($(OS),Darwin)
  	ln -s libgmic.so.1.5.9 $(DESTDIR)$(USR)/lib/libgmic.so.1
  	ln -s libgmic.so.1 $(DESTDIR)$(USR)/lib/libgmic.so