pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11 Unify PLIST. OK'd by xtraeme@.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/20fa523b7678
branches:  trunk
changeset: 491848:20fa523b7678
user:      hira <hira%pkgsrc.org@localhost>
date:      Wed Mar 30 20:29:19 2005 +0000

description:
Unify PLIST.  OK'd by xtraeme@.

diffstat:

 x11/xorg-libs/Makefile             |    30 +-
 x11/xorg-libs/PLIST                |  1451 ++++++++++++++++++++++++++++++++++++
 x11/xorg-libs/PLIST.Darwin         |   163 ----
 x11/xorg-libs/PLIST.DragonFly      |   123 ---
 x11/xorg-libs/PLIST.FreeBSD        |   126 ---
 x11/xorg-libs/PLIST.Linux          |   135 ---
 x11/xorg-libs/PLIST.NetBSD         |   159 ---
 x11/xorg-libs/PLIST.NetBSD.i386    |    30 -
 x11/xorg-libs/PLIST.OpenBSD        |    85 --
 x11/xorg-libs/PLIST.common         |   496 ------------
 x11/xorg-libs/PLIST.common_end     |    67 -
 x11/xorg-libs/PLIST.common_i18n    |    60 -
 x11/xorg-server/Makefile           |    11 +-
 x11/xorg-server/PLIST              |  1268 +++++++++++++++++++++++++++++++
 x11/xorg-server/PLIST.Darwin       |    35 -
 x11/xorg-server/PLIST.DragonFly    |     8 -
 x11/xorg-server/PLIST.FreeBSD      |     8 -
 x11/xorg-server/PLIST.Linux        |    40 -
 x11/xorg-server/PLIST.NetBSD       |     5 -
 x11/xorg-server/PLIST.OpenBSD      |     5 -
 x11/xorg-server/PLIST.common       |   881 ---------------------
 x11/xorg-server/PLIST.common_cards |   257 ------
 x11/xorg-server/PLIST.common_end   |    25 -
 23 files changed, 2738 insertions(+), 2730 deletions(-)

diffs (truncated from 5605 to 300 lines):

diff -r cc8fd72dd1cb -r 20fa523b7678 x11/xorg-libs/Makefile
--- a/x11/xorg-libs/Makefile    Wed Mar 30 20:21:07 2005 +0000
+++ b/x11/xorg-libs/Makefile    Wed Mar 30 20:29:19 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/03/23 22:44:00 xtraeme Exp $
+# $NetBSD: Makefile,v 1.18 2005/03/30 20:29:19 hira Exp $
 
 DISTNAME=              ${DISTFILES}
 PKGNAME=               xorg-libs-${XORG_VER}
@@ -15,6 +15,17 @@
 
 .include "../../mk/bsd.prefs.mk"
 
+PLIST_SRC=             ${WRKDIR}/.PLIST_SRC
+XORG_PLIST_ENTRY=      ${OPSYS}
+.if ${OPSYS} == "NetBSD"
+.  if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64)
+XORG_PLIST_ENTRY+=     NetBSD-i386
+.  endif
+.endif
+.if ${OPSYS} != "Darwin"
+XORG_PLIST_ENTRY+=     i18n
+.endif
+
 .include "../../meta-pkgs/xorg/Makefile.common"
 
 .if ${X11ROOT} == ${LOCALBASE}
@@ -39,8 +50,9 @@
 SUBST_SED.mkstrs=      -e 's,@MAKESTRS@,${X11ROOT}/bin/makestrs,g'
 SUBST_MESSAGE.mkstrs=  "Fixing path of makestrs."
 
+post-install:
+       @${SED} ${XORG_PLIST_SED} ${PKGDIR}/PLIST > ${PLIST_SRC}
 .if ${OPSYS} == "Linux"
-post-install:
        @${LDCONFIG} ${X11ROOT}/lib || ${TRUE}
 .endif
 
@@ -55,20 +67,6 @@
        ${INSTALL_DATA} ${WRKSRC}/${f} ${X11BASE}/lib/pkgconfig/${f}
 .endfor
 
