[pkgsrc/trunk]: pkgsrc XFree86 meta-package can be now installed with or with...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc XFree86 meta-package can be now installed with or with...
From: xtraeme <xtraeme%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:28:06 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/e53fe0ceb8f7
branches:  trunk
changeset: 467541:e53fe0ceb8f7
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Mon Feb 02 14:08:27 2004 +0000

description:
XFree86 meta-package can be now installed with or without xpkgwedge,
installation prefix is ${X11PREFIX}/X11R6.

Bump PKGREVISION.

diffstat:

 meta-pkgs/XFree86/Makefile         |     4 +-
 meta-pkgs/XFree86/Makefile.common  |    29 +-
 x11/XFree86-clients/Makefile       |    11 +-
 x11/XFree86-clients/PLIST          |  1734 ++++++++++++++++++-----------------
 x11/XFree86-clients/files/host.def |     4 +-
 x11/XFree86-libs/Makefile          |    14 +-
 x11/XFree86-libs/PLIST.Linux       |    70 +-
 x11/XFree86-libs/PLIST.NetBSD      |    62 +-
 x11/XFree86-libs/PLIST.common      |  1326 +++++++++++++-------------
 x11/XFree86-libs/buildlink2.mk     |   120 +-
 x11/XFree86-server/Makefile        |    11 +-
 x11/XFree86-server/PLIST           |   580 ++++++------
 x11/XFree86-server/files/host.def  |     4 +-
 x11/imake/Makefile                 |     5 +-
 x11/imake/PLIST                    |   280 ++--
 x11/imake/files/host.def           |     4 +-
 16 files changed, 2167 insertions(+), 2091 deletions(-)

diffs (truncated from 4470 to 300 lines):

diff -r 061b909769ce -r e53fe0ceb8f7 meta-pkgs/XFree86/Makefile
--- a/meta-pkgs/XFree86/Makefile        Mon Feb 02 13:02:49 2004 +0000
+++ b/meta-pkgs/XFree86/Makefile        Mon Feb 02 14:08:27 2004 +0000
@@ -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 @@
        # empty
 
 .include "../../meta-pkgs/XFree86/Makefile.common"
-
 .include "../../mk/bsd.pkg.mk"
diff -r 061b909769ce -r e53fe0ceb8f7 meta-pkgs/XFree86/Makefile.common
--- a/meta-pkgs/XFree86/Makefile.common Mon Feb 02 13:02:49 2004 +0000
+++ b/meta-pkgs/XFree86/Makefile.common Mon Feb 02 14:08:27 2004 +0000
@@ -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 @@
 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 @@
 
 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 @@
                -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 @@
        done
 .endif
 
-.endif # ! NO_XFREE86_TARGETS
+.endif # NO_XFREE86_TARGETS
diff -r 061b909769ce -r e53fe0ceb8f7 x11/XFree86-clients/Makefile
--- a/x11/XFree86-clients/Makefile      Mon Feb 02 13:02:49 2004 +0000
+++ b/x11/XFree86-clients/Makefile      Mon Feb 02 14:08:27 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2004/01/31 16:15:12 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/02/02 14:16:07 xtraeme Exp $
 
 DISTNAME=              ${DISTFILES}
 PKGNAME=               XFree86-clients-${XF_VER}
+PKGREVISION=           1
 CATEGORIES=            x11
 MASTER_SITES=          ${MASTER_SITE_XFREE}
 DISTFILES=             X430src-1.tgz X430src-2.tgz \
@@ -22,6 +23,12 @@
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${OPSYS} == "NetBSD"
+PLIST_SUBST+=          MANPAGE_SUFFIX=${IMAKE_MANNEWSUFFIX}
+.else
+PLIST_SUBST+=          MANPAGE_SUFFIX=${IMAKE_LIBMAN_SUFFIX}
+.endif
+
 .if ${OPSYS} == "Linux"
 .  include "../../security/PAM/buildlink2.mk"
 .endif
@@ -30,7 +37,7 @@
        @${MKDIR} ${WRKSRC}/exports/lib
        @for l in fntstubs Xss FS fontenc Xau Xxf86vm Xxf86dga xkbfile \
                Xxf86misc Xdmcp Xfontcache Xinerama Xfont; do \
-               ${LN} -sf ${PREFIX}/lib/lib$${l}.a ${WRKSRC}/exports/lib/; \
+               ${LN} -sf ${X11ROOT}/lib/lib$${l}.a ${WRKSRC}/exports/lib/; \
        done
 
 .include "../../fonts/Xft2/buildlink2.mk"
