dfports/x11/xorg-clients 6.7.0_3 -> 6.8.1
Hiroki Sato
hrs at allbsd.org
Tue Dec 28 01:24:30 PST 2004
Hi,
Here is a patch to update dfports/x11/xorg-clients from 6.7.0_3
to 6.8.1.
Index: Makefile
===================================================================
RCS file: /cvs/dfports/x11/xorg-clients/Makefile,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 Makefile
--- Makefile 16 Aug 2004 12:30:26 -0000 1.1
+++ Makefile 28 Dec 2004 07:54:45 -0000
@@ -7,13 +7,13 @@
#
PORTNAME= xorg-clients
-PORTVERSION= 6.7.0
-PORTREVISION= 3
+PORTVERSION= 6.8.1
CATEGORIES= x11
-MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/
-DISTFILES= X11R6.7.0-src1.tar.gz \
- X11R6.7.0-src2.tar.gz \
- X11R6.7.0-src3.tar.gz
+MASTER_SITES= ${MASTER_SITE_XORG}
+MASTER_SITE_SUBDIR= X11R6.8.1/tars
+DISTFILES= X11R${PORTVERSION}-src1.tar.gz \
+ X11R${PORTVERSION}-src2.tar.gz \
+ X11R${PORTVERSION}-src3.tar.gz
MAINTAINER= x11 at xxxxxxxxxxx
COMMENT= X client programs and related files from X.Org
Index: distinfo
===================================================================
RCS file: /cvs/dfports/x11/xorg-clients/distinfo,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 distinfo
--- distinfo 16 Aug 2004 12:30:26 -0000 1.1
+++ distinfo 28 Dec 2004 07:54:07 -0000
@@ -1,6 +1,6 @@
-MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5
-SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655
-MD5 (xorg/X11R6.7.0-src2.tar.gz) = 6ef4e8f7647a28f080c10ea1bcf01f79
-SIZE (xorg/X11R6.7.0-src2.tar.gz) = 5739983
-MD5 (xorg/X11R6.7.0-src3.tar.gz) = 4c7144786522bbce383b21ace72bf669
-SIZE (xorg/X11R6.7.0-src3.tar.gz) = 10855793
+MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b
+SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401
+MD5 (xorg/X11R6.8.1-src2.tar.gz) = 6ba36becf1133c61a88c92e1d60c19ed
+SIZE (xorg/X11R6.8.1-src2.tar.gz) = 5808949
+MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3
+SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808
Index: pkg-plist
===================================================================
RCS file: /cvs/dfports/x11/xorg-clients/pkg-plist,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 pkg-plist
--- pkg-plist 16 Aug 2004 12:30:26 -0000 1.1
+++ pkg-plist 28 Dec 2004 07:54:07 -0000
@@ -52,6 +52,7 @@
bin/xditview
bin/xdm
bin/xdpyinfo
+bin/xdriinfo
bin/xedit
bin/xev
bin/xeyes
@@ -81,8 +82,14 @@
bin/xmessage
bin/xmh
bin/xmodmap
+bin/xmore
bin/xon
+bin/xphelloworld
+bin/xplsprinters
+bin/xprehashprinterlist
bin/xprop
+bin/xpsimplehelloworld
+bin/xpxthelloworld
bin/xrandr
bin/xrdb
bin/xrefresh
@@ -141,6 +148,7 @@
lib/X11/app-defaults/XLoad
lib/X11/app-defaults/XLogo
lib/X11/app-defaults/XLogo-color
+lib/X11/app-defaults/XMore
lib/X11/app-defaults/XSm
lib/X11/app-defaults/Xditview
lib/X11/app-defaults/Xditview-chrtr
@@ -344,17 +352,26 @@
lib/X11/x11perfcomp/fillblnk
lib/X11/x11perfcomp/perfboth
lib/X11/x11perfcomp/perfratio
+ at unexec if cmp -s %D/lib/X11/xdm/GiveConsole.default %D/lib/X11/xdm/GiveConsole; then rm -f %D/lib/X11/xdm/GiveConsole; fi
lib/X11/xdm/GiveConsole.default
+ at unexec if cmp -s %D/lib/X11/xdm/TakeConsole.default %D/lib/X11/xdm/TakeConsole; then rm -f %D/lib/X11/xdm/TakeConsole; fi
lib/X11/xdm/TakeConsole.default
+ at unexec if cmp -s %D/lib/X11/xdm/Xaccess.default %D/lib/X11/xdm/Xaccess; then rm -f %D/lib/X11/xdm/Xaccess; fi
lib/X11/xdm/Xaccess.default
+ at unexec if cmp -s %D/lib/X11/xdm/Xresources.default %D/lib/X11/xdm/Xresources; then rm -f %D/lib/X11/xdm/Xresources; fi
lib/X11/xdm/Xresources.default
+ at unexec if cmp -s %D/lib/X11/xdm/Xservers.default %D/lib/X11/xdm/Xservers; then rm -f %D/lib/X11/xdm/Xservers; fi
lib/X11/xdm/Xservers.default
+ at unexec if cmp -s %D/lib/X11/xdm/Xsession.default %D/lib/X11/xdm/Xsession; then rm -f %D/lib/X11/xdm/Xsession; fi
lib/X11/xdm/Xsession.default
+ at unexec if cmp -s %D/lib/X11/xdm/Xsetup_0.default %D/lib/X11/xdm/Xsetup_0; then rm -f %D/lib/X11/xdm/Xsetup_0; fi
lib/X11/xdm/Xsetup_0.default
+ at unexec if cmp -s %D/lib/X11/xdm/Xwilling.default %D/lib/X11/xdm/Xwilling; then rm -f %D/lib/X11/xdm/Xwilling; fi
lib/X11/xdm/Xwilling.default
lib/X11/xdm/chooser
lib/X11/xdm/pixmaps/xorg-bw.xpm
lib/X11/xdm/pixmaps/xorg.xpm
+ at unexec if cmp -s %D/lib/X11/xdm/xdm-config.default %D/lib/X11/xdm/xdm-config; then rm -f %D/lib/X11/xdm/xdm-config; fi
lib/X11/xdm/xdm-config.default
lib/X11/xedit/lisp/indent.lsp
lib/X11/xedit/lisp/lisp.lsp
@@ -373,6 +390,7 @@
lib/X11/xedit/lisp/progmodes/xrdb.lsp
lib/X11/xedit/lisp/syntax.lsp
lib/X11/xedit/lisp/xedit.lsp
+ at unexec if cmp -s %D/lib/X11/xinit/xinitrc.default %D/lib/X11/xinit/xinitrc; then rm -f %D/lib/X11/xinit/xinitrc; fi
lib/X11/xinit/xinitrc.default
lib/X11/xkb/README
lib/X11/xkb/README.config
@@ -493,6 +511,7 @@
lib/X11/xkb/rules/sun
lib/X11/xkb/rules/sun.lst
lib/X11/xkb/rules/xfree86
+lib/X11/xkb/rules/xfree86.lst
lib/X11/xkb/rules/xorg
lib/X11/xkb/rules/xorg-it.lst
lib/X11/xkb/rules/xorg.lst
@@ -731,6 +750,14 @@
lib/X11/xkb/xkbcomp
lib/X11/xman.help
lib/X11/xsm/system.xsm
+ at dirrm lib/X11/icons/redglass/cursors
+ at dirrm lib/X11/icons/redglass
+ at dirrm lib/X11/icons/whiteglass/cursors
+ at dirrm lib/X11/icons/whiteglass
+ at dirrm lib/X11/icons/handhelds/cursors
+ at dirrm lib/X11/icons/handhelds
+ at dirrm lib/X11/icons/default
+ at dirrm lib/X11/xkb/geometry/ibm
@comment xterm workaround
bin/resize
Index: files/manpages
===================================================================
RCS file: /cvs/dfports/x11/xorg-clients/files/manpages,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 manpages
--- files/manpages 16 Aug 2004 12:30:26 -0000 1.1
+++ files/manpages 28 Dec 2004 07:54:07 -0000
@@ -50,6 +50,7 @@
xditview.1 \
xdm.1 \
xdpyinfo.1 \
+ xdriinfo.1 \
xedit.1 \
xev.1 \
xeyes.1 \
@@ -76,8 +77,14 @@
xmessage.1 \
xmh.1 \
xmodmap.1 \
+ xmore.1 \
xon.1 \
+ xphelloworld.1 \
+ xplsprinters.1 \
+ xprehashprinterlist.1 \
xprop.1 \
+ xpsimplehelloworld.1 \
+ xpxthelloworld.1 \
xrandr.1 \
xrdb.1 \
xrefresh.1 \
Index: files/patch-dpsinfo-Imakefile
===================================================================
RCS file: /cvs/dfports/x11/xorg-clients/files/patch-dpsinfo-Imakefile,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 patch-dpsinfo-Imakefile
--- files/patch-dpsinfo-Imakefile 16 Aug 2004 12:30:26 -0000 1.1
+++ files/patch-dpsinfo-Imakefile 28 Dec 2004 07:54:07 -0000
@@ -1,23 +1,15 @@
---- programs/dpsinfo/Imakefile.orig Thu Mar 4 09:48:47 2004
-+++ programs/dpsinfo/Imakefile Sat May 29 16:21:20 2004
-@@ -3,7 +3,6 @@
-
- DEPLIBS = $(DEPDPSLIB) $(DEPXTOOLLIB) $(DEPXONLYLIB)
- LOCAL_LIBRARIES = $(DPSLIB) $(XTOOLLIB) $(XONLYLIB)
-- PSWRAP = PsWrap
-
- SRCS = iwraps.psw dpsinfo.c
-
-@@ -13,10 +12,10 @@
+--- programs/dpsinfo/Imakefile.orig Fri Apr 23 12:54:31 2004
++++ programs/dpsinfo/Imakefile Tue Oct 19 20:05:08 2004
+@@ -13,10 +13,10 @@
.SUFFIXES: .psw .h
-.psw.c : ProgramTargetName($(PSWRAP))
-+.psw.c : PsWrapDependency
++.psw.c :
RunProgram(PSWRAP,-a -o $*.c -h $*.h $<)
-.psw.h : ProgramTargetName($(PSWRAP))
-+.psw.h : PsWrapDependency
++.psw.h :
RunProgram(PSWRAP,-a -h $*.h $< > /dev/null)
depend:: $(DERIVED_FILES)
Index: files/patch-programs_Imakefile
===================================================================
RCS file: /cvs/dfports/x11/xorg-clients/files/patch-programs_Imakefile,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 patch-programs_Imakefile
--- files/patch-programs_Imakefile 16 Aug 2004 12:30:26 -0000 1.1
+++ files/patch-programs_Imakefile 28 Dec 2004 07:54:07 -0000
@@ -1,22 +0,0 @@
-
-$FreeBSD$
-
---- programs/Imakefile.orig Sat Jul 24 02:13:01 2004
-+++ programs/Imakefile Sat Jul 24 02:13:23 2004
-@@ -57,7 +57,6 @@
- XRXSRCDIR = xrx
- #endif
- XSMSRCDIR = xsm
-- XTERMSRCDIR = xterm
- SCRIPTSDIR = scripts
- #endif
- #if BuildCID
-@@ -129,7 +128,7 @@
- xlsclients xlsfonts xmag xman xmessage xmh xmodmap xprop xrdb \
- xrefresh $(XRXSRCDIR) xset \
- xsetroot $(XSMSRCDIR) xstdcmap $(XINPUTCLIENTDIRS) \
-- $(XTERMSRCDIR) $(XTRAPCLIENTDIRS) $(XVIDTUNESRCDIR) xwd xwininfo xwud \
-+ $(XTRAPCLIENTDIRS) $(XVIDTUNESRCDIR) xwd xwininfo xwud \
- $(XPMCLIENTDIRS) $(XVINFOSRCDIR) \
- $(XSSRCDIR) $(XASSRCDIR) $(LBXPROXYSRCDIR) $(SCRIPTSDIR) \
- $(GLXCLIENTDIRS) $(XRANDRDIR) $(XCURSORGENDIR)
Index: files/patch-texteroids
===================================================================
RCS file: /cvs/dfports/x11/xorg-clients/files/patch-texteroids,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 patch-texteroids
--- files/patch-texteroids 16 Aug 2004 12:30:26 -0000 1.1
+++ files/patch-texteroids 28 Dec 2004 07:54:07 -0000
@@ -1,23 +1,15 @@
---- programs/texteroids/Imakefile.orig Mon Sep 2 13:23:43 2002
-+++ programs/texteroids/Imakefile Mon Sep 2 13:27:13 2002
-@@ -3,7 +3,6 @@
- DEPLIBS = $(DEPDPSLIB) $(DEPXTOOLLIB) $(DEPXLIB)
- LOCAL_LIBRARIES = $(XTOOLLIB) $(DPSLIB) $(XLIB)
- SYS_LIBRARIES = MathLibrary
-- PSWRAP = PsWrap
-
- SRCS = twraps.psw texteroids.c
-
-@@ -13,10 +12,10 @@
+--- programs/texteroids/Imakefile.orig Fri Apr 23 12:54:37 2004
++++ programs/texteroids/Imakefile Tue Oct 19 20:07:40 2004
+@@ -13,10 +13,10 @@
.SUFFIXES: .psw .h
-.psw.c : ProgramTargetName($(PSWRAP))
-+.psw.c : PsWrapDependency
++.psw.c :
RunProgram(PSWRAP,-a -o $*.c -h $*.h $<)
-.psw.h : ProgramTargetName($(PSWRAP))
-+.psw.h : PsWrapDependency
++.psw.h :
RunProgram(PSWRAP,-a -h $*.h $< > /dev/null)
depend:: $(DERIVED_FILES)
Index: files/patch-xdm-socket.c
===================================================================
RCS file: /cvs/dfports/x11/xorg-clients/files/patch-xdm-socket.c,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 patch-xdm-socket.c
--- files/patch-xdm-socket.c 16 Aug 2004 12:30:26 -0000 1.1
+++ files/patch-xdm-socket.c 28 Dec 2004 07:54:07 -0000
@@ -1,17 +0,0 @@
-Index: programs/xdm/socket.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/xdm/socket.c,v
-retrieving revision 1.2
-diff -u -r1.2 socket.c
---- programs/xdm/socket.c 23 Apr 2004 19:54:42 -0000 1.2
-+++ programs/xdm/socket.c 6 Jul 2004 00:28:43 -0000
-@@ -67,6 +67,9 @@
- char *name = localHostname ();
- registerHostname (name, strlen (name));
-
-+ if (request_port == 0)
-+ return;
-+
- #if defined(IPv6) && defined(AF_INET6)
- chooserFd = socket (AF_INET6, SOCK_STREAM, 0);
- if (chooserFd == -1)
Index: scripts/configure
===================================================================
RCS file: /cvs/dfports/x11/xorg-clients/scripts/configure,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 configure
--- scripts/configure 16 Aug 2004 12:30:26 -0000 1.1
+++ scripts/configure 28 Dec 2004 07:54:07 -0000
@@ -5,6 +5,7 @@
rm -f $LOCALDEF
echo "#define BuildServer NO" >> $LOCALDEF
echo "#define BuildLBX NO" >> $LOCALDEF
+echo "#define BuildXterm NO" >> $LOCALDEF
echo "#define BuildFontServer NO" >> $LOCALDEF
echo "#define UseInstalledPrograms YES" >> $LOCALDEF
echo "#define UseInstalledLibraries YES" >> $LOCALDEF
Attachment:
pgp00019.pgp
-------------- next part --------------
A non-text attachment was scrubbed...
Name: pgp00019.pgp
Type: application/octet-stream
Size: 187 bytes
Desc: "Description: PGP signature"
URL: <http://lists.dragonflybsd.org/pipermail/submit/attachments/20041228/635f58be/attachment-0018.obj>
More information about the Submit
mailing list