pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/wm/windowmaker windowmaker: fix pkg-config files



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2934257278f3
branches:  trunk
changeset: 427783:2934257278f3
user:      adam <adam%pkgsrc.org@localhost>
date:      Mon Apr 20 17:04:18 2020 +0000

description:
windowmaker: fix pkg-config files

diffstat:

 wm/windowmaker/Makefile                |   8 +++++++-
 wm/windowmaker/distinfo                |   3 +--
 wm/windowmaker/patches/patch-configure |  16 ----------------
 3 files changed, 8 insertions(+), 19 deletions(-)

diffs (58 lines):

diff -r 8ff08e5ac35a -r 2934257278f3 wm/windowmaker/Makefile
--- a/wm/windowmaker/Makefile   Mon Apr 20 16:33:51 2020 +0000
+++ b/wm/windowmaker/Makefile   Mon Apr 20 17:04:18 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.128 2020/04/11 07:02:34 adam Exp $
+# $NetBSD: Makefile,v 1.129 2020/04/20 17:04:18 adam Exp $
 
 DISTNAME=      WindowMaker-0.95.9
 PKGNAME=       ${DISTNAME:tl}
@@ -31,6 +31,12 @@
 INSTALLATION_DIRS+=    share/WindowMaker/Sounds
 INSTALLATION_DIRS+=    share/doc/WindowMaker
 
+PKGCONFIG_OVERRIDE=            WINGs/WINGs.pc
+PKGCONFIG_OVERRIDE+=           WINGs/WUtil.pc
+PKGCONFIG_OVERRIDE+=           wmlib/wmlib.pc
+PKGCONFIG_OVERRIDE+=           wrlib/wrlib.pc
+PKGCONFIG_OVERRIDE_STAGE=      post-build
+
 .include "../../mk/compiler.mk"
 
 .if !empty(MACHINE_PLATFORM:MSunOS-5.11-*)
diff -r 8ff08e5ac35a -r 2934257278f3 wm/windowmaker/distinfo
--- a/wm/windowmaker/distinfo   Mon Apr 20 16:33:51 2020 +0000
+++ b/wm/windowmaker/distinfo   Mon Apr 20 17:04:18 2020 +0000
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.44 2020/04/11 07:02:34 adam Exp $
+$NetBSD: distinfo,v 1.45 2020/04/20 17:04:18 adam Exp $
 
 SHA1 (WindowMaker-0.95.9.tar.gz) = 4c19bb85bf2d1a3412ec42b3810d1aebc0a8f76f
 RMD160 (WindowMaker-0.95.9.tar.gz) = 3c78acef4e535f4b2230e0e8cf5155c54359a61e
 SHA512 (WindowMaker-0.95.9.tar.gz) = ca3ddc863f5b5b782e90f38c0019fe14d1109d6b11d0a3d5d6c728ddc1817747eea92e22e36933d445e72c70661e039ee56efa70f2654657c8980269fd5b4584
 Size (WindowMaker-0.95.9.tar.gz) = 3397167 bytes
 SHA1 (patch-WINGs_dragsource.c) = a9b8dfb0ac453e5835b683a2119428d0b1182ced
-SHA1 (patch-configure) = dde661da4d1b3632b4710285f9f7a9485356e8b8
 SHA1 (patch-src_event.c) = 9f72b77f7f7890c9b4283eecca3e2bb25ad8d5b3
 SHA1 (patch-src_main.c) = e1693470d803b96f8ff93906dfeea43d5c3509c9
 SHA1 (patch-src_switchpanel.c) = 4c494eff64b17bf4b08ddaafc95ffa37f43452f9
diff -r 8ff08e5ac35a -r 2934257278f3 wm/windowmaker/patches/patch-configure
--- a/wm/windowmaker/patches/patch-configure    Mon Apr 20 16:33:51 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2015/10/16 10:42:23 adam Exp $
-
---- configure.orig     2015-08-11 18:52:18.000000000 +0000
-+++ configure
-@@ -13840,9 +13840,9 @@ _bindir=`eval echo $_bindir`
- _libdir=`eval echo $libdir`
- _libdir=`eval echo $_libdir`
- 
--lib_search_path='-L${libdir}'
-+lib_search_path="-L${BUILDLINK_DIR}/lib -L${BUILDLINK_X11_DIR}/lib"
- 
--inc_search_path='-I${includedir}'
-+inc_search_path="-I${BUILDLINK_DIR}/include -I${BUILDLINK_X11_DIR}/include"
- 
- 
- # Check whether --with-libs-from was given.



Home | Main Index | Thread Index | Old Index