CVS commit: pkgsrc/fonts/fontforge

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Sep  4 21:13:22 UTC 2017

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

Log Message:
Fix building ObjC code again.


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 pkgsrc/fonts/fontforge/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    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.67 pkgsrc/fonts/fontforge/distinfo:1.68
--- pkgsrc/fonts/fontforge/distinfo:1.67        Fri Aug 25 09:20:38 2017
+++ pkgsrc/fonts/fontforge/distinfo     Mon Sep  4 21:13:22 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.67 2017/08/25 09:20:38 adam Exp $
+$NetBSD: distinfo,v 1.68 2017/09/04 21:13:22 jperkin Exp $
 
 SHA1 (fontforge-dist-20170731.tar.xz) = 89ab434e523dbea8fd9f81907dda33f023055b05
 RMD160 (fontforge-dist-20170731.tar.xz) = af473f403999937dd95715bdfd98f582d05c94cd
@@ -7,5 +7,5 @@ Size (fontforge-dist-20170731.tar.xz) = 
 SHA1 (patch-Makefile.in) = 5a7cad2f9516540048008a13a257d6c9720a22c9
 SHA1 (patch-configure) = 23c953855960f65c539d9ccd15df14fb6a9a2428
 SHA1 (patch-fontforge_splinefont.h) = eda077c87d3bba57a6b6fe0f62d83956e6e13bc1
-SHA1 (patch-fontforgeexe_Makefile.in) = cfacd2b76e98593e8d0867eddd9f84ee1bd24f26
+SHA1 (patch-fontforgeexe_Makefile.in) = 725a0a033132bf859917e8f28c5d0cbbad3eea0e
 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.3 pkgsrc/fonts/fontforge/patches/patch-fontforgeexe_Makefile.in:1.4
--- pkgsrc/fonts/fontforge/patches/patch-fontforgeexe_Makefile.in:1.3   Fri Aug 25 09:20:38 2017
+++ pkgsrc/fonts/fontforge/patches/patch-fontforgeexe_Makefile.in       Mon Sep  4 21:13:22 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-fontforgeexe_Makefile.in,v 1.3 2017/08/25 09:20:38 adam Exp $
+$NetBSD: patch-fontforgeexe_Makefile.in,v 1.4 2017/09/04 21:13:22 jperkin Exp $
 
 Fix linking Objective-C code.
 
@@ -13,3 +13,12 @@ Fix linking Objective-C code.
        $(libfontforgeexe_la_OBJCFLAGS) $(OBJCFLAGS) \
        $(libfontforgeexe_la_LDFLAGS) $(LDFLAGS) -o $@
  PROGRAMS = $(bin_PROGRAMS)
+@@ -2501,7 +2501,7 @@ fontforge-main.obj: main.c
+ @am__fastdepOBJC_FALSE@       $(AM_V_OBJC@am__nodep@)$(LTOBJCCOMPILE) -c -o $@ $<
+ 
+ libfontforgeexe_la-macobjective.lo: macobjective.m
+-@am__fastdepOBJC_TRUE@        $(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) -MT libfontforgeexe_la-macobjective.lo -MD -MP -MF $(DEPDIR)/libfontforgeexe_la-macobjective.Tpo -c -o libfontforgeexe_la-macobjective.lo 
`test -f 'macobjective.m' || echo '$(srcdir)/'`macobjective.m
++@am__fastdepOBJC_TRUE@        $(AM_V_OBJC)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile --tag=CC $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(libfontforgeexe_la_CPPFLAGS) $(CPPFLAGS) $(libfontforgeexe_la_OBJCFLAGS) $(OBJCFLAGS) -MT libfontforgeexe_la-macobjective.lo -MD -MP -MF $(DEPDIR)/libfontforgeexe_la-macobjective.Tpo -c -o 
libfontforgeexe_la-macobjective.lo `test -f 'macobjective.m' || echo '$(srcdir)/'`macobjective.m
+ @am__fastdepOBJC_TRUE@        $(AM_V_at)$(am__mv) $(DEPDIR)/libfontforgeexe_la-macobjective.Tpo $(DEPDIR)/libfontforgeexe_la-macobjective.Plo
+ @AMDEP_TRUE@@am__fastdepOBJC_FALSE@   $(AM_V_OBJC)source='macobjective.m' object='libfontforgeexe_la-macobjective.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepOBJC_FALSE@   DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@