diff options
author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2015-02-03 13:55:05 +0000 |
---|---|---|
committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2015-02-03 13:55:05 +0000 |
commit | 26811663f4246c2f769f4f47493ec4eed2c99ac7 (patch) | |
tree | fdff4c2684091d7fc6dc5512c823541fdbd365c6 /x11-toolkits/fltk | |
parent | Upgrade to 1.7.50 (diff) |
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
Notes
Notes:
svn path=/head/; revision=378351
Diffstat (limited to 'x11-toolkits/fltk')
-rw-r--r-- | x11-toolkits/fltk/Makefile | 22 | ||||
-rw-r--r-- | x11-toolkits/fltk/files/patch-documentation_Makefile | 13 |
2 files changed, 7 insertions, 28 deletions
diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile index 89f5d1f013cf..b84f40dd15b7 100644 --- a/x11-toolkits/fltk/Makefile +++ b/x11-toolkits/fltk/Makefile @@ -13,38 +13,28 @@ COMMENT= Cross-platform C++ graphical user interface toolkit 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> diff --git a/x11-toolkits/fltk/files/patch-documentation_Makefile b/x11-toolkits/fltk/files/patch-documentation_Makefile index 74682884c0a1..12fa68c421f5 100644 --- a/x11-toolkits/fltk/files/patch-documentation_Makefile +++ b/x11-toolkits/fltk/files/patch-documentation_Makefile @@ -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 |