CVS commit: pkgsrc/graphics/gmic

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sat Feb 18 23:17:17 UTC 2017

Modified Files:
        pkgsrc/graphics/gmic: distinfo
        pkgsrc/graphics/gmic/patches: patch-src_Makefile

Log Message:
Link consistently.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/gmic/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/gmic/patches/patch-src_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/gmic/distinfo
diff -u pkgsrc/graphics/gmic/distinfo:1.5 pkgsrc/graphics/gmic/distinfo:1.6
--- pkgsrc/graphics/gmic/distinfo:1.5   Tue Feb 14 21:29:01 2017
+++ pkgsrc/graphics/gmic/distinfo       Sat Feb 18 23:17:16 2017
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2017/02/14 21:29:01 joerg Exp $
+$NetBSD: distinfo,v 1.6 2017/02/18 23:17:16 joerg 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) = 8d6518d6517a1601419067546be46e0d9156f40b
+SHA1 (patch-src_Makefile) = af1edfb239de57960f10df4974c5e9a7b2820344
 SHA1 (patch-src_gmic.h) = face3d3cc938c172090c51331a47d97488baac74

Index: pkgsrc/graphics/gmic/patches/patch-src_Makefile
diff -u pkgsrc/graphics/gmic/patches/patch-src_Makefile:1.3 pkgsrc/graphics/gmic/patches/patch-src_Makefile:1.4
--- pkgsrc/graphics/gmic/patches/patch-src_Makefile:1.3 Sun Sep 18 06:57:24 2016
+++ pkgsrc/graphics/gmic/patches/patch-src_Makefile     Sat Feb 18 23:17:17 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_Makefile,v 1.3 2016/09/18 06:57:24 dholland Exp $
+$NetBSD: patch-src_Makefile,v 1.4 2017/02/18 23:17:17 joerg Exp $
 
 Add NetBSD.
 Adapt installation paths.
@@ -71,6 +71,15 @@ Use X11BASE instead of hardcoding /usr/X
  
  macosx:
        $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_MACOSX_LDFLAGS) $(OPT_LDFLAGS)" gmic
+@@ -357,7 +360,7 @@ gmic_lib: gmic_lib.o
+       ar rcs libgmic.a gmic_lib.o
+ ifneq ($(OS),Darwin)
+       $(CC) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so gmic_lib.o $(LDFLAGS)
+-      $(CC) -o gmic_use_lib gmic_use_lib.cpp -L. -lgmic $(OPENMP_CFLAGS) $(FFTW_LDFLAGS)
++      $(CC) -o gmic_use_lib gmic_use_lib.cpp -L. -lgmic $(LDFLAGS) $(OPENMP_CFLAGS)
+ else
+       $(CC) -shared -o libgmic.so gmic_lib.o $(LDFLAGS)
+ endif
 @@ -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