diff options
| author | jlam <jlam@pkgsrc.org> | 2001-05-17 19:57:02 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-05-17 19:57:02 +0000 |
| commit | 908eff725976f013402ce94fcf7bb8d6cb4ae19c (patch) | |
| tree | f65adda621cd177630b7d4fd313eb5e6c736f036 /editors | |
| parent | 1d8d44e973cbedc5eaa448e99690834fcf9f4fa3 (diff) | |
| download | pkgsrc-908eff725976f013402ce94fcf7bb8d6cb4ae19c.tar.gz | |
Move extra header include paths to the end of the search path. This
fixes pkg/12969.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/abiword/Makefile | 12 | ||||
| -rw-r--r-- | editors/abiword/distinfo | 3 | ||||
| -rw-r--r-- | editors/abiword/patches/patch-af | 12 |
3 files changed, 21 insertions, 6 deletions
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 5c1000b546e..52135064089 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2001/05/11 16:03:24 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2001/05/17 19:57:02 jlam Exp $ # # According to AbiSource's explanation of their trademark rights, # compilations/distributions of AbiWord not provided by AbiSource must @@ -36,12 +36,14 @@ ICONVSRC= libiconv-${ABIWORD_VERS}${EXTRACT_SUFX} UNIXFONTS= unixfonts-${ABIWORD_VERS}${EXTRACT_SUFX} WVSRC= wv-${ABIWORD_VERS}${EXTRACT_SUFX} -CPPFLAGS+= -I${WRKDIR}/wv # avoid installed wv headers -CPPFLAGS+= -I${WRKDIR}/libiconv # avoid installed libiconv headers -CPPFLAGS+= -I${LOCALBASE}/include # png.h +# Avoid headers from some installed packages. These must come first! +CPPFLAGS+= -I${WRKDIR}/wv +CPPFLAGS+= -I${WRKDIR}/libiconv/include + +CPPFLAGS+= -I${LOCALBASE}/include # png.h MAKE_ENV+= ABI_BUILD_VERSION="${ABIWORD_VERS}" -MAKE_ENV+= OS_CFLAGS="${CPPFLAGS}" +MAKE_ENV+= OS_EXTRA_CFLAGS="${CPPFLAGS}" MAKE_ENV+= OS_DLLFLAGS="${LDFLAGS}" post-install: diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo index 015fc0b9327..46c7280b106 100644 --- a/editors/abiword/distinfo +++ b/editors/abiword/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 11:00:59 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/05/17 19:57:02 jlam Exp $ SHA1 (abisuite/abi-0.7.10.tar.gz) = 4b878760fc72077062b5bc218eac50217b247805 Size (abisuite/abi-0.7.10.tar.gz) = 4636793 bytes @@ -17,5 +17,6 @@ SHA1 (patch-ab) = 9dbc317697b767bee137cb81d7cc8225a4a96e79 SHA1 (patch-ac) = 67635e365940271c7c7163d9d3ecb705054130ab SHA1 (patch-ad) = f36237c325431173820435fb9180cce3234f7ad2 SHA1 (patch-ae) = 1c2b65110e93eee782ff70ef5388eb2e1c50207e +SHA1 (patch-af) = 96f86578e030576e2a9539d5c3d92ed7faed9ea6 SHA1 (patch-ak) = 853ee1773c724c0fe1f89955a884d07b2c5df37a SHA1 (patch-al) = 717d3c3f0c64c36f335fdac7f6e41066be35eb2b diff --git a/editors/abiword/patches/patch-af b/editors/abiword/patches/patch-af new file mode 100644 index 00000000000..f687bda7257 --- /dev/null +++ b/editors/abiword/patches/patch-af @@ -0,0 +1,12 @@ +$NetBSD: patch-af,v 1.4 2001/05/17 19:57:03 jlam Exp $ + +--- src/config/abi_rules.mk.orig Thu May 17 15:36:47 2001 ++++ src/config/abi_rules.mk +@@ -36,6 +36,7 @@ + ################################################################## + ################################################################## + ++CFLAGS+= $(OS_EXTRA_CFLAGS) + + ifdef LIBRARY_NAME + ifeq ($(OS_NAME), WIN32) |