From owner-svn-ports-head@freebsd.org Sat Mar 9 10:49:43 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5CB9515411EB; Sat, 9 Mar 2019 10:49:43 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EDDB5815BF; Sat, 9 Mar 2019 10:49:42 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E3493A1D9; Sat, 9 Mar 2019 10:49:42 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x29Ang7b060039; Sat, 9 Mar 2019 10:49:42 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x29AngG7060038; Sat, 9 Mar 2019 10:49:42 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201903091049.x29AngG7060038@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Sat, 9 Mar 2019 10:49:42 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/x11-wm/flwm: . files X-SVN-Commit-Revision: 495118 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: EDDB5815BF X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.95)[-0.955,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Mar 2019 10:49:43 -0000 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 +