diff options
| author | xtraeme <xtraeme> | 2004-02-02 14:08:27 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme> | 2004-02-02 14:08:27 +0000 |
| commit | 9d062fe1e989e3caf873f451288c5516461822a0 (patch) | |
| tree | 3d08286c071dac4b1fba842de396d1652e6c9a78 /meta-pkgs/XFree86 | |
| parent | 3029e41c6e69a6a208fd177f8736c8b5d673c6a4 (diff) | |
| download | pkgsrc-9d062fe1e989e3caf873f451288c5516461822a0.tar.gz | |
XFree86 meta-package can be now installed with or without xpkgwedge,
installation prefix is ${X11PREFIX}/X11R6.
Bump PKGREVISION.
Diffstat (limited to 'meta-pkgs/XFree86')
| -rw-r--r-- | meta-pkgs/XFree86/Makefile | 4 | ||||
| -rw-r--r-- | meta-pkgs/XFree86/Makefile.common | 29 |
2 files changed, 17 insertions, 16 deletions
diff --git a/meta-pkgs/XFree86/Makefile b/meta-pkgs/XFree86/Makefile index 6b805005f99..bfc44172627 100644 --- a/meta-pkgs/XFree86/Makefile +++ b/meta-pkgs/XFree86/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2004/01/24 09:12:10 xtraeme Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/02 14:08:27 xtraeme Exp $ DISTNAME= # empty PKGNAME= XFree86-${XF_VER} +PKGREVISION= 1 CATEGORIES= meta-pkgs x11 MASTER_SITES= ${MASTER_SITE_XFREE} DISTFILES= # empty @@ -35,5 +36,4 @@ do-install: # empty .include "../../meta-pkgs/XFree86/Makefile.common" - .include "../../mk/bsd.pkg.mk" diff --git a/meta-pkgs/XFree86/Makefile.common b/meta-pkgs/XFree86/Makefile.common index 87c0a197182..9622e2656d6 100644 --- a/meta-pkgs/XFree86/Makefile.common +++ b/meta-pkgs/XFree86/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2004/01/31 19:08:47 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.3 2004/02/02 14:08:28 xtraeme Exp $ # # XBUILD_DIRS is the group of directories under ${WRKSRC} that will # be built in. @@ -26,6 +26,7 @@ USE_GNU_TOOLS+= make WRKSRC?= ${WRKDIR}/xc USE_X11BASE= YES USE_X11_LINKS= NO +X11ROOT= ${X11PREFIX}/X11R6 MASTER_SITE_XFREE+= \ ftp://archive.progeny.com/XFree86/${XF_VER}/source/ \ @@ -36,7 +37,7 @@ MASTER_SITE_XFREE+= \ XF_VER= 4.3.0 -IMAKE= ${X11PREFIX}/bin/imake +IMAKE= ${X11ROOT}/bin/imake XINSTALL_DIRS?= ${XBUILD_DIRS} _XINCLUDE_DIRS= include ${XBUILD_DIRS} ${XINCLUDE_DIRS} @@ -55,20 +56,20 @@ post-extract: -e "s|@MAKE@|${MAKE_PROGRAM}|g" \ -e "s|@MAKE_PROGRAM@|${MAKE_PROGRAM}|g" \ -e "s|@IMAKE@|${IMAKE}|g" \ - -e "s|@RMAN@|${X11PREFIX}/bin/rman|g" \ - -e "s|@MKHTMLINDEX@|${X11PREFIX}/bin/mkhtmlindex|g" \ - -e "s|@GCCMAKEDEP@|${X11PREFIX}/bin/gccmakedep|g" \ - -e "s|@MAKEDEPEND@|${X11PREFIX}/bin/makedepend|g" \ - -e "s|@REVPATH@|${X11PREFIX}/bin/revpath|g" \ - -e "s|@PREFIX@|${X11PREFIX}|g" \ + -e "s|@RMAN@|${X11ROOT}/bin/rman|g" \ + -e "s|@MKHTMLINDEX@|${X11ROOT}/bin/mkhtmlindex|g" \ + -e "s|@GCCMAKEDEP@|${X11ROOT}/bin/gccmakedep|g" \ + -e "s|@MAKEDEPEND@|${X11ROOT}/bin/makedepend|g" \ + -e "s|@REVPATH@|${X11ROOT}/bin/revpath|g" \ + -e "s|@PREFIX@|${X11ROOT}|g" \ -e "s|@LOCALBASE@|${LOCALBASE}|g" \ -e "s|@LDFLAGS@|${LDFLAGS}|g" \ ${FILESDIR}/host.def > ${WRKSRC}/config/cf/host.def - @${LN} -sf ${PREFIX}/bin/gccmakedep ${WRKSRC}/config/util - @${LN} -sf ${PREFIX}/bin/revpath ${WRKSRC}/config/util - @${LN} -sf ${PREFIX}/bin/pswrap ${WRKSRC}/config/pswrap - @${LN} -sf ${PREFIX}/lib/X11/config/version.def ${WRKSRC}/config/cf - @${LN} -sf ${PREFIX}/lib/X11/config/date.def ${WRKSRC}/config/cf + @${LN} -sf ${X11ROOT}/bin/gccmakedep ${WRKSRC}/config/util + @${LN} -sf ${X11ROOT}/bin/revpath ${WRKSRC}/config/util + @${LN} -sf ${X11ROOT}/bin/pswrap ${WRKSRC}/config/pswrap + @${LN} -sf ${X11ROOT}/lib/X11/config/version.def ${WRKSRC}/config/cf + @${LN} -sf ${X11ROOT}/lib/X11/config/date.def ${WRKSRC}/config/cf .if exists(${FILESDIR}/ucs2any.c) @${CP} ${FILESDIR}/ucs2any.c ${WRKSRC}/fonts/util .endif @@ -155,4 +156,4 @@ do-install: done .endif -.endif # ! NO_XFREE86_TARGETS +.endif # NO_XFREE86_TARGETS |