head 1.33; access; symbols pkgsrc-2013Q2:1.33.0.24 pkgsrc-2013Q2-base:1.33 pkgsrc-2012Q4:1.33.0.22 pkgsrc-2012Q4-base:1.33 pkgsrc-2011Q4:1.33.0.20 pkgsrc-2011Q4-base:1.33 pkgsrc-2011Q2:1.33.0.18 pkgsrc-2011Q2-base:1.33 pkgsrc-2009Q4:1.33.0.16 pkgsrc-2009Q4-base:1.33 pkgsrc-2008Q4:1.33.0.14 pkgsrc-2008Q4-base:1.33 pkgsrc-2008Q3:1.33.0.12 pkgsrc-2008Q3-base:1.33 cube-native-xorg:1.33.0.10 cube-native-xorg-base:1.33 pkgsrc-2008Q2:1.33.0.8 pkgsrc-2008Q2-base:1.33 pkgsrc-2008Q1:1.33.0.6 pkgsrc-2008Q1-base:1.33 pkgsrc-2007Q4:1.33.0.4 pkgsrc-2007Q4-base:1.33 pkgsrc-2007Q3:1.33.0.2 pkgsrc-2007Q3-base:1.33 pkgsrc-2007Q2:1.32.0.6 pkgsrc-2007Q2-base:1.32 pkgsrc-2007Q1:1.32.0.4 pkgsrc-2007Q1-base:1.32 pkgsrc-2006Q4:1.32.0.2 pkgsrc-2006Q4-base:1.32 pkgsrc-2006Q3:1.31.0.2 pkgsrc-2006Q3-base:1.31 pkgsrc-2006Q2:1.28.0.2 pkgsrc-2006Q2-base:1.28 pkgsrc-2006Q1:1.26.0.2 pkgsrc-2006Q1-base:1.26 pkgsrc-2005Q4:1.23.0.2 pkgsrc-2005Q4-base:1.23 pkgsrc-2005Q3:1.21.0.2 pkgsrc-2005Q3-base:1.21 pkgsrc-2005Q2:1.19.0.2 pkgsrc-2005Q2-base:1.19 pkgsrc-2005Q1:1.14.0.2 pkgsrc-2005Q1-base:1.14 pkgsrc-2004Q4:1.10.0.2 pkgsrc-2004Q4-base:1.10 pkgsrc-2004Q3:1.8.0.2 pkgsrc-2004Q3-base:1.8 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.33 date 2007.08.17.20.25.13; author joerg; state dead; branches; next 1.32; 1.32 date 2006.10.09.12.52.36; author joerg; state Exp; branches; next 1.31; 1.31 date 2006.09.25.12.49.58; author joerg; state Exp; branches; next 1.30; 1.30 date 2006.07.31.16.39.42; author joerg; state Exp; branches; next 1.29; 1.29 date 2006.07.17.17.06.59; author joerg; state Exp; branches; next 1.28; 1.28 date 2006.06.12.00.36.25; author joerg; state Exp; branches 1.28.2.1; next 1.27; 1.27 date 2006.04.22.09.22.17; author rillig; state Exp; branches; next 1.26; 1.26 date 2006.02.27.22.58.57; author joerg; state Exp; branches 1.26.2.1; next 1.25; 1.25 date 2006.02.12.15.29.19; author xtraeme; state Exp; branches; next 1.24; 1.24 date 2006.01.18.23.53.06; author xtraeme; state Exp; branches; next 1.23; 1.23 date 2005.12.08.09.52.17; author rillig; state Exp; branches; next 1.22; 1.22 date 2005.12.05.20.51.20; author rillig; state Exp; branches; next 1.21; 1.21 date 2005.09.13.22.51.42; author reed; state Exp; branches; next 1.20; 1.20 date 2005.08.19.16.46.52; author reed; state Exp; branches; next 1.19; 1.19 date 2005.05.23.19.14.14; author xtraeme; state Exp; branches; next 1.18; 1.18 date 2005.04.11.21.48.15; author tv; state Exp; branches; next 1.17; 1.17 date 2005.04.05.10.14.50; author adam; state Exp; branches; next 1.16; 1.16 date 2005.03.29.23.32.12; author xtraeme; state Exp; branches; next 1.15; 1.15 date 2005.03.22.09.46.10; author adam; state Exp; branches; next 1.14; 1.14 date 2005.03.02.02.07.31; author hira; state Exp; branches; next 1.13; 1.13 date 2005.03.01.19.00.11; author xtraeme; state Exp; branches; next 1.12; 1.12 date 2005.01.12.20.21.49; author reed; state Exp; branches; next 1.11; 1.11 date 2004.12.27.17.26.18; author xtraeme; state Exp; branches; next 1.10; 1.10 date 2004.11.01.23.41.58; author xtraeme; state Exp; branches 1.10.2.1; next 1.9; 1.9 date 2004.09.21.17.38.53; author xtraeme; state Exp; branches; next 1.8; 1.8 date 2004.08.04.06.49.41; author xtraeme; state Exp; branches; next 1.7; 1.7 date 2004.07.31.01.37.23; author xtraeme; state Exp; branches; next 1.6; 1.6 date 2004.07.30.22.47.47; author xtraeme; state Exp; branches; next 1.5; 1.5 date 2004.07.30.08.31.23; author xtraeme; state Exp; branches; next 1.4; 1.4 date 2004.07.30.07.22.19; author xtraeme; state Exp; branches; next 1.3; 1.3 date 2004.07.29.07.27.43; author xtraeme; state Exp; branches; next 1.2; 1.2 date 2004.07.29.06.36.34; author xtraeme; state Exp; branches; next 1.1; 1.1 date 2004.07.29.04.49.52; author xtraeme; state Exp; branches 1.1.1.1; next ; 1.28.2.1 date 2006.08.23.23.30.32; author salo; state Exp; branches; next ; 1.26.2.1 date 2006.05.09.15.09.25; author salo; state Exp; branches; next ; 1.10.2.1 date 2004.12.27.18.30.51; author snj; state Exp; branches; next ; 1.1.1.1 date 2004.07.29.04.49.52; author xtraeme; state Exp; branches; next ; desc @@ 1.33 log @To quote Johnny Lam: "In modular-xorg we trust" Remove xorg 6.9 packages from pkgsrc. @ text @# $NetBSD: Makefile,v 1.32 2006/10/09 12:52:36 joerg Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-imake-${XORG_VER} PKGREVISION= 5 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG} DISTFILES= X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src3.tar.gz MAINTAINER= joerg@@NetBSD.org HOMEPAGE= http://www.x.org/ COMMENT= Imake and other utilities from X.org PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_DESTDIR_SUPPORT= user-destdir USE_DIRS+= xorg-1.1 INSTALL_TARGET= install install.man NO_XORG_TARGETS= yes USE_TOOLS+= perl:run REPLACE_PERL+= config/util/mkhtmlindex.pl .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "Linux" DEPENDS+= bison-[0-9]*:../../devel/bison DEPENDS+= flex-[0-9]*:../../devel/flex PLIST_SUBST+= LNDIR= .elif ${OPSYS} == "OpenBSD" PLIST_SUBST+= LNDIR="@@comment " .else PLIST_SUBST+= LNDIR= .endif .include "../../meta-pkgs/xorg/Makefile.common" post-extract: @@${TOUCH} ${WRKSRC}/config/cf/date.def .for F in ${SYSTEMS} @@${MV} ${WRKSRC}/config/cf/${F}.cf ${WRKSRC}/config/cf/${F}.cf.in .endfor .undef F @@${SED} -e "s|CONFIGDIRSPEC|-I${X11ROOT}/lib/X11/config|" \ ${WRKSRC}/config/util/xmkmf.cpp > \ ${WRKSRC}/config/util/xmkmf.cpp.orig @@${MV} ${WRKSRC}/config/util/xmkmf.cpp.orig \ ${WRKSRC}/config/util/xmkmf.cpp pre-configure: .for F in ${SYSTEMS} @@${SED} -e "s|@@@@PKGSRC_CC@@@@|${CC}|g" \ -e "s|@@@@PKGSRC_CPP@@@@|${CPP}|g" \ -e "s|@@@@PKGSRC_CXX@@@@|${CXX}|g" \ -e "s|@@@@PKGSRC_CFLAGS@@@@|${CFLAGS}|g" \ -e "s|@@@@DARWIN_USE_QUARTZ@@@@|${DARWIN_USE_QUARTZ}|g" \ ${WRKSRC}/config/cf/${F}.cf.in > ${WRKSRC}/config/cf/${F}.cf .endfor .undef F @@( \ ${ECHO} "#define XORG_VERSION_MAJOR 6"; \ ${ECHO} "#define XORG_VERSION_MINOR 9"; \ ${ECHO} "#define XORG_VERSION_PATCH 0"; \ ${ECHO} "#define XORG_VERSION_SNAP 0"; \ ) > ${WRKSRC}/config/cf/version.def do-build: @@${CP} ${FILESDIR}/xorgsite.def ${WRKSRC}/config/cf @@${SED} -e "s|@@PREFIX@@|${X11ROOT}|g" \ -e "s|@@BLNK@@|${BUILDLINK_DIR}|g" \ -e "s|@@LOCALBASE@@|${LOCALBASE}|g " \ -e "s|@@MAKE@@|${MAKE_PROGRAM}|" ${FILESDIR}/host.def > \ ${WRKSRC}/config/cf/host.def cd ${WRKSRC} && ${MAKE_PROGRAM} Makefile.boot && \ ${MAKE_PROGRAM} -f xmakefile VerifyOS version.def Makefiles includes pre-install: @@${CP} ${WRKSRC}/xmakefile ${WRKSRC}/xmakefile.bak @@${SED} 's/SUBDIRS = include/SUBDIRS =/' ${WRKSRC}/xmakefile.bak > \ ${WRKSRC}/xmakefile post-install: ${CHMOD} ${NONBINMODE} ${DESTDIR}${X11ROOT}/lib/X11/config/host.def @@${CP} ${DESTDIR}${X11ROOT}/lib/X11/config/host.def \ ${DESTDIR}${X11ROOT}/lib/X11/config/host.def.orig @@${SED} -e "s|\#define ProjectRoot ${X11ROOT}||" \ ${DESTDIR}${X11ROOT}/lib/X11/config/host.def.orig > \ ${DESTDIR}${X11ROOT}/lib/X11/config/host.def @@${RM} ${DESTDIR}${X11ROOT}/lib/X11/config/host.def.orig @@( \ ${ECHO}; \ ${ECHO} "#ifdef BeforeVendorCF"; \ ${ECHO} "#define ProjectRoot ${X11ROOT}"; \ ${ECHO} "#endif"; \ ) >> ${DESTDIR}${X11ROOT}/lib/X11/config/host.def .if !empty(MACHINE_PLATFORM:MNetBSD-1.6[M-Z]*) || \ !empty(MACHINE_PLATFORM:MNetBSD-[2-9]*) . if exists(/usr/include/threadlib.h) SUBST_CLASSES+= thr SUBST_STAGE.thr= post-patch SUBST_FILES.thr= config/cf/NetBSD.cf.in SUBST_SED.thr= -e 's|@@@@NETBSD_THREADLIB@@@@|-DUSE_NBSD_THREADLIB|' SUBST_MESSAGE.thr= Fixes for threadlib.h. . else SUBST_CLASSES+= nada SUBST_STAGE.nada= post-patch SUBST_FILES.nada= config/cf/NetBSD.cf.in SUBST_SED.nada= -e 's|@@@@NETBSD_THREADLIB@@@@||' . endif .endif .include "../../mk/bsd.pkg.mk" @ 1.32 log @Flag a number of packages I use as supporting (user-)destdir. apg is a bit special as it has some hardcoded ownership, so mark that as "destdir". @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.31 2006/09/25 12:49:58 joerg Exp $ @ 1.31 log @Always use INSTALLMINORREV, eliminiating the special handling in FreeBSD. Bump revision. Tested by Peter Schuller. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.30 2006/07/31 16:39:42 joerg Exp $ d15 1 d83 3 a85 3 ${CHMOD} ${NONBINMODE} ${X11ROOT}/lib/X11/config/host.def @@${CP} ${X11ROOT}/lib/X11/config/host.def \ ${X11ROOT}/lib/X11/config/host.def.orig d87 3 a89 3 ${X11ROOT}/lib/X11/config/host.def.orig > \ ${X11ROOT}/lib/X11/config/host.def @@${RM} ${X11ROOT}/lib/X11/config/host.def.orig d96 1 a96 1 ) >> ${X11ROOT}/lib/X11/config/host.def @ 1.30 log @Don't drop -fno-strict-aliasing on NetBSD/!i386. Fixes PR 34099. Bump revision of xorg-imake and xorg-libs. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.29 2006/07/17 17:06:59 joerg Exp $ d5 1 a5 1 PKGREVISION= 4 @ 1.29 log @Since mkhtmlindex is now a Perl script, depend on Perl and replace the interpreter. Bump revision. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.28 2006/06/12 00:36:25 joerg Exp $ d5 1 a5 1 PKGREVISION= 3 @ 1.28 log @Improve Linux/AMD64 support. Bump revisions of xorg-imake and xorg-libs due to changed packages. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.27 2006/04/22 09:22:17 rillig Exp $ d5 1 a5 1 PKGREVISION= 2 d20 3 @ 1.28.2.1 log @Pullup ticket 1804 - requested by joerg security fix and sync with HEAD for xorg Revisions pulled up: - pkgsrc/meta-pkgs/xorg/Makefile.common 1.41, 1.42 - pkgsrc/x11/xorg-imake/Makefile 1.29, 1.30 - pkgsrc/x11/xorg-imake/distinfo 1.21 - pkgsrc/x11/xorg-imake/patches/patch-ac 1.8 - pkgsrc/x11/xorg-libs/Makefile 1.37, 1.39, 1.40, 1.41 - pkgsrc/x11/xorg-libs/PLIST 1.8, 1.9, 1.10 - pkgsrc/x11/xorg-libs/distinfo 1.48, 1.49, 1.50, 1.51, 1.52 - pkgsrc/x11/xorg-libs/patches/patch-ac 1.10 - pkgsrc/x11/xorg-libs/patches/patch-ad 1.6 - pkgsrc/x11/xorg-libs/patches/patch-au 1.3 - pkgsrc/x11/xorg-libs/patches/patch-bq 1.1 - pkgsrc/x11/xorg-libs/patches/patch-br 1.1 - pkgsrc/x11/xorg-server/Makefile 1.45 Module Name: pkgsrc Committed By: rillig Date: Tue Jul 4 09:20:18 UTC 2006 Modified Files: pkgsrc/meta-pkgs/xorg: Makefile.common Log Message: Made a SUBST block much simpler. --- Module Name: pkgsrc Committed By: joerg Date: Mon Jul 17 17:06:59 UTC 2006 Modified Files: pkgsrc/x11/xorg-imake: Makefile Log Message: Since mkhtmlindex is now a Perl script, depend on Perl and replace the interpreter. Bump revision. --- Module Name: pkgsrc Committed By: minskim Date: Sun Jul 23 15:45:36 UTC 2006 Modified Files: pkgsrc/x11/xorg-libs: Makefile distinfo pkgsrc/x11/xorg-libs/patches: patch-au Log Message: Make this package build on platforms without native zlib by including zlib's buildlink3.mk. Thanks to Joerg Sonnenberger for review. --- Module Name: pkgsrc Committed By: minskim Date: Sun Jul 23 16:54:20 UTC 2006 Modified Files: pkgsrc/x11/xorg-libs: PLIST Log Message: Add missing entries for Linux. Approved by the maintainer. --- Module Name: pkgsrc Committed By: joerg Date: Mon Jul 24 14:11:13 UTC 2006 Modified Files: pkgsrc/meta-pkgs/xorg: Makefile.common pkgsrc/x11/xorg-libs: Makefile Log Message: Move zlib SUBST magic to Makefile.common, it is always needed. Fixes problems found by abs@@ --- Module Name: pkgsrc Committed By: minskim Date: Mon Jul 24 22:00:47 UTC 2006 Modified Files: pkgsrc/x11/xorg-libs: PLIST distinfo pkgsrc/x11/xorg-libs/patches: patch-ad Log Message: Set ForceNormalLib and SharedFontLib to YES regardless of Linux distribution, so that the same set of libraries are built on every Linux distribution. Thanks to Joerg Sonnenberger for guide and review. --- Module Name: pkgsrc Committed By: minskim Date: Wed Jul 26 16:02:21 UTC 2006 Modified Files: pkgsrc/x11/xorg-libs: Makefile PLIST Log Message: Add a missing file on Linux. Bump PKGREVISION. -- Module Name: pkgsrc Committed By: joerg Date: Mon Jul 31 16:39:42 UTC 2006 Modified Files: pkgsrc/x11/xorg-imake: Makefile distinfo pkgsrc/x11/xorg-imake/patches: patch-ac pkgsrc/x11/xorg-libs: Makefile distinfo pkgsrc/x11/xorg-libs/patches: patch-ac Log Message: Don't drop -fno-strict-aliasing on NetBSD/!i386. Fixes PR 34099. Bump revision of xorg-imake and xorg-libs. --- Module Name: pkgsrc Committed By: joerg Date: Mon Aug 14 09:54:39 UTC 2006 Modified Files: pkgsrc/x11/xorg-libs: distinfo Added Files: pkgsrc/x11/xorg-libs/patches: patch-bq Log Message: Don't install os.h and misc.h in server builds, it would override files from xorg-libs. --- Module Name: pkgsrc Committed By: joerg Date: Tue Aug 22 18:12:14 UTC 2006 Modified Files: pkgsrc/x11/xorg-libs: Makefile distinfo pkgsrc/x11/xorg-server: Makefile Log Message: Fix SA21450 using patch from Xorg CVS. Bump revisions of xorg-libs and xorg-server. --- Module Name: pkgsrc Committed By: joerg Date: Wed Aug 23 00:11:08 UTC 2006 Added Files: pkgsrc/x11/xorg-libs/patches: patch-br Log Message: Actually add the patch as well. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.30 2006/07/31 16:39:42 joerg Exp $ d5 1 a5 1 PKGREVISION= 4 a19 3 USE_TOOLS+= perl:run REPLACE_PERL+= config/util/mkhtmlindex.pl @ 1.27 log @Removed the superfluous "quotes" and 'quotes' from variables that don't need them, for example RESTRICTED and SUBST_MESSAGE.*. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.26 2006/02/27 22:58:57 joerg Exp $ d5 1 a5 1 PKGREVISION= 1 @ 1.26 log @Fix the build of xorg-server on NetBSD/amd64. Bump revision of xorg-imake, since the installed files changed. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.25 2006/02/12 15:29:19 xtraeme Exp $ d101 1 a101 1 SUBST_MESSAGE.thr= "Fixes for threadlib.h." @ 1.26.2.1 log @Pullup ticket 1538 - requested by tron security fix for xorg Patch provided by the submitter. Module Name: pkgsrc Committed By: tron Date: Wed May 3 12:23:48 UTC 2006 Modified Files: pkgsrc/x11/xorg-libs: distinfo pkgsrc/x11/xorg-server: Makefile Added Files: pkgsrc/x11/xorg-libs/patches: patch-bh Log Message: Apply patch to fix vulnerability reported in CVE-2006-1526. Bump package revision because of this fix. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.27 2006/04/22 09:22:17 rillig Exp $ d101 1 a101 1 SUBST_MESSAGE.thr= Fixes for threadlib.h. @ 1.25 log @Joerg Sonnenberger will be the maintainer. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.24 2006/01/18 23:53:06 xtraeme Exp $ d5 1 @ 1.24 log @Update meta-pkgs/xorg to 6.9.0. The full list of changes: http://ftp.x.org/pub/X11R7.0/doc/html/RELNOTES2.html Thanks to joerg@@ and reed@@ for testing on DragonFlyBSD. Tested on NetBSD/i386 3.0/-current and DragonFlyBSD-1.4/i386. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.21 2005/09/13 22:51:42 reed Exp $ d9 1 a9 1 MAINTAINER= xtraeme@@NetBSD.org @ 1.23 log @Bumped the PKGREVISION of the packages that have been broken by the recent "pkglint --autofix" change. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.22 2005/12/05 20:51:20 rillig Exp $ a4 1 PKGREVISION= 3 a34 2 @@${CP} ${PKGSRCDIR}/x11/xorg-libs/files/DragonFly.cf \ ${WRKSRC}/config/cf/ d38 1 d54 1 d57 2 a58 2 ${ECHO} "#define XORG_VERSION_MINOR 8"; \ ${ECHO} "#define XORG_VERSION_PATCH 2"; \ @ 1.22 log @Fixed pkglint warnings. The warnings are mostly quoting issues, for example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some other changes are outlined in http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.21 2005/09/13 22:51:42 reed Exp $ d5 1 a5 1 PKGREVISION= 2 @ 1.21 log @Fix the NetBSD.cf pre-formatted manual page make target so it creates the manpage in current build directory instead of unsafely in tmp directory. Discussed with Xorg and XFree86 security teams and fixed there also. Bump PKGREVISION. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.20 2005/08/19 16:46:52 reed Exp $ a40 1 .undef F a55 1 .undef F @ 1.20 log @When doing an UNPRIVILEGED install, it failed with: cannot create /home/reed/pkg/xorg/lib/X11/config/host.def: permission denied I fixed this by chmod NONBINMODE. (Idea from www/apache/Makefile.) @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.19 2005/05/23 19:14:14 xtraeme Exp $ d5 1 a5 1 PKGREVISION= 1 @ 1.19 log @Apply patches from Joerg Sonnenberger for DragonFlyBSD and GCC 3.x.x, while I'm here remove redundant DragonFly.cf from xorg-imake/files, we'll use the same file from xorg-libs. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.18 2005/04/11 21:48:15 tv Exp $ d81 1 @ 1.18 log @Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.17 2005/04/05 10:14:50 adam Exp $ d36 2 a37 1 @@${CP} ${FILESDIR}/DragonFly.cf ${WRKSRC}/config/cf/ @ 1.17 log @Bring back DARWIN_USE_QUARTZ; fix PR#29886 @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.16 2005/03/29 23:32:12 xtraeme Exp $ a15 1 USE_BUILDLINK3= yes @ 1.16 log @Sync SUBST_CLASSES=thr with meta-pkgs/xorg/Makefile.common, which supports NetBSD>=1.6M. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.15 2005/03/22 09:46:10 adam Exp $ d54 1 @ 1.15 log @Added support for Darwin/MacOSX @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.14 2005/03/02 02:07:31 hira Exp $ d94 2 a95 1 .if !empty(MACHINE_PLATFORM:MNetBSD-2.[0-9]*) @ 1.14 log @ Add missing entry to PLIST. Bump PKGREVISION to 1. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.13 2005/03/01 19:00:11 xtraeme Exp $ d71 1 a71 1 cd ${WRKSRC} && ${MAKE} Makefile.boot && \ @ 1.13 log @Update xorg to 6.8.2. Changes: * Render implementation fixes * Updated x86emu and resynced with upstream at Scitech * Updated SiS driver * Updated Nvidia driver (opensource version) * Render acceleration for ATI's R100 and R200-series cards * Substantial speedups in the software implementation of the render extensions when compiled with gcc 3.4 on the i386 architecture. * Infrastructure for rotation support in drivers * New Trapezoid specification for the Render extension o Respecify Render to include only 'normal' traps o Allow backward compatibility but internally covert to new format * Software mouse cursor is now based on the Damage extension * A new keyboard driver is enabled by default. The old driver is disabled unless explicitly compiled in by defining the macro |USE_DEPRECATED_KEYBOARD_DRIVER|. * All extensions (except Xserver-specific extensions "DMX" and "XpExtension")can now be enabled/disabled from the configuration file and from the command line. * Mac OS X updates: o Support dynamic screen configuration changes in rootless mode o Added option to always use Mac command key equivalents o Interpret scroll wheel mouse events correctly when shift is held down o Added trivial Xinput support o Fixed launch of X clients from Finder with a space in their path o Fixed some GLX rendering problems on Mac OS X 10.2 and earlier * Updated xterm version @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.12 2005/01/12 20:21:49 reed Exp $ d5 1 @ 1.12 log @This is for PR #28948 from Todd Willey so DragonFly.cf should set CompessManPages to NO (as the default). Also bump PKGREVISION. (Maybe packages depending on this and on DragonFly should bump their depends.) @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.11 2004/12/27 17:26:18 xtraeme Exp $ a4 1 PKGREVISION= 1 d59 1 a59 1 ${ECHO} "#define XORG_VERSION_PATCH 1"; \ @ 1.11 log @Finish my previous commit and unbreak xorg-*: * Move the subst macros for threadlib.h from xorg-libs to xorg/Makefile.common. * SUBST_CLASSES should be appended. Thanks to Manuel Stuehn for the email showing me the problems. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.10 2004/11/01 23:41:58 xtraeme Exp $ d5 1 @ 1.10 log @Make this build/work on DragonFlyBSD. Patches were submitted by Todd Willey via tech-pkg@@. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.9 2004/09/21 17:38:53 xtraeme Exp $ d93 15 @ 1.10.2.1 log @Pullup ticket 188 - requested by Juan RP build fix for xorg-* Module Name: pkgsrc Committed By: xtraeme Date: Mon Dec 27 17:26:19 UTC 2004 Modified Files: pkgsrc/meta-pkgs/xorg: Makefile.common pkgsrc/x11/xorg-imake: Makefile distinfo pkgsrc/x11/xorg-imake/patches: patch-ac pkgsrc/x11/xorg-libs: Makefile pkgsrc/x11/xorg-server: Makefile Log Message: Finish my previous commit and unbreak xorg-*: * Move the subst macros for threadlib.h from xorg-libs to xorg/Makefile.common. * SUBST_CLASSES should be appended. Thanks to Manuel Stuehn for the email showing me the problems. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.11 2004/12/27 17:26:18 xtraeme Exp $ a92 15 .if !empty(MACHINE_PLATFORM:MNetBSD-2.[0-9]*) . if exists(/usr/include/threadlib.h) SUBST_CLASSES+= thr SUBST_STAGE.thr= post-patch SUBST_FILES.thr= config/cf/NetBSD.cf.in SUBST_SED.thr= -e 's|@@@@NETBSD_THREADLIB@@@@|-DUSE_NBSD_THREADLIB|' SUBST_MESSAGE.thr= "Fixes for threadlib.h." . else SUBST_CLASSES+= nada SUBST_STAGE.nada= post-patch SUBST_FILES.nada= config/cf/NetBSD.cf.in SUBST_SED.nada= -e 's|@@@@NETBSD_THREADLIB@@@@||' . endif .endif @ 1.9 log @Update X.org packages to 6.8.1. To see the changes about this release, please review the "RELNOTES" file, which is available via www or in the distribution tarballs. These packages were tested on: * NetBSD 2.0/-current * Bluewall GNU/Linux * Slackware 10 GNU/Linux I'm currently testing them on FreeBSD 5.3BETA4. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.8 2004/08/04 06:49:41 xtraeme Exp $ d36 1 @ 1.8 log @Fix for xmkmf, which had the buildlink directory embedded to look for config files, fixes PR pkg/26505 by Kouichirou Hiratsuka. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.7 2004/07/31 01:37:23 xtraeme Exp $ a4 1 PKGREVISION= 2 d7 1 a7 1 DISTFILES= X11R6.7.0-src1.tar.gz X11R6.7.0-src3.tar.gz d57 2 a58 2 ${ECHO} "#define XORG_VERSION_MINOR 7"; \ ${ECHO} "#define XORG_VERSION_PATCH 0"; \ @ 1.7 log @As suggested by Kouichirou Hiratsuka in PR pkg/26483, move ProjectRoot definition inside #ifdef BeforeVendorCF, otherwise it's overwritten by xpkgwedge two times. Finally xpkgwedge works, bump PKGREVISION. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.6 2004/07/30 22:47:47 xtraeme Exp $ d41 5 @ 1.6 log @Apply patch from Kouichirou Hiratsuka PR pkg/26480 to not install the header files properly (previous change broke "update" target). @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.5 2004/07/30 08:31:23 xtraeme Exp $ d5 1 a5 1 PKGREVISION= 1 a19 1 CHECK_X11_TYPE= yes d44 4 a47 4 @@${SED} -e "s|@@@@PKGSRC_CC@@@@|${CC}|g" \ -e "s|@@@@PKGSRC_CPP@@@@|${CPP}|g" \ -e "s|@@@@PKGSRC_CXX@@@@|${CXX}|g" \ -e "s|@@@@PKGSRC_CFLAGS@@@@|${CFLAGS}|g" \ d65 1 a65 1 cd ${WRKSRC} && ${MAKE} Makefile.boot && \ d73 15 @ 1.5 log @Remove CHECK_X11_TYPE, now it's already defined in Makefile.common. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.4 2004/07/30 07:22:19 xtraeme Exp $ d17 1 a17 1 USE_DIRS+= xorg-1.0 d49 1 a49 2 ${WRKSRC}/config/cf/${F}.cf.in > \ ${WRKSRC}/config/cf/${F}.cf d69 4 a72 3 # These files are handled by xorg-libs. post-install: @@${RM} -rf ${X11ROOT}/include @ 1.4 log @o Add missing files. o Remove header files, which are handled by xorg-libs. o Don't leave empty version.def, it's needed for some packages (e.g Xft2/builtin.mk, Xrandr/builtin.mk, etc). o Remove duplicated line in do-build target. Bump PKGREVISION. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.3 2004/07/29 07:27:43 xtraeme Exp $ d19 2 a20 1 NO_XORG_TARGETS= # defined @ 1.3 log @Depend on xorg-dirs where appropiate, as was done for XFree86 by jmmv@@. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.2 2004/07/29 06:36:34 xtraeme Exp $ d5 1 d36 1 d38 1 a38 2 @@${MV} ${WRKSRC}/config/cf/${F}.cf \ ${WRKSRC}/config/cf/${F}.cf.in d52 6 a59 2 @@${TOUCH} ${WRKSRC}/config/cf/version.def @@${TOUCH} ${WRKSRC}/config/cf/date.def a61 1 -e "s|@@PREFIX@@|${X11ROOT}|g" \ d69 4 @ 1.2 log @xorg packages now will be installed into ${PREFIX}/xorg by default, so we don't have to conflict between XFree86 and xorg. Suggested by grant@@. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $ d16 1 @ 1.1 log @Initial revision @ text @d1 1 a1 1 # $NetBSD$ a14 2 CONFLICTS+= imake-[0-9]* @ 1.1.1.1 log @Initial import of xorg-imake-6.7.0. The xorg-imake package provides various utilities, such as imake, lndir, mkdirhier, xmkmf, and others. These utilities are from X.org, although an X server and X libraries are not needed. @ text @@