Sun Apr 1 20:53:16 2012 UTC ()
Rewrite to remove multiple post-wrapper if inet6 not defined.

fix mkspecs/default link to point to correct directory rather than
assuming netbsd-g++


(markd)
diff -r1.1 -r1.2 pkgsrc/x11/kde-workspace4/hacks.mk

cvs diff -r1.1 -r1.2 pkgsrc/x11/kde-workspace4/hacks.mk (expand / switch to unified diff)

--- pkgsrc/x11/kde-workspace4/hacks.mk 2012/03/19 19:44:03 1.1
+++ pkgsrc/x11/kde-workspace4/hacks.mk 2012/04/01 20:53:16 1.2
@@ -1,19 +1,21 @@ @@ -1,19 +1,21 @@
1# $NetBSD: hacks.mk,v 1.1 2012/03/19 19:44:03 markd Exp $ 1# $NetBSD: hacks.mk,v 1.2 2012/04/01 20:53:16 markd Exp $
2 2
3.if !defined(KDEBASE4_HACKS_MK) 3.if !defined(KDEBASE4_HACKS_MK)
4KDEBASE4_HACKS_MK= # defined 4KDEBASE4_HACKS_MK= # defined
5 5
 6# fix up buildlinks failure to build link tree correctly
 7post-wrapper: post-wrapper-extra
 8 ln -s ${BUILDLINK_PREFIX.qt4-libs}/qt4/mkspecs/default ${BUILDLINK_DIR}/qt4/mkspecs/default
 9
6### issue is specific to xproto IPv6 support 10### issue is specific to xproto IPv6 support
7.if empty(PKG_OPTIONS:Minet6) 11.if empty(PKG_OPTIONS:Minet6)
8PKG_HACKS+= X11_X_h 12PKG_HACKS+= X11_X_h
9post-wrapper: 13post-wrapper-extra:
10 ${SED} 's,^#define FamilyInternet6.*,/* undef FamilyInternet6 */,' \ 14 ${SED} 's,^#define FamilyInternet6.*,/* undef FamilyInternet6 */,' \
11 ${BUILDLINK_DIR}/include/X11/X.h >${BUILDLINK_DIR}/include/X11/X.h.new 15 ${BUILDLINK_DIR}/include/X11/X.h >${BUILDLINK_DIR}/include/X11/X.h.new
12 ${MV} -f ${BUILDLINK_DIR}/include/X11/X.h.new ${BUILDLINK_DIR}/include/X11/X.h 16 ${MV} -f ${BUILDLINK_DIR}/include/X11/X.h.new ${BUILDLINK_DIR}/include/X11/X.h
 17.else
 18post-wrapper-extra:
13.endif 19.endif
14 20
15.endif 21.endif
16 
17# fix up buildlinks failure to build link tree correctly 
18post-wrapper: 
19 ln -s netbsd-g++ ${BUILDLINK_DIR}/qt4/mkspecs/default