From owner-svn-ports-all@FreeBSD.ORG Mon Feb 23 15:35:32 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DDC1F854; Mon, 23 Feb 2015 15:35:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BE672313; Mon, 23 Feb 2015 15:35:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1NFZWTw083632; Mon, 23 Feb 2015 15:35:32 GMT (envelope-from nivit@FreeBSD.org) Received: (from nivit@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1NFZViN083626; Mon, 23 Feb 2015 15:35:31 GMT (envelope-from nivit@FreeBSD.org) Message-Id: <201502231535.t1NFZViN083626@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: nivit set sender to nivit@FreeBSD.org using -f From: Nicola Vitale Date: Mon, 23 Feb 2015 15:35:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379684 - in head/graphics/gle-graphics: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Feb 2015 15:35:33 -0000 Author: nivit Date: Mon Feb 23 15:35:30 2015 New Revision: 379684 URL: https://svnweb.freebsd.org/changeset/ports/379684 QAT: https://qat.redports.org/buildarchive/r379684/ Log: - Fix build with GCC 4.9 [1] - Add option DOCS - Bump PORTREVISION (change pkg-plist) - Add files/patch-src_fbuild_Makefile.in and files/patch-src_makefmt_Makefile.in to fix build with GCC 4.9 PR: 197896 [1] Submitted by: gerald Added: head/graphics/gle-graphics/files/patch-src_fbuild_Makefile.in (contents, props changed) head/graphics/gle-graphics/files/patch-src_makefmt_Makefile.in (contents, props changed) Modified: head/graphics/gle-graphics/Makefile head/graphics/gle-graphics/files/patch-Makefile.in head/graphics/gle-graphics/pkg-plist Modified: head/graphics/gle-graphics/Makefile ============================================================================== --- head/graphics/gle-graphics/Makefile Mon Feb 23 15:12:29 2015 (r379683) +++ head/graphics/gle-graphics/Makefile Mon Feb 23 15:35:30 2015 (r379684) @@ -3,7 +3,7 @@ PORTNAME= gle-graphics DISTVERSION= 4.2.4cf -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics print MASTER_SITES= SF/glx/gle4%20%28Current%20Active%20Version%29/${DISTVERSION:C,.$,,1} DISTNAME= ${PORTNAME}-${DISTVERSION}-src @@ -24,6 +24,11 @@ BITMAP_IMAGES_LIB_DEPENDS= libjpeg.so:${ CONFIGURE_ARGS= --with-extrafonts=yes +ALL_TARGET= all + +DOCS_ALL_TARGET= doc +DOCS_USE= tex=latex:build tex=dvipsk:build + GNU_CONFIGURE= yes LATEX_GS_DESC= Use LaTeX & GhostScript @@ -31,7 +36,7 @@ LATEX_GS_USE= tex=latex ghostscript=run MAKE_JOBS_UNSAFE=yes -OPTIONS_DEFINE= BITMAP_IMAGES LATEX_GS X11 +OPTIONS_DEFINE= DOCS BITMAP_IMAGES LATEX_GS X11 OPTIONS_DEFAULT= BITMAP_IMAGES LATEX_GS X11 PLIST_SUB+= PORTVERSION=${PORTVERSION} Modified: head/graphics/gle-graphics/files/patch-Makefile.in ============================================================================== --- head/graphics/gle-graphics/files/patch-Makefile.in Mon Feb 23 15:12:29 2015 (r379683) +++ head/graphics/gle-graphics/files/patch-Makefile.in Mon Feb 23 15:35:30 2015 (r379684) @@ -1,6 +1,6 @@ ---- ./Makefile.in.orig 2014-07-28 01:58:20.000000000 +0200 -+++ ./Makefile.in 2014-07-28 01:58:44.000000000 +0200 -@@ -101,7 +101,7 @@ +--- Makefile.in.orig 2015-02-23 13:12:35 UTC ++++ Makefile.in +@@ -101,7 +101,7 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ INSTALL_DATA=@INSTALL_DATA@ MKDIR_P=@MKDIR_P@ @@ -9,3 +9,11 @@ MANDIR=@mandir@ GLE_VERSION=@GLE_VERSION@ +@@ -514,7 +514,6 @@ doc: + $(MAKE) -C gle-refman -f Makefile.gcc pdf + cp gle-refman/gle-manual.pdf build/doc/ + cp README.txt build/doc/ +- cp LICENSE.txt build/doc/ + + autopackage: + (export APBUILD_STATIC_LIBGCC=1; export APBUILD_STATIC="tiff png12 png jpeg z"; makepackage platform/autopackage/gle4.apspec) Added: head/graphics/gle-graphics/files/patch-src_fbuild_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gle-graphics/files/patch-src_fbuild_Makefile.in Mon Feb 23 15:35:30 2015 (r379684) @@ -0,0 +1,11 @@ +--- src/fbuild/Makefile.in.orig 2015-02-23 12:40:36 UTC ++++ src/fbuild/Makefile.in +@@ -64,7 +64,7 @@ $(OBJECTS): %.o: %.cpp $(INCLUDES) + $(CXX) $(CPPFLAGS) -c $< -o $@ + + $(PROJECT_BINDIR)/bin/$(PROGRAM)$(EXE_SUFF): $(OBJECTS) $(EXTRA_OBJS) $(INCLUDES) $(PROGRAM).cpp +- $(CXX) $(CPPFLAGS) $(PROGRAM).cpp $(OBJECTS) $(EXTRA_OBJS) -o $(PROJECT_BINDIR)/bin/$(PROGRAM)$(EXE_SUFF) ++ $(CXX) $(CPPFLAGS) $(LDFLAGS) $(PROGRAM).cpp $(OBJECTS) $(EXTRA_OBJS) -o $(PROJECT_BINDIR)/bin/$(PROGRAM)$(EXE_SUFF) + + clean: + -$(RM) $(OBJECTS) $(PROJECT_BINDIR)/bin/$(PROGRAM)$(EXE_SUFF) $(PROGRAM).$(OBJ_SUFF) Added: head/graphics/gle-graphics/files/patch-src_makefmt_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gle-graphics/files/patch-src_makefmt_Makefile.in Mon Feb 23 15:35:30 2015 (r379684) @@ -0,0 +1,11 @@ +--- src/makefmt/Makefile.in.orig 2015-02-23 12:40:36 UTC ++++ src/makefmt/Makefile.in +@@ -60,7 +60,7 @@ $(OBJECTS): %.o: %.cpp $(INCLUDES) + $(CXX) $(CPPFLAGS) -c $< -o $@ + + $(PROJECT_BINDIR)/bin/$(PROGRAM)$(EXE_SUFF): $(OBJECTS) $(EXTRA_OBJS) $(INCLUDES) $(PROGRAM).cpp +- $(CXX) $(CPPFLAGS) $(PROGRAM).cpp $(OBJECTS) $(EXTRA_OBJS) -o $(PROJECT_BINDIR)/bin/$(PROGRAM)$(EXE_SUFF) ++ $(CXX) $(CPPFLAGS) $(LDFLAGS) $(PROGRAM).cpp $(OBJECTS) $(EXTRA_OBJS) -o $(PROJECT_BINDIR)/bin/$(PROGRAM)$(EXE_SUFF) + + clean: + -$(RM) $(OBJECTS) $(PROJECT_BINDIR)/bin/$(PROGRAM)$(EXE_SUFF) $(PROGRAM).$(OBJ_SUFF) Modified: head/graphics/gle-graphics/pkg-plist ============================================================================== --- head/graphics/gle-graphics/pkg-plist Mon Feb 23 15:12:29 2015 (r379683) +++ head/graphics/gle-graphics/pkg-plist Mon Feb 23 15:35:30 2015 (r379684) @@ -5,6 +5,8 @@ lib/libgle-graphics-4.2.4c.so libdata/pkgconfig/gle-graphics.pc man/man1/gle.1.gz +%%PORTDOCS%%%%DOCSDIR%%/README.txt +%%PORTDOCS%%%%DOCSDIR%%/gle-manual.pdf %%DATADIR%%/4.2.4c/font/arial8.fmt %%DATADIR%%/4.2.4c/font/arialbd8.fmt %%DATADIR%%/4.2.4c/font/arialbi8.fmt