--- a/open-src/common/Makefile.options.opensolaris Tue Apr 25 14:08:12 2017 -0700
+++ b/open-src/common/Makefile.options.opensolaris Tue Apr 25 21:47:29 2017 -0700
@@ -1,6 +1,6 @@
# X build options for OpenSolaris sources
#
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -38,4 +38,4 @@
# Xserver configuration options for vendor name & support URL
VENDOR_NAME = OpenSolaris, based on X.Org Foundation sources
-VENDOR_SUPPORT_URL = http://solaris-x11.java.net/
+VENDOR_SUPPORT_URL = https://github.com/oracle/solaris-xorg
--- a/open-src/doc/xorg-docs/Makefile Tue Apr 25 14:08:12 2017 -0700
+++ b/open-src/doc/xorg-docs/Makefile Tue Apr 25 21:47:29 2017 -0700
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -40,6 +40,7 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES += upstream-manpages.patch,-p1
SOURCE_PATCHES += solaris-manpages.patch,-p1
+SOURCE_PATCHES += maintainers.patch,-p1
# Man pages to apply distro customizations to
# Normal attributes table not added, since these aren't simple interfaces
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/doc/xorg-docs/maintainers.patch Tue Apr 25 21:47:29 2017 -0700
@@ -0,0 +1,21 @@
+commit 2ee2b7f0f0304879214f09d48c43c742894cf82e (patch)
+tree eea23a1c0dfd259897cfe3ae4a20975a9a319f7b
+parent ebc0ba09cb2fe7d4fb1e223e274feec4879d8536 (diff)
+Update Solaris URL in MAINTAINERS fileHEADmaster
+Signed-off-by: Alan Coopersmith <[email protected]>
+Reviewed-by: Niveditha Rau <[email protected]>
+Diffstat
+-rw-r--r-- MAINTAINERS 2
+
+1 files changed, 1 insertions, 1 deletions
+diff --git a/MAINTAINERS b/MAINTAINERS
+index e0b2d27..f7871da 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -502,7 +502,7 @@ Solaris (x86 & sparc)
+ P: Alan Coopersmith
+ M: [email protected]
+ L: [email protected]
+-W: http://wiki.x.org & http://solaris-x11.java.net/
++W: http://wiki.x.org & https://github.com/oracle/solaris-xorg
+ S: Maintained
--- a/pkg/transforms/common_actions Tue Apr 25 14:08:12 2017 -0700
+++ b/pkg/transforms/common_actions Tue Apr 25 21:47:29 2017 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -41,9 +41,9 @@
#
set name=org.opensolaris.consolidation value=X
-set name=info.maintainer-url value="http://solaris-x11.java.net/"
+set name=info.maintainer-url value="https://github.com/oracle/solaris-xorg"
set name=com.oracle.info.consolidation.repository-url \
- value="https://hg.java.net/hg/solaris-x11~x-s12-clone"
+ value="https://github.com/oracle/solaris-xorg"
#
# Indicate that the package was published in a zones aware