-.if ${OPSYS} == "NetBSD"
-.  if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64)
-PLIST_SRC+=    ${.CURDIR}/PLIST.${OPSYS}
-PLIST_SRC+=    ${.CURDIR}/PLIST.${OPSYS}.i386
-.  endif
-.else
-PLIST_SRC+=     ${.CURDIR}/PLIST.${OPSYS}
-.endif
-PLIST_SRC+=    ${.CURDIR}/PLIST.common
-.if ${OPSYS} != "Darwin"
-PLIST_SRC+=    ${.CURDIR}/PLIST.common_i18n
-.endif
-PLIST_SRC+=    ${.CURDIR}/PLIST.common_end
-
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
diff -r cc8fd72dd1cb -r 20fa523b7678 x11/xorg-libs/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xorg-libs/PLIST       Wed Mar 30 20:29:19 2005 +0000
@@ -0,0 +1,1451 @@
+@comment $NetBSD: PLIST,v 1.1 2005/03/30 20:29:19 hira Exp $
+${X11ROOT_PREFIX}/include/DPS/ColorSB.h
+${X11ROOT_PREFIX}/include/DPS/ColorSBP.h
+${X11ROOT_PREFIX}/include/DPS/DPSScrollW.h
+${X11ROOT_PREFIX}/include/DPS/DPSScrollWP.h
+${X11ROOT_PREFIX}/include/DPS/FontCreatP.h
+${X11ROOT_PREFIX}/include/DPS/FontCreato.h
+${X11ROOT_PREFIX}/include/DPS/FontSB.h
+${X11ROOT_PREFIX}/include/DPS/FontSBP.h
+${X11ROOT_PREFIX}/include/DPS/FontSamplP.h
+${X11ROOT_PREFIX}/include/DPS/FontSample.h
+${X11ROOT_PREFIX}/include/DPS/PSres.h
+${X11ROOT_PREFIX}/include/DPS/XDPS.h
+${X11ROOT_PREFIX}/include/DPS/XDPSlib.h
+${X11ROOT_PREFIX}/include/DPS/XDPSproto.h
+${X11ROOT_PREFIX}/include/DPS/dpsNXargs.h
+${X11ROOT_PREFIX}/include/DPS/dpsXclient.h
+${X11ROOT_PREFIX}/include/DPS/dpsXcommon.h
+${X11ROOT_PREFIX}/include/DPS/dpsXpreview.h
+${X11ROOT_PREFIX}/include/DPS/dpsXshare.h
+${X11ROOT_PREFIX}/include/DPS/dpsXuserpath.h
+${X11ROOT_PREFIX}/include/DPS/dpsclient.h
+${X11ROOT_PREFIX}/include/DPS/dpsconfig.h
+${X11ROOT_PREFIX}/include/DPS/dpsexcept.h
+${X11ROOT_PREFIX}/include/DPS/dpsfriends.h
+${X11ROOT_PREFIX}/include/DPS/dpsops.h
+${X11ROOT_PREFIX}/include/DPS/psops.h
+${X11ROOT_PREFIX}/include/GL/GLwDrawA.h
+${X11ROOT_PREFIX}/include/GL/GLwDrawAP.h
+${X11ROOT_PREFIX}/include/GL/GLwMDrawA.h
+${X11ROOT_PREFIX}/include/GL/GLwMDrawAP.h
+${X11ROOT_PREFIX}/include/GL/gl.h
+${X11ROOT_PREFIX}/include/GL/glext.h
+${X11ROOT_PREFIX}/include/GL/glu.h
+${X11ROOT_PREFIX}/include/GL/glx.h
+${X11ROOT_PREFIX}/include/GL/glxext.h
+${X11ROOT_PREFIX}/include/GL/glxint.h
+${X11ROOT_PREFIX}/include/GL/glxmd.h
+${X11ROOT_PREFIX}/include/GL/glxproto.h
+${X11ROOT_PREFIX}/include/GL/glxtokens.h
+${X11ROOT_PREFIX}/include/GL/osmesa.h
+${X11ROOT_PREFIX}/include/X11/Composite.h
+${X11ROOT_PREFIX}/include/X11/CompositeP.h
+${X11ROOT_PREFIX}/include/X11/ConstrainP.h
+${X11ROOT_PREFIX}/include/X11/Constraint.h
+${X11ROOT_PREFIX}/include/X11/Core.h
+${X11ROOT_PREFIX}/include/X11/CoreP.h
+${X11ROOT_PREFIX}/include/X11/DECkeysym.h
+${X11ROOT_PREFIX}/include/X11/HPkeysym.h
+${X11ROOT_PREFIX}/include/X11/ICE/ICE.h
+${X11ROOT_PREFIX}/include/X11/ICE/ICEconn.h
+${X11ROOT_PREFIX}/include/X11/ICE/ICElib.h
+${X11ROOT_PREFIX}/include/X11/ICE/ICEmsg.h
+${X11ROOT_PREFIX}/include/X11/ICE/ICEproto.h
+${X11ROOT_PREFIX}/include/X11/ICE/ICEutil.h
+${X11ROOT_PREFIX}/include/X11/Intrinsic.h
+${X11ROOT_PREFIX}/include/X11/IntrinsicP.h
+${X11ROOT_PREFIX}/include/X11/Object.h
+${X11ROOT_PREFIX}/include/X11/ObjectP.h
+${X11ROOT_PREFIX}/include/X11/RectObj.h
+${X11ROOT_PREFIX}/include/X11/RectObjP.h
+${X11ROOT_PREFIX}/include/X11/SM/SM.h
+${X11ROOT_PREFIX}/include/X11/SM/SMlib.h
+${X11ROOT_PREFIX}/include/X11/SM/SMproto.h
+${X11ROOT_PREFIX}/include/X11/Shell.h
+${X11ROOT_PREFIX}/include/X11/ShellP.h
+${X11ROOT_PREFIX}/include/X11/StringDefs.h
+${X11ROOT_PREFIX}/include/X11/Sunkeysym.h
+${X11ROOT_PREFIX}/include/X11/Vendor.h
+${X11ROOT_PREFIX}/include/X11/VendorP.h
+${X11ROOT_PREFIX}/include/X11/X.h
+${X11ROOT_PREFIX}/include/X11/X10.h
+${X11ROOT_PREFIX}/include/X11/XF86keysym.h
+${X11ROOT_PREFIX}/include/X11/XKBlib.h
+${X11ROOT_PREFIX}/include/X11/XWDFile.h
+${X11ROOT_PREFIX}/include/X11/Xalloca.h
+${X11ROOT_PREFIX}/include/X11/Xarch.h
+${X11ROOT_PREFIX}/include/X11/Xatom.h
+${X11ROOT_PREFIX}/include/X11/Xauth.h
+${X11ROOT_PREFIX}/include/X11/Xaw/AllWidgets.h
+${X11ROOT_PREFIX}/include/X11/Xaw/AsciiSink.h
+${X11ROOT_PREFIX}/include/X11/Xaw/AsciiSinkP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/AsciiSrc.h
+${X11ROOT_PREFIX}/include/X11/Xaw/AsciiSrcP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/AsciiText.h
+${X11ROOT_PREFIX}/include/X11/Xaw/AsciiTextP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Box.h
+${X11ROOT_PREFIX}/include/X11/Xaw/BoxP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Cardinals.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Command.h
+${X11ROOT_PREFIX}/include/X11/Xaw/CommandP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Dialog.h
+${X11ROOT_PREFIX}/include/X11/Xaw/DialogP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Form.h
+${X11ROOT_PREFIX}/include/X11/Xaw/FormP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Grip.h
+${X11ROOT_PREFIX}/include/X11/Xaw/GripP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Label.h
+${X11ROOT_PREFIX}/include/X11/Xaw/LabelP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/List.h
+${X11ROOT_PREFIX}/include/X11/Xaw/ListP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/MenuButtoP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/MenuButton.h
+${X11ROOT_PREFIX}/include/X11/Xaw/MultiSink.h
+${X11ROOT_PREFIX}/include/X11/Xaw/MultiSinkP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/MultiSrc.h
+${X11ROOT_PREFIX}/include/X11/Xaw/MultiSrcP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Paned.h
+${X11ROOT_PREFIX}/include/X11/Xaw/PanedP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Panner.h
+${X11ROOT_PREFIX}/include/X11/Xaw/PannerP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Porthole.h
+${X11ROOT_PREFIX}/include/X11/Xaw/PortholeP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Print.h
+${X11ROOT_PREFIX}/include/X11/Xaw/PrintSP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Repeater.h
+${X11ROOT_PREFIX}/include/X11/Xaw/RepeaterP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Reports.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Scrollbar.h
+${X11ROOT_PREFIX}/include/X11/Xaw/ScrollbarP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Simple.h
+${X11ROOT_PREFIX}/include/X11/Xaw/SimpleMenP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/SimpleMenu.h
+${X11ROOT_PREFIX}/include/X11/Xaw/SimpleP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Sme.h
+${X11ROOT_PREFIX}/include/X11/Xaw/SmeBSB.h
+${X11ROOT_PREFIX}/include/X11/Xaw/SmeBSBP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/SmeLine.h
+${X11ROOT_PREFIX}/include/X11/Xaw/SmeLineP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/SmeP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/StripCharP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/StripChart.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Template.c
+${X11ROOT_PREFIX}/include/X11/Xaw/Template.h
+${X11ROOT_PREFIX}/include/X11/Xaw/TemplateP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Text.h
+${X11ROOT_PREFIX}/include/X11/Xaw/TextP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/TextSink.h
+${X11ROOT_PREFIX}/include/X11/Xaw/TextSinkP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/TextSrc.h
+${X11ROOT_PREFIX}/include/X11/Xaw/TextSrcP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Tip.h
+${X11ROOT_PREFIX}/include/X11/Xaw/TipP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Toggle.h
+${X11ROOT_PREFIX}/include/X11/Xaw/ToggleP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Tree.h
+${X11ROOT_PREFIX}/include/X11/Xaw/TreeP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/VendorEP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Viewport.h
+${X11ROOT_PREFIX}/include/X11/Xaw/ViewportP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/XawImP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/XawInit.h
+${X11ROOT_PREFIX}/include/X11/Xcms.h
+${X11ROOT_PREFIX}/include/X11/Xdefs.h
+${X11ROOT_PREFIX}/include/X11/Xdmcp.h
+${X11ROOT_PREFIX}/include/X11/Xfuncproto.h
+${X11ROOT_PREFIX}/include/X11/Xfuncs.h
+${X11ROOT_PREFIX}/include/X11/Xlib.h
+${X11ROOT_PREFIX}/include/X11/Xlibint.h
+${X11ROOT_PREFIX}/include/X11/Xlocale.h
+${X11ROOT_PREFIX}/include/X11/Xmd.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Atoms.h
+${X11ROOT_PREFIX}/include/X11/Xmu/CharSet.h
+${X11ROOT_PREFIX}/include/X11/Xmu/CloseHook.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Converters.h
+${X11ROOT_PREFIX}/include/X11/Xmu/CurUtil.h
+${X11ROOT_PREFIX}/include/X11/Xmu/CvtCache.h
+${X11ROOT_PREFIX}/include/X11/Xmu/DisplayQue.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Drawing.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Editres.h
+${X11ROOT_PREFIX}/include/X11/Xmu/EditresP.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Error.h
+${X11ROOT_PREFIX}/include/X11/Xmu/ExtAgent.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Initer.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Lookup.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Misc.h
+${X11ROOT_PREFIX}/include/X11/Xmu/StdCmap.h
+${X11ROOT_PREFIX}/include/X11/Xmu/StdSel.h
+${X11ROOT_PREFIX}/include/X11/Xmu/SysUtil.h
+${X11ROOT_PREFIX}/include/X11/Xmu/WidgetNode.h
+${X11ROOT_PREFIX}/include/X11/Xmu/WinUtil.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Xct.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Xmu.h
+${X11ROOT_PREFIX}/include/X11/Xos.h
+${X11ROOT_PREFIX}/include/X11/Xos_r.h
+${X11ROOT_PREFIX}/include/X11/Xosdefs.h
+${X11ROOT_PREFIX}/include/X11/Xpoll.h
+${X11ROOT_PREFIX}/include/X11/XprintAppUtil/xpapputil.h
+${X11ROOT_PREFIX}/include/X11/XprintUtil/xprintutil.h
+${X11ROOT_PREFIX}/include/X11/Xproto.h
+${X11ROOT_PREFIX}/include/X11/Xprotostr.h
+${X11ROOT_PREFIX}/include/X11/Xresource.h
+${X11ROOT_PREFIX}/include/X11/Xthreads.h
+${X11ROOT_PREFIX}/include/X11/Xutil.h
+${X11ROOT_PREFIX}/include/X11/ap_keysym.h
+${X11ROOT_PREFIX}/include/X11/bitmaps/1x1
+${X11ROOT_PREFIX}/include/X11/bitmaps/2x2
+${X11ROOT_PREFIX}/include/X11/bitmaps/black
+${X11ROOT_PREFIX}/include/X11/bitmaps/boxes
+${X11ROOT_PREFIX}/include/X11/bitmaps/calculator
+${X11ROOT_PREFIX}/include/X11/bitmaps/cntr_ptr
+${X11ROOT_PREFIX}/include/X11/bitmaps/cntr_ptrmsk
+${X11ROOT_PREFIX}/include/X11/bitmaps/cross_weave
+${X11ROOT_PREFIX}/include/X11/bitmaps/dimple1
+${X11ROOT_PREFIX}/include/X11/bitmaps/dimple3
+${X11ROOT_PREFIX}/include/X11/bitmaps/dot
+${X11ROOT_PREFIX}/include/X11/bitmaps/dropbar7
+${X11ROOT_PREFIX}/include/X11/bitmaps/dropbar8
+${X11ROOT_PREFIX}/include/X11/bitmaps/escherknot
+${X11ROOT_PREFIX}/include/X11/bitmaps/flagdown
+${X11ROOT_PREFIX}/include/X11/bitmaps/flagup
+${X11ROOT_PREFIX}/include/X11/bitmaps/flipped_gray
+${X11ROOT_PREFIX}/include/X11/bitmaps/gray
+${X11ROOT_PREFIX}/include/X11/bitmaps/gray1
+${X11ROOT_PREFIX}/include/X11/bitmaps/gray3
+${X11ROOT_PREFIX}/include/X11/bitmaps/grid16
+${X11ROOT_PREFIX}/include/X11/bitmaps/grid2
+${X11ROOT_PREFIX}/include/X11/bitmaps/grid4
+${X11ROOT_PREFIX}/include/X11/bitmaps/grid8
+${X11ROOT_PREFIX}/include/X11/bitmaps/hlines2
+${X11ROOT_PREFIX}/include/X11/bitmaps/hlines3
+${X11ROOT_PREFIX}/include/X11/bitmaps/icon
+${X11ROOT_PREFIX}/include/X11/bitmaps/keyboard16
+${X11ROOT_PREFIX}/include/X11/bitmaps/left_ptr
+${X11ROOT_PREFIX}/include/X11/bitmaps/left_ptrmsk
+${X11ROOT_PREFIX}/include/X11/bitmaps/letters
+${X11ROOT_PREFIX}/include/X11/bitmaps/light_gray
+${X11ROOT_PREFIX}/include/X11/bitmaps/mailempty
+${X11ROOT_PREFIX}/include/X11/bitmaps/mailemptymsk
+${X11ROOT_PREFIX}/include/X11/bitmaps/mailfull
+${X11ROOT_PREFIX}/include/X11/bitmaps/mailfullmsk
+${X11ROOT_PREFIX}/include/X11/bitmaps/mensetmanus
+${X11ROOT_PREFIX}/include/X11/bitmaps/menu10
+${X11ROOT_PREFIX}/include/X11/bitmaps/menu12
+${X11ROOT_PREFIX}/include/X11/bitmaps/menu16
+${X11ROOT_PREFIX}/include/X11/bitmaps/menu6
+${X11ROOT_PREFIX}/include/X11/bitmaps/menu8



Home | Main Index | Thread Index | Old Index