Date: Tue, 3 Feb 2015 13:55:06 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> 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 Message-ID: <201502031355.t13Dt6U5064971@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk> +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 <bsd.port.mk> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502031355.t13Dt6U5064971>