summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2012-04-01 20:53:16 +0000
committermarkd <markd@pkgsrc.org>2012-04-01 20:53:16 +0000
commit8612613cfd557b70d31f7560bc5e133eed02c250 (patch)
tree01885e628c561d2aa687904db01ae5e4f0cbe385 /x11
parentcf008e639778ecdd6288e348a69b3ec4c5d00818 (diff)
downloadpkgsrc-8612613cfd557b70d31f7560bc5e133eed02c250.tar.gz
Rewrite to remove multiple post-wrapper if inet6 not defined.
fix mkspecs/default link to point to correct directory rather than assuming netbsd-g++
Diffstat (limited to 'x11')
-rw-r--r--x11/kde-workspace4/hacks.mk14
1 files changed, 8 insertions, 6 deletions
diff --git a/x11/kde-workspace4/hacks.mk b/x11/kde-workspace4/hacks.mk
index dffd222a5a2..5a4423cab37 100644
--- a/x11/kde-workspace4/hacks.mk
+++ b/x11/kde-workspace4/hacks.mk
@@ -1,19 +1,21 @@
-# $NetBSD: hacks.mk,v 1.1 2012/03/19 19:44:03 markd Exp $
+# $NetBSD: hacks.mk,v 1.2 2012/04/01 20:53:16 markd Exp $
.if !defined(KDEBASE4_HACKS_MK)
KDEBASE4_HACKS_MK= # defined
+# fix up buildlinks failure to build link tree correctly
+post-wrapper: post-wrapper-extra
+ ln -s ${BUILDLINK_PREFIX.qt4-libs}/qt4/mkspecs/default ${BUILDLINK_DIR}/qt4/mkspecs/default
+
### issue is specific to xproto IPv6 support
.if empty(PKG_OPTIONS:Minet6)
PKG_HACKS+= X11_X_h
-post-wrapper:
+post-wrapper-extra:
${SED} 's,^#define FamilyInternet6.*,/* undef FamilyInternet6 */,' \
${BUILDLINK_DIR}/include/X11/X.h >${BUILDLINK_DIR}/include/X11/X.h.new
${MV} -f ${BUILDLINK_DIR}/include/X11/X.h.new ${BUILDLINK_DIR}/include/X11/X.h
+.else
+post-wrapper-extra:
.endif
.endif
-
-# fix up buildlinks failure to build link tree correctly
-post-wrapper:
- ln -s netbsd-g++ ${BUILDLINK_DIR}/qt4/mkspecs/default