summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09>2012-07-22 01:51:40 +0800
committerkwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09>2012-07-22 01:51:40 +0800
commit8307f9cf6f719d13b2991702055a4a28ad5fb1c9 (patch)
tree866461cef7df31b18eae3d34f5e17f035c03ee88
parente92c011556260f4a671d9db04f2924b1f8e375bd (diff)
downloadxorg-devel-ports-8307f9cf6f719d13b2991702055a4a28ad5fb1c9.tar
xorg-devel-ports-8307f9cf6f719d13b2991702055a4a28ad5fb1c9.tar.gz
xorg-devel-ports-8307f9cf6f719d13b2991702055a4a28ad5fb1c9.tar.bz2
xorg-devel-ports-8307f9cf6f719d13b2991702055a4a28ad5fb1c9.tar.lz
xorg-devel-ports-8307f9cf6f719d13b2991702055a4a28ad5fb1c9.tar.xz
xorg-devel-ports-8307f9cf6f719d13b2991702055a4a28ad5fb1c9.tar.zst
xorg-devel-ports-8307f9cf6f719d13b2991702055a4a28ad5fb1c9.zip
Update to 1.12.3.
Remove double PLIST_SUB defines. Remove @dirrmtry for dirs we don't touch. git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@532 058c260c-8361-11dd-a0ac-aa2bafec7d09
-rw-r--r--x11-servers/xorg-server/Makefile6
-rw-r--r--x11-servers/xorg-server/distinfo4
-rw-r--r--x11-servers/xorg-server/pkg-plist7
3 files changed, 3 insertions, 14 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 03b00f2..abe4cae 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= xkeyboard-config>=2.5:${PORTSDIR}/x11/xkeyboard-config \
XORG_CAT= xserver
.if defined(WITH_NEW_XORG)
-XORG_VERSION= 1.12.2
+XORG_VERSION= 1.12.3
XORG_REVISION= 0
PLIST_SUB+= OLD="@comment " NEW=""
.else
@@ -156,10 +156,6 @@ post-patch:
.if defined(WITH_NEW_XORG)
post-install:
@${MKDIR} ${PREFIX}/share/X11/xorg.conf.d
-
-PLIST_SUB+= OLD="@comment " NEW=""
-.else
-PLIST_SUB+= OLD="" NEW="@comment "
.endif
.include <bsd.port.post.mk>
diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo
index 3373f60..5d5eef2 100644
--- a/x11-servers/xorg-server/distinfo
+++ b/x11-servers/xorg-server/distinfo
@@ -1,4 +1,4 @@
SHA256 (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
SIZE (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 4939257
-SHA256 (xorg/xserver/xorg-server-1.12.2.tar.bz2) = ca9f9e22f432f1ccbf8e7a21e746e02be4081a0f3975eb7cff276483193cc5f5
-SIZE (xorg/xserver/xorg-server-1.12.2.tar.bz2) = 5431841
+SHA256 (xorg/xserver/xorg-server-1.12.3.tar.bz2) = 3654b613393734ce0c7c23e81ca4ceb6e8afefb5f0649233ffd105c1220544fe
+SIZE (xorg/xserver/xorg-server-1.12.3.tar.bz2) = 5478028
diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist
index 0b2af12..6dc16b2 100644
--- a/x11-servers/xorg-server/pkg-plist
+++ b/x11-servers/xorg-server/pkg-plist
@@ -236,13 +236,6 @@ share/aclocal/xorg-server.m4
%%OLD%%@dirrm lib/xorg/modules/linux
@dirrm lib/xorg/modules
@dirrm lib/xorg
-@dirrmtry include/X11/bitmaps
-@dirrmtry include/X11/pixmaps
-@dirrmtry lib/X11/doc
-@dirrmtry lib/X11/etc
-@dirrmtry lib/X11/xserver
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
%%NEW%%@dirrmtry share/X11/xorg.conf.d
@dirrmtry share/X11/app-defaults
@dirrmtry share/X11