From owner-svn-ports-head@FreeBSD.ORG Mon Jul 16 20:28:34 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AFE2C106566C; Mon, 16 Jul 2012 20:28:34 +0000 (UTC) (envelope-from ak@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9103B8FC16; Mon, 16 Jul 2012 20:28:34 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6GKSY9u079728; Mon, 16 Jul 2012 20:28:34 GMT (envelope-from ak@svn.freebsd.org) Received: (from ak@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6GKSYTx079725; Mon, 16 Jul 2012 20:28:34 GMT (envelope-from ak@svn.freebsd.org) Message-Id: <201207162028.q6GKSYTx079725@svn.freebsd.org> From: Alex Kozlov Date: Mon, 16 Jul 2012 20:28:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r300981 - head/print/fontforge/files X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jul 2012 20:28:34 -0000 Author: ak Date: Mon Jul 16 20:28:34 2012 New Revision: 300981 URL: http://svn.freebsd.org/changeset/ports/300981 Log: - Fix build on FreeBSD9/CURRENT with WITH_ICONV set in src.conf [1] - Pet portlint by renaming patch with unrecommended characters (:) in filename PR: ports/169869 [1] Submitted by: Jan Beich Approved by: Naram Qashat (maintainer) Added: - copied unchanged from r300972, head/print/fontforge/files/patch-fontforge::Makefile.dynamic.in head/print/fontforge/files/patch-fontforge_splineutil2.c (contents, props changed) Directory Properties: head/print/fontforge/files/patch-fontforge_Makefile.dynamic.in (props changed) Deleted: head/print/fontforge/files/patch-fontforge::Makefile.dynamic.in Copied: head/print/fontforge/files/patch-fontforge_Makefile.dynamic.in (from r300972, head/print/fontforge/files/patch-fontforge::Makefile.dynamic.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/fontforge/files/patch-fontforge_Makefile.dynamic.in Mon Jul 16 20:28:34 2012 (r300981, copy of r300972, head/print/fontforge/files/patch-fontforge::Makefile.dynamic.in) @@ -0,0 +1,24 @@ +--- fontforge/Makefile.dynamic.in.orig 2008-12-23 16:03:34.000000000 -0500 ++++ fontforge/Makefile.dynamic.in 2008-12-25 11:20:01.000000000 -0500 +@@ -59,7 +59,7 @@ + DIFFOBJS = sfddiff.o stamp.o + ACORNOBJS = acorn2sfd.o stamp.o + +-_CFLAGS = -I$(top_srcdir)/inc -I../inc -I$(srcdir) -I. @WFLAGS@ $(X_CFLAGS) \ ++_CFLAGS = -I$(LOCALBASE)/include -I$(top_srcdir)/inc -I../inc -I$(srcdir) -I. @WFLAGS@ $(X_CFLAGS) \ + @DEFS@ '-DSHAREDIR="$(sharedir)"' -DLIBDIR='"$(libdir)"' \ + @CPPFLAGS@ '-DPREFIX="@prefix@"' + CFLAGS = @CFLAGS@ @CPPFLAGS@ $(_CFLAGS) +@@ -68,10 +68,10 @@ + LDFLAGS = @LDFLAGS@ + LIBS = -rpath $(libdir) $(X_LIBS) @LINK_WITH_GDRAW@ ../libgutils.la \ + ../libgunicode.la \ +- $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -lm ++ $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -lm -lintl + LIBLIBS = -rpath $(libdir) ../libgutils.la ../libgunicode.la \ + @LIBS@ $(STATIC_LIBS) -lm +-DLIBS = -rpath $(libdir) ../libfontforge.la ../libgutils.la ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm ++DLIBS = -rpath $(libdir) ../libfontforge.la ../libgutils.la ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm -lintl + + all: @FINAL_TARGET@ @MACAPP@ sfddiff fontimage fontlint + Added: head/print/fontforge/files/patch-fontforge_splineutil2.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/fontforge/files/patch-fontforge_splineutil2.c Mon Jul 16 20:28:34 2012 (r300981) @@ -0,0 +1,11 @@ +Index: fontforge/splineutil2.c +@@ -4813,7 +4813,8 @@ SplineSet *SplineSetReverse(SplineSet *s + Spline *spline, *first, *next; + BasePoint tp; + SplinePoint *temp; +- int bool; ++ int b; ++#define bool b + int i; + /* reverse the splineset so that what was the start point becomes the end */ + /* and vice versa. This entails reversing every individual spline, and */