Thu Mar 18 22:42:23 2010 UTC ()
Revert last commit, will use a change to pkgsrc/mk/platform/Linux.mk to
fix PR 42274.

Bump PKGREVISION.

OK wiz@


(sbd)
diff -r1.13 -r1.14 pkgsrc/x11/xorg-cf-files/Makefile
cvs diff -r1.13 -r1.14 pkgsrc/x11/xorg-cf-files/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xorg-cf-files/Makefile 2010/03/17 09:53:08 1.13
+++ pkgsrc/x11/xorg-cf-files/Makefile 2010/03/18 22:42:23 1.14
@@ -1,37 +1,33 @@ @@ -1,37 +1,33 @@
1# $NetBSD: Makefile,v 1.13 2010/03/17 09:53:08 sbd Exp $ 1# $NetBSD: Makefile,v 1.14 2010/03/18 22:42:23 sbd Exp $
2# 2#
3 3
4DISTNAME= xorg-cf-files-1.0.2 4DISTNAME= xorg-cf-files-1.0.2
5PKGREVISION= 10 5PKGREVISION= 11
6CATEGORIES= x11 devel 6CATEGORIES= x11 devel
7MASTER_SITES= ${MASTER_SITE_XORG:=util/} 7MASTER_SITES= ${MASTER_SITE_XORG:=util/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= joerg@NetBSD.org 10MAINTAINER= joerg@NetBSD.org
11HOMEPAGE= http://xorg.freedesktop.org/ 11HOMEPAGE= http://xorg.freedesktop.org/
12COMMENT= Xorg imake rules 12COMMENT= Xorg imake rules
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17USE_TOOLS+= pkg-config 17USE_TOOLS+= pkg-config
18 18
19.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
20 20
21.if defined(IMAKE_TOOLS) && !empty(IMAKE_TOOLS:Mgmake) 
22USE_TOOLS+= gmake 
23.endif 
24 
25post-extract: 21post-extract:
26 ${CP} ${FILESDIR}/host.def ${WRKSRC} 22 ${CP} ${FILESDIR}/host.def ${WRKSRC}
27 ${CP} ${FILESDIR}/xorgsite.def ${WRKSRC} 23 ${CP} ${FILESDIR}/xorgsite.def ${WRKSRC}
28 24
29pre-configure: 25pre-configure:
30.for sys in NetBSD FreeBSD DragonFly linux darwin 26.for sys in NetBSD FreeBSD DragonFly linux darwin
31 mv ${WRKSRC}/${sys}.cf ${WRKSRC}/${sys}.cf.before && \ 27 mv ${WRKSRC}/${sys}.cf ${WRKSRC}/${sys}.cf.before && \
32 ${SED} -e "s|@@PKGSRC_CC@@|${CC}|g" \ 28 ${SED} -e "s|@@PKGSRC_CC@@|${CC}|g" \
33 -e "s|@@PKGSRC_CPP@@|${CPP}|g" \ 29 -e "s|@@PKGSRC_CPP@@|${CPP}|g" \
34 -e "s|@@PKGSRC_CXX@@|${CXX}|g" \ 30 -e "s|@@PKGSRC_CXX@@|${CXX}|g" \
35 -e "s|@@PKGSRC_CFLAGS@@|${CFLAGS}|g" \ 31 -e "s|@@PKGSRC_CFLAGS@@|${CFLAGS}|g" \
36 -e "s|@@DARWIN_USE_QUARTZ@@|${DARWIN_USE_QUARTZ}|g" \ 32 -e "s|@@DARWIN_USE_QUARTZ@@|${DARWIN_USE_QUARTZ}|g" \
37 ${WRKSRC}/${sys}.cf.before > ${WRKSRC}/${sys}.cf 33 ${WRKSRC}/${sys}.cf.before > ${WRKSRC}/${sys}.cf