From owner-svn-ports-head@FreeBSD.ORG Tue Feb 3 13:55:06 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 92063A1F; Tue, 3 Feb 2015 13:55:06 +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 72E89AE; Tue, 3 Feb 2015 13:55:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t13Dt6mf064973; Tue, 3 Feb 2015 13:55:06 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t13Dt6U5064971; Tue, 3 Feb 2015 13:55:06 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201502031355.t13Dt6U5064971@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Tue, 3 Feb 2015 13:55:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r378351 - in head/x11-toolkits/fltk: . 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-head@freebsd.org X-Mailman-Version: 2.1.18-1 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: Tue, 03 Feb 2015 13:55:06 -0000 Author: danfe Date: Tue Feb 3 13:55:05 2015 New Revision: 378351 URL: https://svnweb.freebsd.org/changeset/ports/378351 QAT: https://qat.redports.org/buildarchive/r378351/ Log: In sight of upcoming update, clean up things a bit: - Sort the knobs, remove "default=yes" arguments from CONFIGURE_ARGS - In post-staging era, conditional installation of documentation is no longer necessary, so simplify the patch and drop post-install target Modified: head/x11-toolkits/fltk/Makefile head/x11-toolkits/fltk/files/patch-documentation_Makefile Modified: head/x11-toolkits/fltk/Makefile ============================================================================== --- head/x11-toolkits/fltk/Makefile Tue Feb 3 13:35:35 2015 (r378350) +++ head/x11-toolkits/fltk/Makefile Tue Feb 3 13:55:05 2015 (r378351) @@ -13,38 +13,28 @@ COMMENT= Cross-platform C++ graphical us LICENSE= LGPL20 -OPTIONS_DEFINE= DOCS - LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libjpeg.so:${PORTSDIR}/graphics/jpeg -USE_LDCONFIG= yes +USES= pkgconfig USE_XORG= xft USE_GL= glu -USES= pkgconfig +USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--enable-threads \ - --enable-shared \ - --enable-xft +CONFIGURE_ARGS= --enable-shared + +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${WRKSRC}/src -L${LOCALBASE}/lib -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - PORTDOCS= * -.include +OPTIONS_DEFINE= DOCS post-patch: prefix="${PREFIX}" ; plength=$$(($${#prefix}+10)) ; \ ${REINPLACE_CMD} -e "\|/etc/fltk|{s||${PREFIX}&|;s|10|$${plength}|;}" \ ${WRKSRC}/src/Fl_Preferences.cxx -.if ${PORT_OPTIONS:MDOCS} -post-install: - cd ${WRKSRC}/documentation && ${MAKE} ${MAKE_ARGS} docinstall - cd ${WRKSRC}/test && ${MAKE} ${MAKE_ARGS} install -.endif - .include Modified: head/x11-toolkits/fltk/files/patch-documentation_Makefile ============================================================================== --- head/x11-toolkits/fltk/files/patch-documentation_Makefile Tue Feb 3 13:35:35 2015 (r378350) +++ head/x11-toolkits/fltk/files/patch-documentation_Makefile Tue Feb 3 13:55:05 2015 (r378351) @@ -1,19 +1,8 @@ --- documentation/Makefile.orig 2011-08-27 01:33:42.000000000 +0000 +++ documentation/Makefile 2011-08-27 01:39:59.000000000 +0000 -@@ -80,6 +80,7 @@ - depend: - - install: $(MANPAGES) -+docinstall: - echo "Installing documentation files in $(DESTDIR)$(docdir) ..." - -$(INSTALL_DIR) $(DESTDIR)$(docdir) - if test -f html/index.html ; then \ -@@ -91,12 +92,9 @@ - echo "Installing fltk.pdf in $(DESTDIR)$(docdir) ..."; \ +@@ -84,11 +84,6 @@ $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \ fi -+ -+install: $(MANPAGES) echo "Installing man pages in $(DESTDIR)$(mandir) ..." - -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1 - $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1