Date: Wed, 20 Mar 2002 01:55:03 +0900 (JST) From: Hidekazu Kuroki <hidekazu@pc88.gr.jp> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/36104: Patch for some XFree86-4 ports. Message-ID: <200203191655.g2JGt3h25807@gate.pc88.gr.jp>
next in thread | raw e-mail | index | archive | help
>Number: 36104
>Category: ports
>Synopsis: Patch for some XFree86-4 ports.
>Confidential: no
>Severity: serious
>Priority: high
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 19 09:00:04 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Hidekazu Kuroki
>Release: FreeBSD 4.5-RELEASE i386
>Organization:
Hidekazu Kuroki
>Environment:
System: FreeBSD gate.pc88.gr.jp 4.5-RELEASE FreeBSD 4.5-RELEASE #0: Mon Jan 28 14:31:56 GMT 2002 murray@builder.freebsdmall.com:/usr/src/sys/compile/GENERIC i386
>Description:
This patch is applying xfree86.org's public fixes for some XFree86-4 ports.
Applying public fixes list:
4.2.0-libGLU-bad-extern.patch
4.2.0-xlib-i18n-module.patch
4.2.0-zlib-security.patch
>How-To-Repeat:
>Fix:
diff -rcN OLD/devel/imake-4/Makefile NEW/devel/imake-4/Makefile
*** OLD/devel/imake-4/Makefile Sun Mar 17 13:15:12 2002
--- NEW/devel/imake-4/Makefile Tue Mar 19 00:18:20 2002
***************
*** 17,22 ****
--- 17,27 ----
DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz Wraphelp.c:wrap
IGNOREFILES= Wraphelp.c
+ PATCH_SITES= ${MASTER_SITE_XFREE:S/source/fixes/g}
+ PATCH_SITE_SUBDIR= ${PORTVERSION}
+ PATCHFILES= 4.2.0-libGLU-bad-extern.patch
+ PATCH_DIST_STRIP= -p0
+
MAINTAINER= taguchi@tohoku.iij.ad.jp
PREFIX?= ${X11BASE}
***************
*** 26,32 ****
DIST_SUBDIR= xc
WRKSRC= ${WRKDIR}/xc/config
MTREE_FILE= /etc/mtree/BSD.x11-4.dist
! PATCH_DIST_ARGS= --force -d ${WRKDIR} --forward --quiet -E ${PATCH_DIST_STRIP} 2>/dev/null || true
EXTRACT_AFTER_ARGS= | ${TAR} -xf - xc/Imakefile \
xc/Makefile \
xc/config \
--- 31,41 ----
DIST_SUBDIR= xc
WRKSRC= ${WRKDIR}/xc/config
MTREE_FILE= /etc/mtree/BSD.x11-4.dist
! .if defined(PATCH_DEBUG)
! PATCH_DIST_ARGS= -d ${WRKDIR} -E ${PATCH_DIST_STRIP}
! .else
! PATCH_DIST_ARGS= --force -d ${WRKDIR} --forward --quiet -E ${PATCH_DIST_STRIP}
! .endif
EXTRACT_AFTER_ARGS= | ${TAR} -xf - xc/Imakefile \
xc/Makefile \
xc/config \
diff -rcN OLD/devel/imake-4/distinfo NEW/devel/imake-4/distinfo
*** OLD/devel/imake-4/distinfo Sun Mar 17 13:15:12 2002
--- NEW/devel/imake-4/distinfo Tue Mar 19 00:18:20 2002
***************
*** 1,2 ****
--- 1,3 ----
MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
+ MD5 (xc/4.2.0-libGLU-bad-extern.patch) = 2d5c738854c7cc0378ae457b09a029f4
MD5 (xc/Wraphelp.c) = IGNORE
diff -rcN OLD/x11/XFree86-4-clients/Makefile NEW/x11/XFree86-4-clients/Makefile
*** OLD/x11/XFree86-4-clients/Makefile Sun Mar 17 13:16:12 2002
--- NEW/x11/XFree86-4-clients/Makefile Tue Mar 19 00:18:30 2002
***************
*** 19,24 ****
--- 19,31 ----
EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-1.tgz
IGNOREFILES= Wraphelp.c
+ PATCH_SITES= ${MASTER_SITE_XFREE:S/source/fixes/g}
+ PATCH_SITE_SUBDIR= ${PORTVERSION}
+ PATCHFILES= 4.2.0-libGLU-bad-extern.patch \
+ 4.2.0-xlib-i18n-module.patch \
+ 4.2.0-zlib-security.patch
+ PATCH_DIST_STRIP= -p1
+
MAINTAINER= taguchi@tohoku.iij.ad.jp
XFREE86_VERSION= 4
diff -rcN OLD/x11/XFree86-4-clients/distinfo NEW/x11/XFree86-4-clients/distinfo
*** OLD/x11/XFree86-4-clients/distinfo Sun Mar 17 13:16:12 2002
--- NEW/x11/XFree86-4-clients/distinfo Tue Mar 19 00:18:30 2002
***************
*** 1,3 ****
--- 1,6 ----
MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
MD5 (xc/X420src-2.tgz) = dae33268a9f2735b9678a81fb23e8d3e
+ MD5 (xc/4.2.0-libGLU-bad-extern.patch) = 2d5c738854c7cc0378ae457b09a029f4
+ MD5 (xc/4.2.0-xlib-i18n-module.patch) = 19a91692fdb4fa3d2797f57beebee34a
+ MD5 (xc/4.2.0-zlib-security.patch) = 5684153cb1f84875fb3535e3263dc447
MD5 (xc/Wraphelp.c) = IGNORE
diff -rcN OLD/x11/XFree86-4-libraries/Makefile NEW/x11/XFree86-4-libraries/Makefile
*** OLD/x11/XFree86-4-libraries/Makefile Sun Mar 17 13:16:12 2002
--- NEW/x11/XFree86-4-libraries/Makefile Tue Mar 19 00:18:30 2002
***************
*** 18,23 ****
--- 18,30 ----
DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz Wraphelp.c:wrap
IGNOREFILES= Wraphelp.c
+ PATCH_SITES= ${MASTER_SITE_XFREE:S/source/fixes/g}
+ PATCH_SITE_SUBDIR= ${PORTVERSION}
+ PATCHFILES= 4.2.0-libGLU-bad-extern.patch \
+ 4.2.0-xlib-i18n-module.patch \
+ 4.2.0-zlib-security.patch
+ PATCH_DIST_STRIP= -p1
+
MAINTAINER= taguchi@tohoku.iij.ad.jp
BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake-4
diff -rcN OLD/x11/XFree86-4-libraries/distinfo NEW/x11/XFree86-4-libraries/distinfo
*** OLD/x11/XFree86-4-libraries/distinfo Sun Mar 17 13:16:12 2002
--- NEW/x11/XFree86-4-libraries/distinfo Tue Mar 19 00:18:30 2002
***************
*** 1,2 ****
--- 1,5 ----
MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
+ MD5 (xc/4.2.0-libGLU-bad-extern.patch) = 2d5c738854c7cc0378ae457b09a029f4
+ MD5 (xc/4.2.0-xlib-i18n-module.patch) = 19a91692fdb4fa3d2797f57beebee34a
+ MD5 (xc/4.2.0-zlib-security.patch) = 5684153cb1f84875fb3535e3263dc447
MD5 (xc/Wraphelp.c) = IGNORE
diff -rcN OLD/x11-servers/XFree86-4-FontServer/Makefile NEW/x11-servers/XFree86-4-FontServer/Makefile
*** OLD/x11-servers/XFree86-4-FontServer/Makefile Sun Mar 17 13:16:13 2002
--- NEW/x11-servers/XFree86-4-FontServer/Makefile Tue Mar 19 00:18:22 2002
***************
*** 13,18 ****
--- 13,25 ----
PKGNAMEPREFIX= XFree86-
DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz
+ PATCH_SITES= ${MASTER_SITE_XFREE:S/source/fixes/g}
+ PATCH_SITE_SUBDIR= ${PORTVERSION}
+ PATCHFILES= 4.2.0-libGLU-bad-extern.patch \
+ 4.2.0-xlib-i18n-module.patch \
+ 4.2.0-zlib-security.patch
+ PATCH_DIST_STRIP= -p1
+
MAINTAINER= taguchi@tohoku.iij.ad.jp
XFREE86_VERSION= 4
diff -rcN OLD/x11-servers/XFree86-4-FontServer/distinfo NEW/x11-servers/XFree86-4-FontServer/distinfo
*** OLD/x11-servers/XFree86-4-FontServer/distinfo Sun Mar 17 13:16:13 2002
--- NEW/x11-servers/XFree86-4-FontServer/distinfo Tue Mar 19 00:18:22 2002
***************
*** 1 ****
--- 1,4 ----
MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
+ MD5 (xc/4.2.0-libGLU-bad-extern.patch) = 2d5c738854c7cc0378ae457b09a029f4
+ MD5 (xc/4.2.0-xlib-i18n-module.patch) = 19a91692fdb4fa3d2797f57beebee34a
+ MD5 (xc/4.2.0-zlib-security.patch) = 5684153cb1f84875fb3535e3263dc447
diff -rcN OLD/x11-servers/XFree86-4-NestServer/Makefile NEW/x11-servers/XFree86-4-NestServer/Makefile
*** OLD/x11-servers/XFree86-4-NestServer/Makefile Sun Mar 17 13:16:13 2002
--- NEW/x11-servers/XFree86-4-NestServer/Makefile Tue Mar 19 00:18:22 2002
***************
*** 18,23 ****
--- 18,30 ----
EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-1.tgz
IGNOREFILES= Wraphelp.c
+ PATCH_SITES= ${MASTER_SITE_XFREE:S/source/fixes/g}
+ PATCH_SITE_SUBDIR= ${PORTVERSION}
+ PATCHFILES= 4.2.0-libGLU-bad-extern.patch \
+ 4.2.0-xlib-i18n-module.patch \
+ 4.2.0-zlib-security.patch
+ PATCH_DIST_STRIP= -p1
+
MAINTAINER= taguchi@tohoku.iij.ad.jp
XFREE86_VERSION= 4
diff -rcN OLD/x11-servers/XFree86-4-NestServer/distinfo NEW/x11-servers/XFree86-4-NestServer/distinfo
*** OLD/x11-servers/XFree86-4-NestServer/distinfo Sun Mar 17 13:16:13 2002
--- NEW/x11-servers/XFree86-4-NestServer/distinfo Tue Mar 19 00:18:22 2002
***************
*** 1,2 ****
--- 1,5 ----
MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
+ MD5 (xc/4.2.0-libGLU-bad-extern.patch) = 2d5c738854c7cc0378ae457b09a029f4
+ MD5 (xc/4.2.0-xlib-i18n-module.patch) = 19a91692fdb4fa3d2797f57beebee34a
+ MD5 (xc/4.2.0-zlib-security.patch) = 5684153cb1f84875fb3535e3263dc447
MD5 (xc/Wraphelp.c) = IGNORE
diff -rcN OLD/x11-servers/XFree86-4-PrintServer/Makefile NEW/x11-servers/XFree86-4-PrintServer/Makefile
*** OLD/x11-servers/XFree86-4-PrintServer/Makefile Sun Mar 17 13:16:13 2002
--- NEW/x11-servers/XFree86-4-PrintServer/Makefile Tue Mar 19 00:18:22 2002
***************
*** 18,23 ****
--- 18,30 ----
EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-1.tgz
IGNOREFILES= Wraphelp.c
+ PATCH_SITES= ${MASTER_SITE_XFREE:S/source/fixes/g}
+ PATCH_SITE_SUBDIR= ${PORTVERSION}
+ PATCHFILES= 4.2.0-libGLU-bad-extern.patch \
+ 4.2.0-xlib-i18n-module.patch \
+ 4.2.0-zlib-security.patch
+ PATCH_DIST_STRIP= -p1
+
MAINTAINER= taguchi@tohoku.iij.ad.jp
XFREE86_VERSION= 4
diff -rcN OLD/x11-servers/XFree86-4-PrintServer/distinfo NEW/x11-servers/XFree86-4-PrintServer/distinfo
*** OLD/x11-servers/XFree86-4-PrintServer/distinfo Sun Mar 17 13:16:13 2002
--- NEW/x11-servers/XFree86-4-PrintServer/distinfo Tue Mar 19 00:18:22 2002
***************
*** 1,2 ****
--- 1,5 ----
MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
+ MD5 (xc/4.2.0-libGLU-bad-extern.patch) = 2d5c738854c7cc0378ae457b09a029f4
+ MD5 (xc/4.2.0-xlib-i18n-module.patch) = 19a91692fdb4fa3d2797f57beebee34a
+ MD5 (xc/4.2.0-zlib-security.patch) = 5684153cb1f84875fb3535e3263dc447
MD5 (xc/Wraphelp.c) = IGNORE
diff -rcN OLD/x11-servers/XFree86-4-Server/Makefile NEW/x11-servers/XFree86-4-Server/Makefile
*** OLD/x11-servers/XFree86-4-Server/Makefile Wed Mar 20 00:21:41 2002
--- NEW/x11-servers/XFree86-4-Server/Makefile Wed Mar 20 00:44:47 2002
***************
*** 21,26 ****
--- 21,33 ----
EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-1.tgz
IGNOREFILES= Wraphelp.c
+ PATCH_SITES= ${MASTER_SITE_XFREE:S/source/fixes/g}
+ PATCH_SITE_SUBDIR= ${PORTVERSION}
+ PATCHFILES= 4.2.0-libGLU-bad-extern.patch \
+ 4.2.0-xlib-i18n-module.patch \
+ 4.2.0-zlib-security.patch
+ PATCH_DIST_STRIP= -p1
+
MAINTAINER= taguchi@tohoku.iij.ad.jp
XFREE86_VERSION= 4
diff -rcN OLD/x11-servers/XFree86-4-Server/distinfo NEW/x11-servers/XFree86-4-Server/distinfo
*** OLD/x11-servers/XFree86-4-Server/distinfo Mon Mar 18 11:56:18 2002
--- NEW/x11-servers/XFree86-4-Server/distinfo Wed Mar 20 00:47:17 2002
***************
*** 1,3 ****
--- 1,6 ----
MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
+ MD5 (xc/4.2.0-libGLU-bad-extern.patch) = 2d5c738854c7cc0378ae457b09a029f4
+ MD5 (xc/4.2.0-xlib-i18n-module.patch) = 19a91692fdb4fa3d2797f57beebee34a
+ MD5 (xc/4.2.0-zlib-security.patch) = 5684153cb1f84875fb3535e3263dc447
MD5 (xc/mgadrivers-2.0-src.tgz) = 877db503967ae837c147953dbcd8ee6d
MD5 (xc/Wraphelp.c) = IGNORE
diff -rcN OLD/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile NEW/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
*** OLD/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile Sun Mar 17 13:16:13 2002
--- NEW/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile Tue Mar 19 00:18:22 2002
***************
*** 18,23 ****
--- 18,30 ----
EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-1.tgz
IGNOREFILES= Wraphelp.c
+ PATCH_SITES= ${MASTER_SITE_XFREE:S/source/fixes/g}
+ PATCH_SITE_SUBDIR= ${PORTVERSION}
+ PATCHFILES= 4.2.0-libGLU-bad-extern.patch \
+ 4.2.0-xlib-i18n-module.patch \
+ 4.2.0-zlib-security.patch
+ PATCH_DIST_STRIP= -p1
+
MAINTAINER= taguchi@tohoku.iij.ad.jp
XFREE86_VERSION= 4
diff -rcN OLD/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo NEW/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
*** OLD/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo Sun Mar 17 13:16:13 2002
--- NEW/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo Tue Mar 19 00:18:22 2002
***************
*** 1,2 ****
--- 1,5 ----
MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
+ MD5 (xc/4.2.0-libGLU-bad-extern.patch) = 2d5c738854c7cc0378ae457b09a029f4
+ MD5 (xc/4.2.0-xlib-i18n-module.patch) = 19a91692fdb4fa3d2797f57beebee34a
+ MD5 (xc/4.2.0-zlib-security.patch) = 5684153cb1f84875fb3535e3263dc447
MD5 (xc/Wraphelp.c) = IGNORE
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200203191655.g2JGt3h25807>