From owner-svn-ports-all@FreeBSD.ORG Tue May 13 09:15:59 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4CC01573; Tue, 13 May 2014 09:15:59 +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 2E1AD2FAE; Tue, 13 May 2014 09:15:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4D9Fxt9077731; Tue, 13 May 2014 09:15:59 GMT (envelope-from bsam@svn.freebsd.org) Received: (from bsam@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4D9FwMp077728; Tue, 13 May 2014 09:15:58 GMT (envelope-from bsam@svn.freebsd.org) Message-Id: <201405130915.s4D9FwMp077728@svn.freebsd.org> From: Boris Samorodov Date: Tue, 13 May 2014 09:15:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353930 - in head/print/scribus: . 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 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: Tue, 13 May 2014 09:15:59 -0000 Author: bsam Date: Tue May 13 09:15:58 2014 New Revision: 353930 URL: http://svnweb.freebsd.org/changeset/ports/353930 QAT: https://qat.redports.org/buildarchive/r353930/ Log: . stageify; . remove some plist entries which belongs to MTREE; . fix some clang c++ issues. Added: head/print/scribus/files/patch-pdflib_core.cpp (contents, props changed) Modified: head/print/scribus/Makefile head/print/scribus/pkg-plist Modified: head/print/scribus/Makefile ============================================================================== --- head/print/scribus/Makefile Tue May 13 08:52:20 2014 (r353929) +++ head/print/scribus/Makefile Tue May 13 09:15:58 2014 (r353930) @@ -3,7 +3,7 @@ PORTNAME= scribus PORTVERSION= 1.4.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= print editors MASTER_SITES= SF \ http://www.scribus.net/downloads/${PORTVERSION}/ @@ -37,12 +37,7 @@ USE_LDCONFIG= yes CMAKE_ARGS+= -DWANT_HUNSPELL=YES -Wno-ferror-limit -MAN1= scribus.1 -MANLANG= "" pl de -MANCOMPRESSED= no - -NO_STAGE= yes post-install: - ${LN} ${DATADIR}/icons/scribus.png ${PREFIX}/share/pixmaps/ + ${LN} -sf ${DATADIR}/icons/scribus.png ${STAGEDIR}${PREFIX}/share/pixmaps/ .include Added: head/print/scribus/files/patch-pdflib_core.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/scribus/files/patch-pdflib_core.cpp Tue May 13 09:15:58 2014 (r353930) @@ -0,0 +1,20 @@ +--- scribus/pdflib_core.cpp.orig 2013-01-20 06:15:07.000000000 +0400 ++++ scribus/pdflib_core.cpp 2013-09-14 22:18:16.618750736 +0400 +@@ -83,7 +83,7 @@ + #include "util_math.h" + #include "util_ghostscript.h" + +-using namespace std; ++// using namespace std; + + #if defined(_WIN32) + #undef GetObject +@@ -154,7 +154,7 @@ + delete progressDialog; + } + +-static inline QString FToStr(double c) ++static QString FToStr(double c) + { + return QString::number(c, 'f', 5); + }; Modified: head/print/scribus/pkg-plist ============================================================================== --- head/print/scribus/pkg-plist Tue May 13 08:52:20 2014 (r353929) +++ head/print/scribus/pkg-plist Tue May 13 09:15:58 2014 (r353930) @@ -701,8 +701,10 @@ lib/scribus/plugins/libsvgexplugin.so lib/scribus/plugins/libsvgimplugin.so lib/scribus/plugins/libtransformeffect.so lib/scribus/plugins/libwmfimplugin.so +man/de/man1/scribus.1.gz +man/man1/scribus.1.gz +man/pl/man1/scribus.1.gz share/applications/scribus.desktop -share/mime/application/vnd.scribus.xml share/mime/packages/scribus.xml share/mimelnk/application/vnd.scribus.desktop share/pixmaps/scribus.png @@ -3545,8 +3547,6 @@ share/pixmaps/scribus.png @dirrm include/scribus @dirrmtry share/mimelnk/application @dirrmtry share/mimelnk -@dirrmtry share/emacs/site-lisp -@dirrmtry share/emacs @dirrmtry man/pl/man1 @dirrmtry man/pl @dirrmtry man/de/man1