summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEitan Adler <eadler@FreeBSD.org>2012-02-05 05:12:45 +0000
committerEitan Adler <eadler@FreeBSD.org>2012-02-05 05:12:45 +0000
commit06116d3b4e16adf8f118303a87f727cc58ae1bef (patch)
tree8559efc1fc39b4a3d110d4390c66696fc795dda5
parent- Mark DEPRECATED and set EXPIRATION_DATE (diff)
Backout previous commit due to missing dependencies not picked up by a tinderbox run
Reported by: x11@ mailing list Reviewed by: miwi Pointyhat to: me
Notes
Notes: svn path=/head/; revision=290418
-rw-r--r--x11-toolkits/libXaw/Makefile5
-rw-r--r--x11-toolkits/libXaw/distinfo4
-rw-r--r--x11-toolkits/libXt/Makefile4
-rw-r--r--x11-toolkits/libXt/distinfo4
-rw-r--r--x11/xinit/Makefile3
-rw-r--r--x11/xinit/distinfo4
-rw-r--r--x11/xinit/files/patch-xinit.c15
7 files changed, 27 insertions, 12 deletions
diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile
index 7f7c56d7eebe..6ee13953b923 100644
--- a/x11-toolkits/libXaw/Makefile
+++ b/x11-toolkits/libXaw/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= libXaw
-PORTVERSION= 1.0.9
-PORTEPOCH= 1
+PORTVERSION= 1.0.8
+PORTEPOCH= 2
CATEGORIES= x11-toolkits
MAINTAINER= x11@FreeBSD.org
@@ -16,7 +16,6 @@ COMMENT= X Athena Widgets library
XORG_CAT= lib
USE_XORG= printproto:both x11 xau xext xextproto xmu xp xpm xproto:both xt
USE_GMAKE= yes
-CONFIGURE_ARGS+=--without-xmlto
MAN3= Xaw.3
diff --git a/x11-toolkits/libXaw/distinfo b/x11-toolkits/libXaw/distinfo
index 3e67ebd8e5ea..c4aa13012bf2 100644
--- a/x11-toolkits/libXaw/distinfo
+++ b/x11-toolkits/libXaw/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXaw-1.0.9.tar.bz2) = a83977546b78e24ac5dca86affc10b6404a87c16272405b05386feca1a2db037
-SIZE (xorg/lib/libXaw-1.0.9.tar.bz2) = 650634
+SHA256 (xorg/lib/libXaw-1.0.8.tar.bz2) = 3daeab01ee702cbc4ac91f11d553710ad31d4151510386093c186a94ccd4beba
+SIZE (xorg/lib/libXaw-1.0.8.tar.bz2) = 635256
diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile
index 1aeb757e0b1d..b2627d6ae4ea 100644
--- a/x11-toolkits/libXt/Makefile
+++ b/x11-toolkits/libXt/Makefile
@@ -6,7 +6,8 @@
#
PORTNAME= libXt
-PORTVERSION= 1.1.1
+PORTVERSION= 1.0.9
+PORTEPOCH= 1
CATEGORIES= x11-toolkits
MAINTAINER= x11@FreeBSD.org
@@ -63,7 +64,6 @@ MAN3= MenuPopdown.3 \
XtAppUnlock.3 \
XtAppWarning.3 \
XtAppWarningMsg.3 \
- XtAsprintf.3 \
XtAugmentTranslations.3 \
XtBuildEventMask.3 \
XtCallAcceptFocus.3\
diff --git a/x11-toolkits/libXt/distinfo b/x11-toolkits/libXt/distinfo
index 57b1aa78e720..67f296198a07 100644
--- a/x11-toolkits/libXt/distinfo
+++ b/x11-toolkits/libXt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/libXt-1.1.1.tar.bz2) = a2a1c29c684e3c9082cdb920b5aea802b179d19107b9ab2170fda07575559da7
-SIZE (xorg/lib/libXt-1.1.1.tar.bz2) = 715424
+SHA256 (xorg/lib/libXt-1.0.9.tar.bz2) = eab91b594b801f7f07a20f936dda70a629028858cbcf541becf94f2786ae6b01
+SIZE (xorg/lib/libXt-1.0.9.tar.bz2) = 685981
diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile
index 8b9e30c22f23..253ed9a303ea 100644
--- a/x11/xinit/Makefile
+++ b/x11/xinit/Makefile
@@ -6,7 +6,8 @@
#
PORTNAME= xinit
-PORTVERSION= 1.3.2
+PORTVERSION= 1.3.1
+PORTEPOCH= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xinit/distinfo b/x11/xinit/distinfo
index dbe3d873a2a6..9c363d13e8f3 100644
--- a/x11/xinit/distinfo
+++ b/x11/xinit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xinit-1.3.2.tar.bz2) = a1867fdaa83f68750b12ba4305c3c62f5992d0f52cfeb98e96c27a8e690e0235
-SIZE (xorg/app/xinit-1.3.2.tar.bz2) = 148443
+SHA256 (xorg/app/xinit-1.3.1.tar.bz2) = c7468dfae94bdb42785d79623c27156dc4bf379d8372992830482cb04d8439b0
+SIZE (xorg/app/xinit-1.3.1.tar.bz2) = 147067
diff --git a/x11/xinit/files/patch-xinit.c b/x11/xinit/files/patch-xinit.c
new file mode 100644
index 000000000000..abe8803b8282
--- /dev/null
+++ b/x11/xinit/files/patch-xinit.c
@@ -0,0 +1,15 @@
+--- xinit.c.orig 2011-04-26 07:03:42.000000000 +0200
++++ xinit.c 2011-08-06 22:14:03.000000000 +0200
+@@ -49,10 +49,10 @@
+ #endif
+
+ /* For PRIO_PROCESS and setpriority() */
+-#ifdef __DragonFly__
++#if defined(__DragonFly__) || defined(__FreeBSD__)
+ #include <sys/time.h>
+ #include <sys/resource.h>
+-#endif /* __DragonFly__ */
++#endif
+
+ #include <stdlib.h>
+