kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Let to use BUILDLINK_DIR first for find header/library files.

Browse source 
It should fixes PR#43215.
This commit is contained in:
obache 2010-08-18 10:05:08 +00:00
parent 6959a31537
commit 0f7c567d5b
3 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
x11/wxGTK24/Makefile.common
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.6 2009/11/29 20:16:20 joerg Exp $
# $NetBSD: Makefile.common,v 1.7 2010/08/18 10:05:08 obache Exp $
#
DISTNAME= wxGTK-2.4.2
@ -23,6 +23,7 @@ CONFIGURE_ARGS+= --with-libjpeg=sys
CONFIGURE_ARGS+= --with-zlib=sys
CONFIGURE_ARGS+= --with-libpng=sys
CONFIGURE_ARGS+= --with-libtiff=sys
CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q}
CPPFLAGS+= -Dunix=1 # src/common/unzip.c needs this

4
x11/wxGTK24/distinfo
View file

@ -1,9 +1,9 @@
$NetBSD: distinfo,v 1.11 2010/06/13 22:45:53 wiz Exp $
$NetBSD: distinfo,v 1.12 2010/08/18 10:05:08 obache Exp $
SHA1 (wxGTK-2.4.2.tar.bz2) = 3f1ebacaaf8eb5510c14ee10bafbc5f225be842c
RMD160 (wxGTK-2.4.2.tar.bz2) = 8076d1ba31c9b23becb241cbad5a83763fee776e
Size (wxGTK-2.4.2.tar.bz2) = 5381935 bytes
SHA1 (patch-aa) = f7510b2dafd73da3c79808b141fee6a60cd47269
SHA1 (patch-aa) = a3950686ec1b71ad42aa324892739408b780b3da
SHA1 (patch-ab) = bab52051778a93439cfd3144f052bdbcc7024e30
SHA1 (patch-ac) = 06a047a28260d30516b87d85a4dd4d5a6c18cfc4
SHA1 (patch-ad) = 809a12f89b018373910b31442dfd315276cafbdf

18
x11/wxGTK24/patches/patch-aa
View file

@ -1,4 +1,4 @@
$NetBSD: patch-aa,v 1.5 2010/06/13 22:45:53 wiz Exp $
$NetBSD: patch-aa,v 1.6 2010/08/18 10:05:08 obache Exp $
--- configure.orig 2003-09-21 11:31:30.000000000 +0000
+++ configure
@ -11,13 +11,17 @@ $NetBSD: patch-aa,v 1.5 2010/06/13 22:45:53 wiz Exp $
USE_BSD=1
USE_FREEBSD=1
cat >> confdefs.h <<\EOF
@@ -11498,9 +11498,10 @@ SEARCH_INCLUDE="\
/usr/local/x11r5/include \
/usr/lpp/Xamples/include \
@@ -11436,6 +11436,7 @@ EOF
SEARCH_INCLUDE="\
+ ${BUILDLINK_DIR}/include \
/usr/local/include \
\
- /usr/openwin/share/include"
+ /usr/openwin/share/include\
+ ${PREFIX}/include"
/usr/Motif-1.2/include \
@@ -11500,7 +11501,7 @@ SEARCH_INCLUDE="\
\
/usr/openwin/share/include"
-SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` "
+SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g`"