summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2004-07-30 07:22:19 +0000
committerxtraeme <xtraeme@pkgsrc.org>2004-07-30 07:22:19 +0000
commitaefcbc08415c6554b9a3fce15aab450a7295e771 (patch)
treef92f602c5e5069720a2dadf50227cadb1fe15067 /x11
parenta6ee471f881ade06b352a0f42ac3c26404e895fc (diff)
downloadpkgsrc-aefcbc08415c6554b9a3fce15aab450a7295e771.tar.gz
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.
Diffstat (limited to 'x11')
-rw-r--r--x11/xorg-imake/Makefile20
-rw-r--r--x11/xorg-imake/PLIST5
2 files changed, 18 insertions, 7 deletions
diff --git a/x11/xorg-imake/Makefile b/x11/xorg-imake/Makefile
index 647ef6c9a37..3bab9a4fbdc 100644
--- a/x11/xorg-imake/Makefile
+++ b/x11/xorg-imake/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/07/29 07:27:43 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2004/07/30 07:22:19 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-imake-${XORG_VER}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG}
DISTFILES= X11R6.7.0-src1.tar.gz X11R6.7.0-src3.tar.gz
@@ -32,9 +33,9 @@ PLIST_SUBST+= LNDIR=
.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
+ @${MV} ${WRKSRC}/config/cf/${F}.cf ${WRKSRC}/config/cf/${F}.cf.in
.endfor
.undef F
@@ -48,13 +49,16 @@ pre-configure:
${WRKSRC}/config/cf/${F}.cf
.endfor
.undef F
+ @( \
+ ${ECHO} "#define XORG_VERSION_MAJOR 6"; \
+ ${ECHO} "#define XORG_VERSION_MINOR 7"; \
+ ${ECHO} "#define XORG_VERSION_PATCH 0"; \
+ ${ECHO} "#define XORG_VERSION_SNAP 0"; \
+ ) > ${WRKSRC}/config/cf/version.def
do-build:
- @${TOUCH} ${WRKSRC}/config/cf/version.def
- @${TOUCH} ${WRKSRC}/config/cf/date.def
@${CP} ${FILESDIR}/xorgsite.def ${WRKSRC}/config/cf
@${SED} -e "s|@PREFIX@|${X11ROOT}|g" \
- -e "s|@PREFIX@|${X11ROOT}|g" \
-e "s|@BLNK@|${BUILDLINK_DIR}|g" \
-e "s|@LOCALBASE@|${LOCALBASE}|g " \
-e "s|@MAKE@|${MAKE_PROGRAM}|" ${FILESDIR}/host.def > \
@@ -62,4 +66,8 @@ do-build:
cd ${WRKSRC} && ${MAKE} Makefile.boot && \
${MAKE_PROGRAM} -f xmakefile VerifyOS version.def Makefiles includes
+# These files are handled by xorg-libs.
+post-install:
+ @${RM} -rf ${X11ROOT}/include
+
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xorg-imake/PLIST b/x11/xorg-imake/PLIST
index a6f620f208c..9a832b51ef7 100644
--- a/x11/xorg-imake/PLIST
+++ b/x11/xorg-imake/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/07/30 07:22:19 xtraeme Exp $
${X11ROOT_PREFIX}/bin/ccmakedep
${X11ROOT_PREFIX}/bin/cleanlinks
${X11ROOT_PREFIX}/bin/gccmakedep
@@ -119,6 +119,9 @@ ${X11ROOT_PREFIX}/lib/X11/config/xf86.rules
${X11ROOT_PREFIX}/lib/X11/config/xf86.tmpl
${X11ROOT_PREFIX}/lib/X11/config/xf86site.def
${X11ROOT_PREFIX}/lib/X11/config/xfree86.cf
+${X11ROOT_PREFIX}/lib/X11/config/xorg.cf
+${X11ROOT_PREFIX}/lib/X11/config/xorg.tmpl
+${X11ROOT_PREFIX}/lib/X11/config/xorgsite.def
${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/ccmakedep.${MAN_SUFFIX}
${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/cleanlinks.${MAN_SUFFIX}
${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/gccmakedep.${MAN_SUFFIX}