CVS commit: pkgsrc/fonts/fontforge

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Aug 24 10:45:00 UTC 2017

Modified Files:
        pkgsrc/fonts/fontforge: distinfo
        pkgsrc/fonts/fontforge/patches: patch-fontforgeexe_Makefile.in

Log Message:
More fixes for building ObjC code.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 pkgsrc/fonts/fontforge/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/fonts/fontforge/patches/patch-fontforgeexe_Makefile.in

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

Modified files:

Index: pkgsrc/fonts/fontforge/distinfo
diff -u pkgsrc/fonts/fontforge/distinfo:1.65 pkgsrc/fonts/fontforge/distinfo:1.66
--- pkgsrc/fonts/fontforge/distinfo:1.65        Thu May  4 19:23:18 2017
+++ pkgsrc/fonts/fontforge/distinfo     Thu Aug 24 10:45:00 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.65 2017/05/04 19:23:18 adam Exp $
+$NetBSD: distinfo,v 1.66 2017/08/24 10:45:00 jperkin Exp $
 
 SHA1 (fontforge-dist-20161004.tar.gz) = bafb76ccbfcb37f94cf71f32c79cc120d8102683
 RMD160 (fontforge-dist-20161004.tar.gz) = fc3e3823bb06835b280109bd7928a3e092aec70d
@@ -7,5 +7,5 @@ Size (fontforge-dist-20161004.tar.gz) = 
 SHA1 (patch-Makefile.in) = 5a7cad2f9516540048008a13a257d6c9720a22c9
 SHA1 (patch-configure) = d85d82bed7ee84c5b8282afd1310872eca39a3dd
 SHA1 (patch-fontforge_splinefont.h) = eda077c87d3bba57a6b6fe0f62d83956e6e13bc1
-SHA1 (patch-fontforgeexe_Makefile.in) = d44e00cd4aaa816ab0916a0bcd33f7b7a2bf8785
+SHA1 (patch-fontforgeexe_Makefile.in) = de7b58d1c84508f9aa843ea06d23a87b0502b344
 SHA1 (patch-po_Makefile.in) = 75990b7371e5ce525deba693c651dbd5222e558b

Index: pkgsrc/fonts/fontforge/patches/patch-fontforgeexe_Makefile.in
diff -u pkgsrc/fonts/fontforge/patches/patch-fontforgeexe_Makefile.in:1.1 pkgsrc/fonts/fontforge/patches/patch-fontforgeexe_Makefile.in:1.2
--- pkgsrc/fonts/fontforge/patches/patch-fontforgeexe_Makefile.in:1.1   Thu May  4 19:23:18 2017
+++ pkgsrc/fonts/fontforge/patches/patch-fontforgeexe_Makefile.in       Thu Aug 24 10:45:00 2017
@@ -1,8 +1,8 @@
-$NetBSD: patch-fontforgeexe_Makefile.in,v 1.1 2017/05/04 19:23:18 adam Exp $
+$NetBSD: patch-fontforgeexe_Makefile.in,v 1.2 2017/08/24 10:45:00 jperkin Exp $
 
 Fix linking Objective-C code.
 
---- fontforgeexe/Makefile.in.orig      2017-05-04 17:59:40.000000000 +0000
+--- fontforgeexe/Makefile.in.orig      2016-10-04 12:30:31.000000000 +0000
 +++ fontforgeexe/Makefile.in
 @@ -380,7 +380,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
  am__v_lt_0 = --silent
@@ -13,3 +13,12 @@ Fix linking Objective-C code.
        $(libfontforgeexe_la_OBJCFLAGS) $(OBJCFLAGS) \
        $(libfontforgeexe_la_LDFLAGS) $(LDFLAGS) -o $@
  PROGRAMS = $(bin_PROGRAMS)
+@@ -2039,7 +2039,7 @@ fontforge-main.obj: main.c
+       $(AM_V_OBJC)$(LTOBJCCOMPILE) -c -o $@ $<
+ 
+ libfontforgeexe_la-macobjective.lo: macobjective.m
+-      $(AM_V_OBJC)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfontforgeexe_la_CPPFLAGS) $(CPPFLAGS) 
$(libfontforgeexe_la_OBJCFLAGS) $(OBJCFLAGS) -c -o libfontforgeexe_la-macobjective.lo `test -f 'macobjective.m' || echo '$(srcdir)/'`macobjective.m
++      $(AM_V_OBJC)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --tag=CC --mode=compile $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfontforgeexe_la_CPPFLAGS) $(CPPFLAGS) 
$(libfontforgeexe_la_OBJCFLAGS) $(OBJCFLAGS) -c -o libfontforgeexe_la-macobjective.lo `test -f 'macobjective.m' || echo '$(srcdir)/'`macobjective.m
+ 
+ mostlyclean-libtool:
+       -rm -f *.lo