flnews-devel: Use FLTK 1.4 for glyph substitution on X11.

[Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Fri Oct 12 16:12:42 2018 +0200
Changeset:	c87fb11b633c91435a9dcef923b2a27a9b3cd9bd

Modified Files:
	flnews-devel/Makefile

Log Message:
flnews-devel: Use FLTK 1.4 for glyph substitution on X11.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c87fb11b633c91435a9dcef923b2a27a9b3cd9bd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 flnews-devel/Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diffs:
diff --git a/flnews-devel/Makefile b/flnews-devel/Makefile
index b39df3a845..77452804cc 100644
--- a/flnews-devel/Makefile
+++ b/flnews-devel/Makefile
@@ -58,7 +58,6 @@ SUBST_SED.edit-config+=		-e 's,@FORCE_IP6@,0,g'
 # Old SunPro compilers cannot create dependencies with the "-M" option
 # => Use makedepend instead for all SunPro compilers
 .if ${OPSYS} == "SunOS" && ${PKGSRC_COMPILER:Msunpro}
-BUILD_DEPENDS+=	makedepend-[0-9]*:../../devel/makedepend
 SUBST_SED.edit-config+=		-e 's,@DEP_MD@,,g'
 SUBST_SED.edit-config+=		-e 's,@DEP_COMP@,\#,g'
 .else
@@ -69,6 +68,10 @@ SUBST_SED.edit-config+=		-e 's,@DEP_COMP@,,g'
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} config
 
+.if ${OPSYS} == "SunOS" && ${PKGSRC_COMPILER:Msunpro}
+BUILD_DEPENDS+=	makedepend-[0-9]*:../../devel/makedepend
+.endif
+
 BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.3
 .include "../../devel/zlib/buildlink3.mk"
 # OpenSSL 1.1 API is required for signature algorithm negotiation
@@ -78,6 +81,7 @@ BUILDLINK_API_DEPENDS.openssl+=	openssl>=1.0.0
 .include "../../security/openssl/buildlink3.mk"
 # FLTK must be compiled with multithreading support
 # FLTK version 1.4 is supported (should be compiled with pango support)
-.include "../../x11/fltk13/buildlink3.mk"
+#.include "../../x11/fltk13/buildlink3.mk"
+.include "../../wip/fltk14-devel/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"