summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-07-02 04:40:37 +0000
committerjlam <jlam@pkgsrc.org>2001-07-02 04:40:37 +0000
commit44683f15f99989588bc7b7ce9af4c7694709d28d (patch)
tree0fbd929f25e17d72c913da8ee74d68714bc041ad
parent34a1df0bcb5021cc82eb6988be3e3aa449ab9a12 (diff)
downloadpkgsrc-44683f15f99989588bc7b7ce9af4c7694709d28d.tar.gz
REPLACE_BUILDLINK_SED and BUILDLINK_CONFIG_WRAPPER_SED should do opposite
substitutions, so make it so.
-rw-r--r--databases/freetds/buildlink.mk6
-rw-r--r--x11/qt2-libs/buildlink.mk4
-rw-r--r--x11/wxGTK/buildlink.mk16
3 files changed, 15 insertions, 11 deletions
diff --git a/databases/freetds/buildlink.mk b/databases/freetds/buildlink.mk
index 107e8e698f1..005b5c7c09a 100644
--- a/databases/freetds/buildlink.mk
+++ b/databases/freetds/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/07/02 04:27:39 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/02 04:40:37 jlam Exp $
#
# This Makefile fragment is included by packages that use freetds.
#
@@ -26,7 +26,11 @@ BUILDLINK_FILES.freetds+= freetds/lib/*
BUILDLINK_FILES.freetds+= freetds/interfaces
REPLACE_BUILDLINK_SED+= \
+ -e "s|-I${BUILDLINK_DIR}/freetds/|-I${LOCALBASE}/freetds/|g" \
-e "s|-L${BUILDLINK_DIR}/freetds/|-L${LOCALBASE}/freetds/|g"
+BUILDLINK_CONFIG_WRAPPER_SED+= \
+ -e "s|-I${LOCALBASE}/freetds/|-I${BUILDLINK_DIR}/freetds/|g" \
+ -e "s|-L${LOCALBASE}/freetds/|-L${BUILDLINK_DIR}/freetds/|g"
BUILDLINK_TARGETS.freetds= freetds-buildlink
BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.freetds}
diff --git a/x11/qt2-libs/buildlink.mk b/x11/qt2-libs/buildlink.mk
index 5ec4f3a941d..04fe5ce8ac9 100644
--- a/x11/qt2-libs/buildlink.mk
+++ b/x11/qt2-libs/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/07/02 04:27:39 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/07/02 04:40:37 jlam Exp $
#
# This Makefile fragment is included by packages that use qt2-libs.
#
@@ -29,6 +29,8 @@ BUILDLINK_QTDIR= ${BUILDLINK_DIR}/qt2
QTDIR= ${X11PREFIX}/qt2
REPLACE_BUILDLINK_SED+= -e "s|-I${BUILDLINK_QTDIR}/|-I${QTDIR}/|g"
REPLACE_BUILDLINK_SED+= -e "s|-L${BUILDLINK_QTDIR}/|-L${QTDIR}/|g"
+BUILDLINK_CONFIG_WRAPPER_SED+= -e "s|-I${QTDIR}/|-I${BUILDLINK_QTDIR}/|g"
+BUILDLINK_CONFIG_WRAPPER_SED+= -e "s|-L${QTDIR}/|-L${BUILDLINK_QTDIR}/|g"
.include "../../devel/zlib/buildlink.mk"
.include "../../graphics/Mesa/buildlink.mk"
diff --git a/x11/wxGTK/buildlink.mk b/x11/wxGTK/buildlink.mk
index 215b6b2cf0a..473cbb0492e 100644
--- a/x11/wxGTK/buildlink.mk
+++ b/x11/wxGTK/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:34 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/02 04:40:38 jlam Exp $
#
# This Makefile fragment is included by packages that use wxGTK.
#
@@ -41,20 +41,18 @@ BUILDLINK_CONFIG.wxGTK-2= ${X11PREFIX}/bin/wxgtk-config
BUILDLINK_CONFIG_WRAPPER.wxGTK-1= ${BUILDLINK_DIR}/bin/wx-config
BUILDLINK_CONFIG_WRAPPER.wxGTK-2= ${BUILDLINK_DIR}/bin/wxgtk-config
-BUILDLINK_CONFIG_WRAPPER_SED.wxGTK= \
- -e "s|${X11PREFIX}/\(include/wx/\)|${BUILDLINK_DIR}/\1|g" \
- -e "s|${X11PREFIX}/\(lib/wx/include/\)|${BUILDLINK_DIR}/\1|g"
-
-BUILDLINK_CONFIG_WRAPPER_SED.wxGTK-1= ${BUILDLINK_CONFIG_WRAPPER_SED.wxGTK}
-BUILDLINK_CONFIG_WRAPPER_SED.wxGTK-2= ${BUILDLINK_CONFIG_WRAPPER_SED.wxGTK}
+REPLACE_BUILDLINK_SED+= \
+ -e "s|-I${BUILDLINK_DIR}/\(include/wx/\)|${X11PREFIX}/\1|g" \
+ -e "s|-I${BUILDLINK_DIR}/\(lib/wx/include/\)|${X11PREFIX}/\1|g"
+BUILDLINK_CONFIG_WRAPPER_SED+= \
+ -e "s|-I${X11PREFIX}/\(include/wx/\)|-I${BUILDLINK_DIR}/\1|g" \
+ -e "s|-I${X11PREFIX}/\(lib/wx/include/\)|-I${BUILDLINK_DIR}/\1|g"
.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
CONFIGURE_ENV+= WX_CONFIG="${BUILDLINK_CONFIG_WRAPPER.wxGTK-1}"
CONFIGURE_ENV+= WXGTK_CONFIG="${BUILDLINK_CONFIG_WRAPPER.wxGTK-2}"
.endif
-REPLACE_BUILDLINK_SED+= -e "s|-I${BUILDLINK_DIR}/include/wxGTK-1\.2/|${X11PREFIX}/include/wxGTK-1.2|g"
-
pre-configure: ${BUILDLINK_TARGETS.wxGTK}
wxGTK-buildlink: _BUILDLINK_USE
wxGTK-1-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE