From owner-svn-ports-all@FreeBSD.ORG Tue Feb 10 19:29:47 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 D5CAD22B; Tue, 10 Feb 2015 19:29:47 +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 B71D1AB3; Tue, 10 Feb 2015 19:29:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1AJTlp8073535; Tue, 10 Feb 2015 19:29:47 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1AJTlC4073534; Tue, 10 Feb 2015 19:29:47 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201502101929.t1AJTlC4073534@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Tue, 10 Feb 2015 19:29:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r378794 - head/x11-toolkits/fltk 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: Tue, 10 Feb 2015 19:29:48 -0000 Author: danfe Date: Tue Feb 10 19:29:46 2015 New Revision: 378794 URL: https://svnweb.freebsd.org/changeset/ports/378794 QAT: https://qat.redports.org/buildarchive/r378794/ Log: - Since version 1.3.3, FLTK now checks for compiler support of -fvisibility and -fvisibility-inlines-hidden and uses it if available to reduce shared library size. Unfortunately, this hides Fl_XFont_On_Demand::value, which in turn causes undefined reference errors during linking. Fix by marking Fl_XFont_On_Demand class as FL_EXPORT for the time being (Gentoo Linux is doing the same) - Do not strip libraries for now: FLTK uses the same command for installing both dynamic and static libraries, but "fltk-config(1) --compile" prefers static, which breaks programs like `graphics/iccexamin' (threading test) - Pull another patch from Gentoo to fix segmentation fault in vncview(1) of port `net/tigervnc' (Gentoo bug #529856 by Maxim Britov) - Do not leak non-existent (build-time only) -Lfoo references in LDFLAGS as it can potentially lead to various sporadic bugs in programs which obtain these flags through fltk-config(1). To prevent build-time conflicts that this gimmick was originally used for, we change shared linking command of fluid(1) accordingly Since these are one-line changes likely to be merged upstream sooner rather than later, perform them with sed(1) instead of trivial patches. Reported and reviewed by: antoine Modified: head/x11-toolkits/fltk/Makefile Modified: head/x11-toolkits/fltk/Makefile ============================================================================== --- head/x11-toolkits/fltk/Makefile Tue Feb 10 18:50:52 2015 (r378793) +++ head/x11-toolkits/fltk/Makefile Tue Feb 10 19:29:46 2015 (r378794) @@ -3,7 +3,7 @@ PORTNAME= fltk PORTVERSION= 1.3.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits MASTER_SITES= http://fltk.org/pub/${PORTNAME}/${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-source @@ -26,8 +26,7 @@ CONFIGURE_ARGS= --enable-shared WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} CPPFLAGS+= -I${LOCALBASE}/include -# -L../src is needed to be able to build new version with older one installed -LDFLAGS+= -L../src -L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib PORTEXAMPLES= * @@ -39,7 +38,14 @@ post-patch: .SILENT ${WRKSRC}/src/Fl_Preferences.cxx ${REINPLACE_CMD} -e 's,$$(docdir)/examples,${EXAMPLESDIR},' \ ${WRKSRC}/test/Makefile - ${REINPLACE_CMD} -E '/^INSTALL_(BIN|LIB)/s,-m,${STRIP} &, ; \ + ${REINPLACE_CMD} -e '/^INSTALL_BIN/s,-m,${STRIP} &, ; \ s,^\.SILENT,#&,' ${WRKSRC}/makeinclude.in + ${REINPLACE_CMD} -E \ + 's,(.*)LDFLAGS(.*)LINKSHARED(.*),\1LINKSHARED\2LDFLAGS\3,' \ + ${WRKSRC}/fluid/Makefile + ${REINPLACE_CMD} -e '/Fl_XFont_On_Demand/s,class,& FL_EXPORT,' \ + ${WRKSRC}/FL/x.H + ${REINPLACE_CMD} -e 's,result = 0;,fl_open_display(); &,' \ + ${WRKSRC}/src/Fl_x.cxx .include