fltk14-devel: Make it work with modular X

[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:		Wed Oct 16 13:38:56 2019 +0200
Changeset:	a1d6b0c4186b3e111d3150872e2e07630b47e903

Modified Files:
	fltk14-devel/Makefile

Log Message:
fltk14-devel: Make it work with modular X

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

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

diffstat:
 fltk14-devel/Makefile | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diffs:
diff --git a/fltk14-devel/Makefile b/fltk14-devel/Makefile
index 7504410ead..866d072bb0 100644
--- a/fltk14-devel/Makefile
+++ b/fltk14-devel/Makefile
@@ -18,7 +18,6 @@ TEST_TARGET=		test
 
 # ------------------------------------------------------
 # Options
-
 PKG_OPTIONS_VAR=	PKG_OPTIONS.fltk14
 PKG_SUPPORTED_OPTIONS=	cairo opengl pango
 PKG_SUGGESTED_OPTIONS=	opengl pango
@@ -47,7 +46,6 @@ CONFIGURE_ARGS+=	--enable-pango
 .else
 CONFIGURE_ARGS+=	--disable-pango
 .endif
-
 # ------------------------------------------------------
 
 PTHREAD_OPTS+=		require
@@ -66,11 +64,16 @@ CONFIGURE_ARGS+=	--enable-shared
 # Use pkgsrc versions, not package's bundled versions.
 CONFIGURE_ARGS+=	--disable-localjpeg --disable-localzlib --disable-localpng
 
-post-extract:
-	cd ${WRKSRC} && autoconf
-
+# ------------------------------------------------------
+# Clean the source tree first for snapshots
+# (CPPFLAGS/LDFLAGS are for modular X)
+# Remove this for release version
 pre-configure:
-	cd ${WRKSRC} && ${GMAKE} ${MAKE_FLAGS} clean
+	cd ${WRKSRC} && autoconf
+	cd ${WRKSRC} && \
+		CPPFLAGS="-I ${PREFIX}/include" LDFLAGS="-L ${PREFIX}/lib" \
+		${GMAKE} ${MAKE_FLAGS} clean
+# ------------------------------------------------------
 
 .if ${OPSYS} != "Darwin"
 .include "../../graphics/MesaLib/buildlink3.mk"