diff -r 061b909769ce -r e53fe0ceb8f7 x11/XFree86-clients/PLIST
--- a/x11/XFree86-clients/PLIST Mon Feb 02 13:02:49 2004 +0000
+++ b/x11/XFree86-clients/PLIST Mon Feb 02 14:08:27 2004 +0000
@@ -1,846 +1,888 @@
-@comment $NetBSD: PLIST,v 1.1 2004/01/31 15:27:14 xtraeme Exp $
-bin/Xmark
-bin/appres
-bin/atobm
-bin/bdftopcf
-bin/bdftruncate
-bin/beforelight
-bin/bitmap
-bin/bmtoa
-bin/cxpm
-bin/dga
-bin/dpsexec
-bin/dpsinfo
-bin/editres
-bin/fslsfonts
-bin/fstobdf
-bin/glxgears
-bin/glxinfo
-bin/iceauth
-bin/ico
-bin/lbxproxy
-bin/listres
-bin/luit
-bin/makepsres
-bin/mkcfm
-bin/mkfontdir
-bin/mkfontscale
-bin/oclock
-bin/proxymngr
-bin/resize
-bin/rstart
-bin/rstartd
-bin/sessreg
-bin/setxkbmap
-bin/showfont
-bin/showrgb
-bin/smproxy
-bin/startx
-bin/sxpm
-bin/texteroids
-bin/twm
-bin/ucs2any
-bin/uxterm
-bin/viewres
-bin/x11perf
-bin/x11perfcomp
-bin/xauth
-bin/xbiff
-bin/xcalc
-bin/xclipboard
-bin/xclock
-bin/xcmsdb
-bin/xconsole
-bin/xcursorgen
-bin/xcutsel
-bin/xditview
-bin/xdm
-bin/xdpyinfo
-bin/xedit
-bin/xev
-bin/xeyes
-bin/xfd
-bin/xfindproxy
-bin/xfontsel
-bin/xfsinfo
-bin/xfwp
-bin/xgamma
-bin/xgc
-bin/xhost
-bin/xinit
-bin/xkbbell
-bin/xkbcomp
-bin/xkbevd
-bin/xkbprint
-bin/xkbvleds
-bin/xkbwatch
-bin/xkill
-bin/xload
-bin/xlogo
-bin/xlsatoms
-bin/xlsclients
-bin/xlsfonts
-bin/xmag
-bin/xman
-bin/xmessage
-bin/xmh
-bin/xmodmap
-bin/xon
-bin/xprop
-bin/xrandr
-bin/xrdb
-bin/xrefresh
-bin/xset
-bin/xsetmode
-bin/xsetpointer
-bin/xsetroot
-bin/xsm
-bin/xstdcmap
-bin/xterm
-bin/xtrapchar
-bin/xtrapin
-bin/xtrapinfo
-bin/xtrapout
-bin/xtrapproto
-bin/xtrapreset
-bin/xtrapstats
-bin/xvidtune
-bin/xvinfo
-bin/xwd
-bin/xwininfo
-bin/xwud
-lib/X11/app-defaults/Beforelight
-lib/X11/app-defaults/Bitmap
-lib/X11/app-defaults/Bitmap-color
-lib/X11/app-defaults/Chooser
-lib/X11/app-defaults/Clock-color
-lib/X11/app-defaults/Editres
-lib/X11/app-defaults/Editres-color
-lib/X11/app-defaults/UXTerm
-lib/X11/app-defaults/Viewres
-lib/X11/app-defaults/XCalc
-lib/X11/app-defaults/XCalc-color
-lib/X11/app-defaults/XClipboard
-lib/X11/app-defaults/XClock
-lib/X11/app-defaults/XConsole
-lib/X11/app-defaults/XFontSel
-lib/X11/app-defaults/XLoad
-lib/X11/app-defaults/XLogo
-lib/X11/app-defaults/XLogo-color
-lib/X11/app-defaults/XSm
-lib/X11/app-defaults/XTerm
-lib/X11/app-defaults/XTerm-color
-lib/X11/app-defaults/Xditview
-lib/X11/app-defaults/Xditview-chrtr
-lib/X11/app-defaults/Xedit
-lib/X11/app-defaults/Xedit-color
-lib/X11/app-defaults/Xfd
-lib/X11/app-defaults/Xgc
-lib/X11/app-defaults/Xmag
-lib/X11/app-defaults/Xman
-lib/X11/app-defaults/Xmessage
-lib/X11/app-defaults/Xmessage-color
-lib/X11/app-defaults/Xmh
-lib/X11/app-defaults/Xvidtune
-include/X11/PM/PM.h
-include/X11/PM/PMproto.h
-include/X11/bitmaps/Dashes
-include/X11/bitmaps/Down
-include/X11/bitmaps/Excl
-include/X11/bitmaps/FlipHoriz
-include/X11/bitmaps/FlipVert
-include/X11/bitmaps/Fold
-include/X11/bitmaps/Left
-include/X11/bitmaps/Right
-include/X11/bitmaps/RotateLeft
-include/X11/bitmaps/RotateRight
-include/X11/bitmaps/Stipple
-include/X11/bitmaps/Term
-include/X11/bitmaps/Up
-include/X11/bitmaps/black6
-include/X11/bitmaps/box6
-include/X11/bitmaps/ldblarrow
-include/X11/bitmaps/rdblarrow
-lib/X11/etc/xterm.termcap
-lib/X11/etc/xterm.terminfo
-lib/X11/fonts/util/map-ISO8859-1
-lib/X11/fonts/util/map-ISO8859-10
-lib/X11/fonts/util/map-ISO8859-11
-lib/X11/fonts/util/map-ISO8859-13
-lib/X11/fonts/util/map-ISO8859-14
-lib/X11/fonts/util/map-ISO8859-15
-lib/X11/fonts/util/map-ISO8859-16
-lib/X11/fonts/util/map-ISO8859-2
-lib/X11/fonts/util/map-ISO8859-3
-lib/X11/fonts/util/map-ISO8859-4
-lib/X11/fonts/util/map-ISO8859-5
-lib/X11/fonts/util/map-ISO8859-7
-lib/X11/fonts/util/map-ISO8859-8
Prev by Date: [pkgsrc/trunk]: pkgsrc These packages need a C++ compiler.
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Note bump PKGREVISION to XFree86* packages, they c...
Previous by Thread: [pkgsrc/trunk]: pkgsrc These packages need a C++ compiler.
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Note bump PKGREVISION to XFree86* packages, they c...
Indexes:
Home | Main Index | Thread Index | Old Index