Date: Fri, 22 Jun 2007 15:22:34 +0200 From: Dejan Lesjak <dejan.lesjak@ijs.si> To: freebsd-x11@freebsd.org Subject: Several updates and fixes patch Message-ID: <200706221522.34258.dejan.lesjak@ijs.si>
next in thread | raw e-mail | index | archive | help
--Boundary-00=_a08eG/BT3v5sxmi
Content-Type: text/plain;
charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
So here's a largish patch with updates (submitted by chinsan) and some fixups
including:
devel/makedepend: upgrade to 1.0.1 (ports/113578)
x11/libSM: upgrade to 1.0.3 (ports/113581)
x11/libXcomposite: upgrade to 0.3.2 (ports/113580)
x11/libXinerama: upgrade to 1.0.2 (ports/113584)
x11/libXtst: upgrade to 1.0.2 (ports/113587)
x11/xdpyinfo: upgrade to 1.0.2 (ports/113585)
x11/xinit: upgrade to 1.0.4 (ports/113586)
x11/xload: upgrade to 1.0.2 (ports/113589)
x11-fonts/bdftopcf: upgrade to 1.0.1 (ports/113591)
x11-fonts/mkfontdir: upgrade to 1.0.3 (ports/113590)
x11-toolkits/libXaw: upgrade to 1.0.3 (ports/113593)
x11/xorg-libraries: rewording of error message (submitted by grog) and
autoadjusting /etc/rc.conf, /etc/periodic.conf and /etc/manpath.conf as
mergebase.sh already does but here for the cases of fresh install after
symlink creation
x11/xdm: replace placeholder XDMCONFIGDIR with proper value in Xreset and
Xstartup script (ports/113029); don't clobber user modifiable config files
and scripts (ports/113894)
x11/xorg-apps: only depend on xsm if /usr/bin/rsh is present (ports/112806)
x11-fonts/xfs: use FONTCACHE by default as before 7.x and add
WITHOUT_XFS_CACHE knob.
x11/libX11: bump revision after patch for XGetMotionEvents prototype and some
whitespace cleanup (submitted by chinsan)
Please review and if possible give it a test.
Dejan
--Boundary-00=_a08eG/BT3v5sxmi
Content-Type: text/plain; charset="us-ascii"; name="rollup-20070614_4.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="rollup-20070614_4.patch"
Index: devel/makedepend/Makefile
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/devel/makedepend/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- devel/makedepend/Makefile 19 May 2007 20:03:11 -0000 1.13
+++ devel/makedepend/Makefile 14 Jun 2007 20:37:16 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= makedepend
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
PORTEPOCH= 1
CATEGORIES= devel
Index: devel/makedepend/distinfo
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/devel/makedepend/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- devel/makedepend/distinfo 19 May 2007 20:03:11 -0000 1.7
+++ devel/makedepend/distinfo 14 Jun 2007 20:38:49 -0000
@@ -1,3 +1,3 @@
-MD5 (xorg/util/makedepend-1.0.0.tar.bz2) = fa194caa4f059f5621ed2c5a51efb4d0
-SHA256 (xorg/util/makedepend-1.0.0.tar.bz2) = d2be3c940ee48b0e9e5c63025993162bc144d48923d28565450fb1dca52d140a
-SIZE (xorg/util/makedepend-1.0.0.tar.bz2) = 103213
+MD5 (xorg/util/makedepend-1.0.1.tar.bz2) = 54ab2549d723e51ff2b9cff4d8bf44d1
+SHA256 (xorg/util/makedepend-1.0.1.tar.bz2) = b752ad9f210f82d480c8bf397d62649a4306a5534bc38ae7765b9bfbd416b1d2
+SIZE (xorg/util/makedepend-1.0.1.tar.bz2) = 108276
Index: x11/libSM/Makefile
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11/libSM/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- x11/libSM/Makefile 19 May 2007 20:26:46 -0000 1.21
+++ x11/libSM/Makefile 14 Jun 2007 20:42:52 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= libSM
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
PORTEPOCH= 1
CATEGORIES= x11
Index: x11/libSM/distinfo
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11/libSM/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- x11/libSM/distinfo 19 May 2007 20:26:46 -0000 1.6
+++ x11/libSM/distinfo 14 Jun 2007 20:42:52 -0000
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libSM-1.0.2.tar.bz2) = a254771550c01db372e88d1a1dc2e13a
-SHA256 (xorg/lib/libSM-1.0.2.tar.bz2) = e290614797bd626c1b92bac8f83e8954b99bd66e6ecdaa1e935e176df099eba8
-SIZE (xorg/lib/libSM-1.0.2.tar.bz2) = 244146
+MD5 (xorg/lib/libSM-1.0.3.tar.bz2) = 184cbf502b3cd5d7ba5f9d1290a99606
+SHA256 (xorg/lib/libSM-1.0.3.tar.bz2) = 57f42d3557effe452cd348362977ff90fa61009885c23b3aca8cb0219b5dec04
+SIZE (xorg/lib/libSM-1.0.3.tar.bz2) = 223906
Index: x11/libX11/Makefile
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11/libX11/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- x11/libX11/Makefile 6 Jun 2007 16:25:02 -0000 1.16
+++ x11/libX11/Makefile 21 Jun 2007 19:45:18 -0000
@@ -7,6 +7,7 @@
PORTNAME= libX11
PORTVERSION= 1.1.2
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
@@ -16,10 +17,10 @@
.if defined(WITH_XCB)
BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xcb-xlib.pc:${PORTSDIR}/x11/libxcb
RUN_DEPENDS= ${BUILD_DEPENDS}
-CONFIGURE_ARGS= --with-xcb=yes
+CONFIGURE_ARGS= --with-xcb=yes
PLIST_SUB+= XCB=""
.else
-CONFIGURE_ARGS= --with-xcb=no
+CONFIGURE_ARGS= --with-xcb=no
PLIST_SUB+= XCB="@comment "
.endif
Index: x11/libXcomposite/Makefile
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11/libXcomposite/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- x11/libXcomposite/Makefile 19 May 2007 20:26:48 -0000 1.13
+++ x11/libXcomposite/Makefile 14 Jun 2007 20:42:20 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= libXcomposite
-PORTVERSION= 0.3.1
+PORTVERSION= 0.3.2
PORTEPOCH= 1
CATEGORIES= x11
@@ -15,5 +15,17 @@
XORG_CAT= lib
USE_XORG= compositeproto:both x11 xfixes xext fixesproto xproto:both
+MAN3= Xcomposite.3 \
+ XCompositeQueryExtension.3 \
+ XCompositeQueryVersion.3 \
+ XCompositeVersion.3 \
+ XCompositeRedirectWindow.3 \
+ XCompositeRedirectSubwindows.3 \
+ XCompositeUnredirectWindow.3 \
+ XCompositeUnredirectSubwindows.3 \
+ XCompositeCreateRegionFromBorderClip.3 \
+ XCompositeNameWindowPixmap.3 \
+ XCompositeGetOverlayWindow.3 \
+ XCompositeReleaseOverlayWindow.3
.include <bsd.port.mk>
Index: x11/libXcomposite/distinfo
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11/libXcomposite/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- x11/libXcomposite/distinfo 19 May 2007 20:26:48 -0000 1.5
+++ x11/libXcomposite/distinfo 14 Jun 2007 20:42:20 -0000
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXcomposite-0.3.1.tar.bz2) = a80650d660486ea7bb2e5fd84a83799a
-SHA256 (xorg/lib/libXcomposite-0.3.1.tar.bz2) = d42b59d3c38dae5e4fec375d12e56e7a5764ba10e8b8ec70f9ce951fc9cec72b
-SIZE (xorg/lib/libXcomposite-0.3.1.tar.bz2) = 221073
+MD5 (xorg/lib/libXcomposite-0.3.2.tar.bz2) = 50dd31bed383280433404a405d3dcf8f
+SHA256 (xorg/lib/libXcomposite-0.3.2.tar.bz2) = 22a541727fffc0f23823fc09f0830f3cd555edfa50c5dceac9b0ee9ae8519263
+SIZE (xorg/lib/libXcomposite-0.3.2.tar.bz2) = 219562
Index: x11/libXinerama/Makefile
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11/libXinerama/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- x11/libXinerama/Makefile 19 May 2007 20:26:52 -0000 1.11
+++ x11/libXinerama/Makefile 14 Jun 2007 20:52:59 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= libXinerama
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
PORTEPOCH= 1
CATEGORIES= x11
@@ -19,4 +19,10 @@
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+MAN3= Xinerama.3 \
+ XineramaQueryExtension.3 \
+ XineramaQueryVersion.3 \
+ XineramaIsActive.3 \
+ XineramaQueryScreens.3
+
.include <bsd.port.mk>
Index: x11/libXinerama/distinfo
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11/libXinerama/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- x11/libXinerama/distinfo 19 May 2007 20:26:52 -0000 1.4
+++ x11/libXinerama/distinfo 14 Jun 2007 20:43:17 -0000
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXinerama-1.0.1.tar.bz2) = eae38dd6017dca95a756553995467aac
-SHA256 (xorg/lib/libXinerama-1.0.1.tar.bz2) = f242da28a517f810d454afc98289e52c52719e53822364a7249f82e9a9ad8f15
-SIZE (xorg/lib/libXinerama-1.0.1.tar.bz2) = 206173
+MD5 (xorg/lib/libXinerama-1.0.2.tar.bz2) = f6fb08eafd3c2909d515f1a07bfca8fd
+SHA256 (xorg/lib/libXinerama-1.0.2.tar.bz2) = d245d7ae4c766ecbc4e5cc2666e2e78198d8386dbaa06b35c3d1b1457ee5d03d
+SIZE (xorg/lib/libXinerama-1.0.2.tar.bz2) = 214046
Index: x11/libXtst/Makefile
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11/libXtst/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- x11/libXtst/Makefile 19 May 2007 20:26:56 -0000 1.1
+++ x11/libXtst/Makefile 14 Jun 2007 20:43:57 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= libXtst
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -18,4 +18,16 @@
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+MAN3= XTestQueryExtension.3 \
+ XTestCompareCursorWithWindow.3 \
+ XTestCompareCurrentCursorWithWindow.3 \
+ XTestFakeKeyEvent.3 \
+ XTestFakeButtonEvent.3 \
+ XTestFakeMotionEvent.3 \
+ XTestFakeRelativeMotionEvent.3 \
+ XTestGrabControl.3 \
+ XTestSetGContextOfGC.3 \
+ XTestSetVisualIDOfVisual.3 \
+ XTestDiscard.3
+
.include <bsd.port.mk>
Index: x11/libXtst/distinfo
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11/libXtst/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- x11/libXtst/distinfo 19 May 2007 20:26:56 -0000 1.1
+++ x11/libXtst/distinfo 14 Jun 2007 20:43:57 -0000
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXtst-1.0.1.tar.bz2) = 0ba567531ff9ac1ff9da0653f8a161b3
-SHA256 (xorg/lib/libXtst-1.0.1.tar.bz2) = 7348de3c303075df4457b15b47e75096d909e9ffada80773c660bb956ceea882
-SIZE (xorg/lib/libXtst-1.0.1.tar.bz2) = 212511
+MD5 (xorg/lib/libXtst-1.0.2.tar.bz2) = 032d5c1d3914fc0224837328c88aef96
+SHA256 (xorg/lib/libXtst-1.0.2.tar.bz2) = eef98ad3d35254384c3714cd63826fc2009f9b394f2b489718aba9be7be0a10b
+SIZE (xorg/lib/libXtst-1.0.2.tar.bz2) = 224741
Index: x11/xdm/Makefile
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11/xdm/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- x11/xdm/Makefile 7 Jun 2007 19:48:59 -0000 1.2
+++ x11/xdm/Makefile 21 Jun 2007 14:41:18 -0000
@@ -7,7 +7,7 @@
PORTNAME= xdm
PORTVERSION= 1.1.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -15,7 +15,19 @@
XORG_CAT= app
USE_XORG= xmu x11 xau xinerama xpm xdmcp xt xext xaw
+MAKE_ENV= EXAMPLESDIR=${EXAMPLESDIR}
MAN1= xdm.1
+CFFILES= GiveConsole TakeConsole Xaccess Xreset Xresources \
+ Xservers Xsession Xsetup_0 Xstartup Xwilling xdm-config
+
+post-patch:
+ ${REINPLACE_CMD} -e "s,XDMCONFIGDIR,${PREFIX}/lib/X11/xdm,g" ${WRKSRC}/config/Xreset.cpp ${WRKSRC}/config/Xstartup.cpp
+
+post-install:
+.for f in ${CFFILES}
+ ${CP} -n ${EXAMPLESDIR}/$f ${PREFIX}/lib/X11/xdm/$f
+.endfor
+
.include <bsd.port.mk>
Index: x11/xdm/pkg-plist
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11/xdm/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- x11/xdm/pkg-plist 30 May 2007 23:59:29 -0000 1.2
+++ x11/xdm/pkg-plist 21 Jun 2007 14:07:58 -0000
@@ -1,24 +1,48 @@
bin/xdm
bin/xdmshell
+lib/X11/xdm/chooser
+lib/X11/xdm/libXdmGreet.a
+lib/X11/xdm/libXdmGreet.la
+lib/X11/xdm/libXdmGreet.so
lib/X11/xdm/pixmaps/xorg-bw.xpm
lib/X11/xdm/pixmaps/xorg.xpm
-lib/X11/xdm/Xaccess
-lib/X11/xdm/GiveConsole
-lib/X11/xdm/TakeConsole
-lib/X11/xdm/Xsetup_0
-lib/X11/xdm/Xstartup
-lib/X11/xdm/Xreset
-lib/X11/xdm/Xwilling
lib/X11/xdm/xdm-config
-lib/X11/xdm/Xresources
-lib/X11/xdm/Xservers
-lib/X11/xdm/Xsession
-lib/X11/xdm/libXdmGreet.so
-lib/X11/xdm/libXdmGreet.la
-lib/X11/xdm/libXdmGreet.a
-lib/X11/xdm/chooser
share/X11/app-defaults/Chooser
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/GiveConsole %D/lib/X11/xdm/GiveConsole; then rm -f %D/lib/X11/xdm/GiveConsole; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/TakeConsole %D/lib/X11/xdm/TakeConsole; then rm -f %D/lib/X11/xdm/TakeConsole; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xaccess %D/lib/X11/xdm/Xaccess; then rm -f %D/lib/X11/xdm/Xaccess; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xreset %D/lib/X11/xdm/Xreset; then rm -f %D/lib/X11/xdm/Xreset; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xresources %D/lib/X11/xdm/Xresources; then rm -f %D/lib/X11/xdm/Xresources; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xservers %D/lib/X11/xdm/Xservers; then rm -f %D/lib/X11/xdm/Xservers; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xsession %D/lib/X11/xdm/Xsession; then rm -f %D/lib/X11/xdm/Xsession; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xsetup_0 %D/lib/X11/xdm/Xsetup_0; then rm -f %D/lib/X11/xdm/Xsetup_0; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xstartup %D/lib/X11/xdm/Xstartup; then rm -f %D/lib/X11/xdm/Xstartup; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/Xwilling %D/lib/X11/xdm/Xwilling; then rm -f %D/lib/X11/xdm/Xwilling; fi
+@unexec if cmp -s %D/%%EXAMPLESDIR%%/xdm-config %D/lib/X11/xdm/xdm-config; then rm -f %D/lib/X11/xdm/xdm-config; fi
+%%EXAMPLESDIR%%/GiveConsole
+%%EXAMPLESDIR%%/TakeConsole
+%%EXAMPLESDIR%%/Xaccess
+%%EXAMPLESDIR%%/Xreset
+%%EXAMPLESDIR%%/Xresources
+%%EXAMPLESDIR%%/Xservers
+%%EXAMPLESDIR%%/Xsession
+%%EXAMPLESDIR%%/Xsetup_0
+%%EXAMPLESDIR%%/Xstartup
+%%EXAMPLESDIR%%/Xwilling
+%%EXAMPLESDIR%%/xdm-config
+@exec cp -n %D/%%EXAMPLESDIR%%/GiveConsole %D/lib/X11/xdm/GiveConsole
+@exec cp -n %D/%%EXAMPLESDIR%%/TakeConsole %D/lib/X11/xdm/TakeConsole
+@exec cp -n %D/%%EXAMPLESDIR%%/Xaccess %D/lib/X11/xdm/Xaccess
+@exec cp -n %D/%%EXAMPLESDIR%%/Xreset %D/lib/X11/xdm/Xreset
+@exec cp -n %D/%%EXAMPLESDIR%%/Xresources %D/lib/X11/xdm/Xresources
+@exec cp -n %D/%%EXAMPLESDIR%%/Xservers %D/lib/X11/xdm/Xservers
+@exec cp -n %D/%%EXAMPLESDIR%%/Xsession %D/lib/X11/xdm/Xsession
+@exec cp -n %D/%%EXAMPLESDIR%%/Xsetup_0 %D/lib/X11/xdm/Xsetup_0
+@exec cp -n %D/%%EXAMPLESDIR%%/Xstartup %D/lib/X11/xdm/Xstartup
+@exec cp -n %D/%%EXAMPLESDIR%%/Xwilling %D/lib/X11/xdm/Xwilling
+@exec cp -n %D/%%EXAMPLESDIR%%/xdm-config %D/lib/X11/xdm/xdm-config
@dirrmtry share/X11/app-defaults
@dirrmtry share/X11
@dirrm lib/X11/xdm/pixmaps
@dirrm lib/X11/xdm
+@dirrm %%EXAMPLESDIR%%
Index: x11/xdm/files/patch-config_Makefile.in
===================================================================
RCS file: x11/xdm/files/patch-config_Makefile.in
diff -N x11/xdm/files/patch-config_Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/xdm/files/patch-config_Makefile.in 21 Jun 2007 13:08:35 -0000
@@ -0,0 +1,68 @@
+--- config/Makefile.in.orig Tue Feb 6 20:47:18 2007
++++ config/Makefile.in Thu Jun 21 15:08:28 2007
+@@ -370,13 +370,13 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-dist_xdmscriptSCRIPTS: $(dist_xdmscript_SCRIPTS)
+ @$(NORMAL_INSTALL)
+- test -z "$(xdmscriptdir)" || $(mkdir_p) "$(DESTDIR)$(xdmscriptdir)"
++ test -z "$(EXAMPLESDIR)" || $(mkdir_p) "$(DESTDIR)$(EXAMPLESDIR)"
+ @list='$(dist_xdmscript_SCRIPTS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f $$d$$p; then \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+- echo " $(dist_xdmscriptSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(xdmscriptdir)/$$f'"; \
+- $(dist_xdmscriptSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(xdmscriptdir)/$$f"; \
++ echo " $(dist_xdmscriptSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(EXAMPLESDIR)/$$f'"; \
++ $(dist_xdmscriptSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(EXAMPLESDIR)/$$f"; \
+ else :; fi; \
+ done
+
+@@ -389,13 +389,13 @@
+ done
+ install-xdmscriptSCRIPTS: $(xdmscript_SCRIPTS)
+ @$(NORMAL_INSTALL)
+- test -z "$(xdmscriptdir)" || $(mkdir_p) "$(DESTDIR)$(xdmscriptdir)"
++ test -z "$(EXAMPLESDIR)" || $(mkdir_p) "$(DESTDIR)$(EXAMPLESDIR)"
+ @list='$(xdmscript_SCRIPTS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f $$d$$p; then \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+- echo " $(xdmscriptSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(xdmscriptdir)/$$f'"; \
+- $(xdmscriptSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(xdmscriptdir)/$$f"; \
++ echo " $(xdmscriptSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(EXAMPLESDIR)/$$f'"; \
++ $(xdmscriptSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(EXAMPLESDIR)/$$f"; \
+ else :; fi; \
+ done
+
+@@ -435,12 +435,12 @@
+ done
+ install-dist_xdmconfigDATA: $(dist_xdmconfig_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(xdmconfigdir)" || $(mkdir_p) "$(DESTDIR)$(xdmconfigdir)"
++ test -z "$(EXAMPLESDIR)" || $(mkdir_p) "$(DESTDIR)$(EXAMPLESDIR)"
+ @list='$(dist_xdmconfig_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+- echo " $(dist_xdmconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xdmconfigdir)/$$f'"; \
+- $(dist_xdmconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xdmconfigdir)/$$f"; \
++ echo " $(dist_xdmconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(EXAMPLESDIR)/$$f'"; \
++ $(dist_xdmconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(EXAMPLESDIR)/$$f"; \
+ done
+
+ uninstall-dist_xdmconfigDATA:
+@@ -452,12 +452,12 @@
+ done
+ install-xdmconfigDATA: $(xdmconfig_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(xdmconfigdir)" || $(mkdir_p) "$(DESTDIR)$(xdmconfigdir)"
++ test -z "$(EXAMPLESDIR)" || $(mkdir_p) "$(DESTDIR)$(EXAMPLESDIR)"
+ @list='$(xdmconfig_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+- echo " $(xdmconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xdmconfigdir)/$$f'"; \
+- $(xdmconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xdmconfigdir)/$$f"; \
++ echo " $(xdmconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(EXAMPLESDIR)/$$f'"; \
++ $(xdmconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(EXAMPLESDIR)/$$f"; \
+ done
+
+ uninstall-xdmconfigDATA:
Index: x11/xdpyinfo/Makefile
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11/xdpyinfo/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- x11/xdpyinfo/Makefile 19 May 2007 20:27:46 -0000 1.1
+++ x11/xdpyinfo/Makefile 14 Jun 2007 20:43:27 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= xdpyinfo
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
Index: x11/xdpyinfo/distinfo
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11/xdpyinfo/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- x11/xdpyinfo/distinfo 19 May 2007 20:27:46 -0000 1.1
+++ x11/xdpyinfo/distinfo 14 Jun 2007 20:43:27 -0000
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xdpyinfo-1.0.1.tar.bz2) = 84cc4798fe62c1d8c67c3f38e8158f70
-SHA256 (xorg/app/xdpyinfo-1.0.1.tar.bz2) = 1ccdb5862f60bbc9712e21ee415699af88e260ced431ccfcfde8f95c34a45c61
-SIZE (xorg/app/xdpyinfo-1.0.1.tar.bz2) = 87678
+MD5 (xorg/app/xdpyinfo-1.0.2.tar.bz2) = c9ee60ae52c97c51d4ca327e53f0cb61
+SHA256 (xorg/app/xdpyinfo-1.0.2.tar.bz2) = c9927fc33e8a4422d74b1ebee0d19dd5a16d9ebc435e8f47f0aa546501ccfed3
+SIZE (xorg/app/xdpyinfo-1.0.2.tar.bz2) = 100024
Index: x11/xinit/Makefile
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11/xinit/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- x11/xinit/Makefile 19 May 2007 20:27:55 -0000 1.1
+++ x11/xinit/Makefile 14 Jun 2007 20:43:46 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= xinit
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
Index: x11/xinit/distinfo
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11/xinit/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- x11/xinit/distinfo 19 May 2007 20:27:55 -0000 1.1
+++ x11/xinit/distinfo 14 Jun 2007 20:43:46 -0000
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xinit-1.0.3.tar.bz2) = f04a903cc0e18b3c338f58eb90f6caf8
-SHA256 (xorg/app/xinit-1.0.3.tar.bz2) = c77a58cba815eb1dde2242a819e80d7d84d753678837ac24d385e3ec65d33186
-SIZE (xorg/app/xinit-1.0.3.tar.bz2) = 97629
+MD5 (xorg/app/xinit-1.0.4.tar.bz2) = 9df52a504dc04313a6650fae364ae04a
+SHA256 (xorg/app/xinit-1.0.4.tar.bz2) = 1e7056db4441ccb0dff0f77503e3fd49a370aecdecf95ce6066116ca8244bf52
+SIZE (xorg/app/xinit-1.0.4.tar.bz2) = 106555
Index: x11/xload/Makefile
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11/xload/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- x11/xload/Makefile 19 May 2007 20:27:58 -0000 1.1
+++ x11/xload/Makefile 14 Jun 2007 20:55:50 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= xload
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
Index: x11/xload/distinfo
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11/xload/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- x11/xload/distinfo 19 May 2007 20:27:58 -0000 1.1
+++ x11/xload/distinfo 14 Jun 2007 20:44:24 -0000
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xload-1.0.1.tar.bz2) = ba013813f9c21eb015559466f8d02a44
-SHA256 (xorg/app/xload-1.0.1.tar.bz2) = 8d51184d6b18eea2f64e0c5b88cd95edff8353ce6529e780f95b1f2347babbf2
-SIZE (xorg/app/xload-1.0.1.tar.bz2) = 87468
+MD5 (xorg/app/xload-1.0.2.tar.bz2) = b41ed6b4bcfc9897366c27a94d2bf150
+SHA256 (xorg/app/xload-1.0.2.tar.bz2) = 86b176b6efc52557b1c7631bfdd5c17e7060a438e1e85ce15ec9657be356c50b
+SIZE (xorg/app/xload-1.0.2.tar.bz2) = 92470
Index: x11/xorg-apps/Makefile
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11/xorg-apps/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- x11/xorg-apps/Makefile 19 May 2007 20:28:04 -0000 1.1
+++ x11/xorg-apps/Makefile 20 Jun 2007 21:07:02 -0000
@@ -99,7 +99,6 @@
xsetmode:${PORTSDIR}/x11/xsetmode \
xsetpointer:${PORTSDIR}/x11/xsetpointer \
xsetroot:${PORTSDIR}/x11/xsetroot \
- xsm:${PORTSDIR}/x11/xsm \
xstdcmap:${PORTSDIR}/x11/xstdcmap \
xtrapchar:${PORTSDIR}/x11/xtrap \
xvidtune:${PORTSDIR}/x11/xvidtune \
@@ -109,6 +108,10 @@
xwud:${PORTSDIR}/x11/xwud \
xterm:${PORTSDIR}/x11/xterm
+.if exists(/usr/bin/rsh)
+RUN_DEPENDS+= xsm:${PORTSDIR}/x11/xsm
+.endif
+
NO_BUILD= yes
do-install:
Index: x11/xorg-libraries/Makefile
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11/xorg-libraries/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- x11/xorg-libraries/Makefile 25 May 2007 20:59:30 -0000 1.19
+++ x11/xorg-libraries/Makefile 8 Jun 2007 00:52:12 -0000
@@ -67,7 +67,16 @@
.if !defined(XORG_UPGRADE) && !defined(PACKAGE_BUILDING) && exists(/usr/X11R6)
pre-everything::
- @test -L /usr/X11R6 || ( echo "Read ${PORTSDIR}/UPDATING for the procedure to upgrade or install xorg 7.2." && /usr/bin/false )
+ @if [ ! -L /usr/X11R6 ]; then \
+ echo -n "/usr/X11R6 exists, but it is not a symlink. "; \
+ echo "Installation cannot proceed."; \
+ echo -n "This looks like an incompletely removed old version "; \
+ echo -n "of X. In the current version, /usr/X11R6 must be "; \
+ echo -n "a symlink if it exists at all."; \
+ echo -n "Please read ${PORTSDIR}/UPDATING (entry of 20070519) "; \
+ echo -n "for the procedure to upgrade X.org related ports."; \
+ /usr/bin/false; \
+ fi
.elif !exists(/usr/X11R6) && !defined(WITHOUT_X11R6_SYMLINK)
pre-everything::
${LN} -s ${X11BASE} /usr/X11R6 || ${TRUE}
@@ -77,4 +86,7 @@
${MKDIR} ${PREFIX}/libdata/xorg
${TOUCH} ${PREFIX}/libdata/xorg/libraries
+post-install:
+ @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+
.include <bsd.port.mk>
Index: x11/xorg-libraries/pkg-install
===================================================================
RCS file: x11/xorg-libraries/pkg-install
diff -N x11/xorg-libraries/pkg-install
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/xorg-libraries/pkg-install 28 May 2007 15:19:00 -0000
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+if [ "$2" != "POST-INSTALL" ]; then
+ exit 0
+fi
+
+X11BASE=/usr/X11R6
+LOCALBASE=/usr/local
+
+if [ ${X11BASE} -ef ${LOCALBASE} ]; then
+ echo "Spamming files in /etc..."
+else
+ exit 0
+fi
+
+# periodic.conf
+local_periodic=`. /etc/defaults/periodic.conf && source_periodic_confs ; echo ${local_periodic}`
+for lp in ${local_periodic}; do
+ if (expr ${lp} : "^${X11BASE}" >/dev/null); then
+ continue
+ else
+ new_periodic="${new_periodic} ${lp}"
+ fi
+done
+if [ "${local_periodic}x" != "${new_periodic## }x" ]; then
+ echo "==> Removing ${X11BASE}/etc/periodic from periodic setup..."
+ echo "# added by xorg-libraries port" >> /etc/periodic.conf
+ echo "local_periodic=\"${new_periodic## }\"" >> /etc/periodic.conf
+ ppath_done=1
+fi
+
+# manpath.config
+if (PATH="/sbin:/bin:/usr/sbin:/usr/bin" manpath -q | grep -q "${X11BASE}");then echo "==> Removing ${X11BASE}/man from MANPATH..."
+ sed -i ".bak.xorg" -e "s,^[^#]*${X11BASE}.*$,# (disabled by xorg-libraries port) &," \
+ /etc/manpath.config
+ mpath_done=1
+fi
+
+# rc.conf
+rcdirs=`. /etc/defaults/rc.conf && source_rc_confs && echo ${local_startup}`
+for rd in ${rcdirs}; do
+ if (expr ${rd} : "${X11BASE}" >/dev/null); then
+ continue
+ else
+ new_rcdirs="${new_rcdirs} ${rd}"
+ fi
+done
+if [ "${rcdirs}x" != "${new_rcdirs## }x" ]; then
+ echo "==> Removing ${X11BASE} from rc sequence..."
+ echo "# added by xorg-libraries port" >> /etc/rc.conf
+ echo "local_startup=\"${new_rcdirs## }\"" >> /etc/rc.conf
+ rcconf_done=1
+fi
Index: x11/xrandr/Makefile
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11/xrandr/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- x11/xrandr/Makefile 19 May 2007 20:28:11 -0000 1.1
+++ x11/xrandr/Makefile 21 Jun 2007 23:57:42 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= xrandr
-PORTVERSION= 1.2.0
+PORTVERSION= 1.2.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
Index: x11/xrandr/distinfo
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11/xrandr/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- x11/xrandr/distinfo 19 May 2007 20:28:11 -0000 1.1
+++ x11/xrandr/distinfo 21 Jun 2007 23:57:49 -0000
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xrandr-1.2.0.tar.bz2) = 9e74e6919cf731ec10ce26fd6a4483fa
-SHA256 (xorg/app/xrandr-1.2.0.tar.bz2) = 7bf3bd3cf46a6a29e35b9dd1c8d3d14494be76da0d24c6ef5dab36974445004d
-SIZE (xorg/app/xrandr-1.2.0.tar.bz2) = 92498
+MD5 (xorg/app/xrandr-1.2.1.tar.bz2) = 4cc64c314e1cc2509b83198aaf3f73c2
+SHA256 (xorg/app/xrandr-1.2.1.tar.bz2) = 11da36626648784b6002f70f78052c55f37a3550c8cf64008714845ae2c7cb40
+SIZE (xorg/app/xrandr-1.2.1.tar.bz2) = 94150
Index: x11-fonts/bdftopcf/Makefile
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11-fonts/bdftopcf/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- x11-fonts/bdftopcf/Makefile 19 May 2007 20:29:07 -0000 1.1
+++ x11-fonts/bdftopcf/Makefile 14 Jun 2007 20:44:51 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= bdftopcf
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
@@ -15,6 +15,7 @@
XORG_CAT= app
USE_XORG= xfont
+PLIST_FILES= bin/bdftopcf
MAN1= bdftopcf.1
.include <bsd.port.mk>
Index: x11-fonts/bdftopcf/distinfo
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11-fonts/bdftopcf/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- x11-fonts/bdftopcf/distinfo 19 May 2007 20:29:07 -0000 1.1
+++ x11-fonts/bdftopcf/distinfo 14 Jun 2007 20:44:51 -0000
@@ -1,3 +1,3 @@
-MD5 (xorg/app/bdftopcf-1.0.0.tar.bz2) = 41f4ac6760ef5e671ba8d4baa7236f12
-SHA256 (xorg/app/bdftopcf-1.0.0.tar.bz2) = 8c01b85eab01f35ed6bc9d597d4c6c76cf9ddbe2596d9120d66e66135df1f9a1
-SIZE (xorg/app/bdftopcf-1.0.0.tar.bz2) = 74756
+MD5 (xorg/app/bdftopcf-1.0.1.tar.bz2) = 9685fab33d39954ab8a0d22e0969d5a4
+SHA256 (xorg/app/bdftopcf-1.0.1.tar.bz2) = aaaa45ab361781aebda2093fdc7eb5c187f6215b4ba308dd6b9ff2b727e805d3
+SIZE (xorg/app/bdftopcf-1.0.1.tar.bz2) = 85499
Index: x11-fonts/bdftopcf/pkg-plist
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11-fonts/bdftopcf/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- x11-fonts/bdftopcf/pkg-plist 19 May 2007 20:29:07 -0000 1.1
+++ x11-fonts/bdftopcf/pkg-plist 14 Jun 2007 20:44:51 -0000
@@ -1 +0,0 @@
-bin/bdftopcf
Index: x11-fonts/mkfontdir/Makefile
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11-fonts/mkfontdir/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- x11-fonts/mkfontdir/Makefile 19 May 2007 20:29:33 -0000 1.1
+++ x11-fonts/mkfontdir/Makefile 14 Jun 2007 20:44:34 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= mkfontdir
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
@@ -14,6 +14,7 @@
XORG_CAT= app
+PLIST_FILES= bin/mkfontdir
MAN1= mkfontdir.1
.include <bsd.port.mk>
Index: x11-fonts/mkfontdir/distinfo
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11-fonts/mkfontdir/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- x11-fonts/mkfontdir/distinfo 19 May 2007 20:29:33 -0000 1.1
+++ x11-fonts/mkfontdir/distinfo 14 Jun 2007 20:44:34 -0000
@@ -1,3 +1,3 @@
-MD5 (xorg/app/mkfontdir-1.0.2.tar.bz2) = 94da9dcd2447300e8fdada896d7ed433
-SHA256 (xorg/app/mkfontdir-1.0.2.tar.bz2) = 06055b7e4d03661b987d48ff1a1e1e21c256431141d0f7fb8e4cceefce77b4b7
-SIZE (xorg/app/mkfontdir-1.0.2.tar.bz2) = 61745
+MD5 (xorg/app/mkfontdir-1.0.3.tar.bz2) = 4d0f89a23f77e22f1671a77bf0898955
+SHA256 (xorg/app/mkfontdir-1.0.3.tar.bz2) = 2a786e03611a53c7f6263db446c0c9ef76e94bcf930b0b5867cc6a9c19653074
+SIZE (xorg/app/mkfontdir-1.0.3.tar.bz2) = 62898
Index: x11-fonts/mkfontdir/pkg-plist
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11-fonts/mkfontdir/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- x11-fonts/mkfontdir/pkg-plist 19 May 2007 20:29:33 -0000 1.1
+++ x11-fonts/mkfontdir/pkg-plist 14 Jun 2007 20:44:34 -0000
@@ -1 +0,0 @@
-bin/mkfontdir
Index: x11-fonts/xfs/Makefile
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11-fonts/xfs/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- x11-fonts/xfs/Makefile 19 May 2007 20:29:38 -0000 1.12
+++ x11-fonts/xfs/Makefile 21 Jun 2007 14:40:33 -0000
@@ -7,7 +7,7 @@
PORTNAME= xfs
PORTVERSION= 1.0.4
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= x11-fonts
@@ -21,6 +21,14 @@
MAN1= xfs.1
+.if !defined(WITHOUT_XFS_CACHE)
+USE_XORG+= fontcacheproto x11
+CFLAGS+= -DFONTCACHE
+.else
+post-patch:
+ ${REINPLACE_CMD} -e 's|^cache|XCOMM &|' ${WRKSRC}/config.cpp
+.endif
+
post-install:
${INSTALL_SCRIPT} ${WRKSRC}/config ${PREFIX}/lib/X11/fs/config.default
@if [ ! -f ${PREFIX}/lib/X11/fs/config ]; then \
Index: x11-toolkits/libXaw/Makefile
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11-toolkits/libXaw/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- x11-toolkits/libXaw/Makefile 19 May 2007 20:31:13 -0000 1.17
+++ x11-toolkits/libXaw/Makefile 14 Jun 2007 20:45:15 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= libXaw
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
PORTEPOCH= 1
CATEGORIES= x11-toolkits
Index: x11-toolkits/libXaw/distinfo
===================================================================
RCS file: /FreeBSD-mirror/cvs/ports/x11-toolkits/libXaw/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- x11-toolkits/libXaw/distinfo 19 May 2007 20:31:13 -0000 1.5
+++ x11-toolkits/libXaw/distinfo 14 Jun 2007 20:45:15 -0000
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXaw-1.0.2.tar.bz2) = 27dc85f84ac78eb619f72a0805a323f4
-SHA256 (xorg/lib/libXaw-1.0.2.tar.bz2) = 579f332cb01c2bee5fc75bdfbf0e6b5c57ce3d1849936ae4c540564b2168556a
-SIZE (xorg/lib/libXaw-1.0.2.tar.bz2) = 524107
+MD5 (xorg/lib/libXaw-1.0.3.tar.bz2) = ee215536ea78798268ab3a444d10135a
+SHA256 (xorg/lib/libXaw-1.0.3.tar.bz2) = 45ca55bdac904a07b8118618c65ddb5bf8826e626c4c927e3c2508c58e231514
+SIZE (xorg/lib/libXaw-1.0.3.tar.bz2) = 515197
--Boundary-00=_a08eG/BT3v5sxmi--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200706221522.34258.dejan.lesjak>