Date: Sat, 9 Mar 2019 10:49:42 +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: r495118 - in head/x11-wm/flwm: . files Message-ID: <201903091049.x29AngG7060038@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Sat Mar 9 10:49:42 2019 New Revision: 495118 URL: https://svnweb.freebsd.org/changeset/ports/495118 Log: Redo r495116 in a somewhat better way, particularly, do not assume the location of the header files, ask fltk-config(1) for the proper flags. This also helps to get rid of overly long line in the port's Makefile. Added: head/x11-wm/flwm/files/ head/x11-wm/flwm/files/patch-Makefile (contents, props changed) Modified: head/x11-wm/flwm/Makefile Modified: head/x11-wm/flwm/Makefile ============================================================================== --- head/x11-wm/flwm/Makefile Sat Mar 9 10:37:13 2019 (r495117) +++ head/x11-wm/flwm/Makefile Sat Mar 9 10:49:42 2019 (r495118) @@ -20,13 +20,8 @@ USE_XORG= x11 xt USE_GITHUB= yes GH_ACCOUNT= bbidulock -CXXFLAGS+= -DFL_LIBRARY -I${LOCALBASE}/include/fltk - PLIST_FILES= bin/flwm \ man/man1/flwm.1.gz - -post-patch: - ${REINPLACE_CMD} -e 's|^LIBS =.*|LIBS = `${LOCALBASE}/bin/fltk-config --ldflags`|' ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/flwm ${STAGEDIR}${PREFIX}/bin Added: head/x11-wm/flwm/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/flwm/files/patch-Makefile Sat Mar 9 10:49:42 2019 (r495118) @@ -0,0 +1,12 @@ +--- Makefile.orig 2015-12-14 18:44:42 UTC ++++ Makefile +@@ -5,7 +5,8 @@ VERSION = 1.16 + + CXXFILES = main.C Frame.C Menu.C FrameWindow.C Desktop.C Hotkeys.C + +-LIBS = -lfltk ++CPPFLAGS += -DFL_LIBRARY $(shell $(LOCALBASE)/bin/fltk-config --cxxflags) ++LIBS += $(shell $(LOCALBASE)/bin/fltk-config --ldflags) + + MANPAGE = 1 +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903091049.x29AngG7060038>