diff options
| author | marino <marino> | 2012-08-07 10:47:48 +0000 |
|---|---|---|
| committer | marino <marino> | 2012-08-07 10:47:48 +0000 |
| commit | 1dacd7ffa0767514db594296f279c15b3d77ca64 (patch) | |
| tree | a820c46cfec7520d28108836aa6b9b5c116498b5 | |
| parent | db12e94d5f5cbb2a8cde7ef0d7904efd60ad8020 (diff) | |
| download | pkgsrc-1dacd7ffa0767514db594296f279c15b3d77ca64.tar.gz | |
editor/vigor: post-patch operation broke DragonFly
DragonFly replaced CIRCLEQ_* with TAILQ_* a few years back. The
system sys/queue.h will not build editors/vigor. The Makefile's
post-patch phase removed it's version of queue.h because it masked the
system sys/queue.h, which is exactly what is required for DragonFly.
Make this post-patch operation system specific: Do it only for
non-DragonFly platforms.
| -rw-r--r-- | editors/vigor/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/editors/vigor/Makefile b/editors/vigor/Makefile index 9d8a1ef450a..63dd3016d49 100644 --- a/editors/vigor/Makefile +++ b/editors/vigor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2012/06/17 02:55:47 dholland Exp $ +# $NetBSD: Makefile,v 1.34 2012/08/07 10:47:48 marino Exp $ # DISTNAME= vigor-0.016 @@ -52,11 +52,15 @@ BDB_ACCEPTED= db1 .include "../../x11/libXt/buildlink3.mk" .include "../../x11/tk/buildlink3.mk" +.include "../../mk/bsd.prefs.mk" +.if ${OPSYS} != "DragonFly" .if exists(/usr/include/sys/queue.h) # this file obscures the system header +# (Desired for DragonFly which does not have CIRCLEQ macros) post-patch: ${RM} -f ${WRKSRC}/include/sys/queue.h .endif +.endif .include "../../mk/curses.buildlink3.mk" .include "../../mk/bsd.pkg.mk" |