Tue Aug 7 10:47:48 2012 UTC ()
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.


(marino)
diff -r1.33 -r1.34 pkgsrc/editors/vigor/Makefile
cvs diff -r1.33 -r1.34 pkgsrc/editors/vigor/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/vigor/Makefile 2012/06/17 02:55:47 1.33
+++ pkgsrc/editors/vigor/Makefile 2012/08/07 10:47:48 1.34
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.33 2012/06/17 02:55:47 dholland Exp $ 1# $NetBSD: Makefile,v 1.34 2012/08/07 10:47:48 marino Exp $
2# 2#
3 3
4DISTNAME= vigor-0.016 4DISTNAME= vigor-0.016
5PKGREVISION= 5 5PKGREVISION= 5
6CATEGORIES= editors 6CATEGORIES= editors
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vigor/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vigor/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://vigor.sourceforge.net/ 10HOMEPAGE= http://vigor.sourceforge.net/
11COMMENT= nvi with excessive online "help" 11COMMENT= nvi with excessive online "help"
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
@@ -42,21 +42,25 @@ SUBST_CLASSES+= db185 @@ -42,21 +42,25 @@ SUBST_CLASSES+= db185
42SUBST_STAGE.db185= post-extract 42SUBST_STAGE.db185= post-extract
43SUBST_MESSAGE.db185= Using db_185.h instead of db.h 43SUBST_MESSAGE.db185= Using db_185.h instead of db.h
44SUBST_FILES.db185= common/common.h 44SUBST_FILES.db185= common/common.h
45SUBST_SED.db185= -e '/^\#include <db\.h>/s/db\.h/db_185.h/' 45SUBST_SED.db185= -e '/^\#include <db\.h>/s/db\.h/db_185.h/'
46 46
47BDB_ACCEPTED= db1 47BDB_ACCEPTED= db1
48.include "../../mk/bdb.buildlink3.mk" 48.include "../../mk/bdb.buildlink3.mk"
49.endif 49.endif
50 50
51.include "../../lang/tcl/buildlink3.mk" 51.include "../../lang/tcl/buildlink3.mk"
52.include "../../x11/libXt/buildlink3.mk" 52.include "../../x11/libXt/buildlink3.mk"
53.include "../../x11/tk/buildlink3.mk" 53.include "../../x11/tk/buildlink3.mk"
54 54
 55.include "../../mk/bsd.prefs.mk"
 56.if ${OPSYS} != "DragonFly"
55.if exists(/usr/include/sys/queue.h) 57.if exists(/usr/include/sys/queue.h)
56# this file obscures the system header 58# this file obscures the system header
 59# (Desired for DragonFly which does not have CIRCLEQ macros)
57post-patch: 60post-patch:
58 ${RM} -f ${WRKSRC}/include/sys/queue.h 61 ${RM} -f ${WRKSRC}/include/sys/queue.h
59.endif 62.endif
 63.endif
60 64
61.include "../../mk/curses.buildlink3.mk" 65.include "../../mk/curses.buildlink3.mk"
62.include "../../mk/bsd.pkg.mk" 66.include "../../mk/bsd.pkg.mk"