From owner-freebsd-ports Wed Mar 29 20:50: 7 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 9155937B7EA for ; Wed, 29 Mar 2000 20:50:04 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id UAA40781; Wed, 29 Mar 2000 20:50:04 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from pascal.uol.com.br (pascal.uol.com.br [200.230.198.87]) by hub.freebsd.org (Postfix) with ESMTP id 5441A37B604 for ; Wed, 29 Mar 2000 20:41:54 -0800 (PST) (envelope-from lioux-alias-ppp-FreeBSD-gnats-submit=freebsd.org@uol.com.br) Received: from bsa-1-as02-7-a03.gd.uol.com.br (bsa-1-as02-7-a03.gd.uol.com.br [200.197.118.67] (may be forged)) by pascal.uol.com.br (8.9.1/8.9.1) with ESMTP id BAA09455 for ; Thu, 30 Mar 2000 01:41:34 -0300 (BRT) Received: (qmail 96700 invoked by uid 1001); 30 Mar 2000 04:41:31 -0000 Message-Id: <20000330044131.96699.qmail@Fedaykin.here> Date: 30 Mar 2000 04:41:31 -0000 From: lioux@uol.com.br Reply-To: lioux@uol.com.br To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/17678: Update port graphics/Mesa3 latest with patches&PREFIX respect Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 17678 >Category: ports >Synopsis: Update port graphics/Mesa3 latest with patches&PREFIX respect >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Mar 29 20:50:02 PST 2000 >Closed-Date: >Last-Modified: >Originator: Mario Sergio Fujikawa Ferreira >Release: FreeBSD 4.0-STABLE i386 >Organization: >Environment: FreeBSD Here.here 4.0-STABLE FreeBSD 4.0-STABLE #9: Tue Mar 21 11:38:09 EST 2000 lioux@Here.here:/usr/current/src/sys/compile/LIOUX i386 >Description: Updated Mesa 3.1 to the latest official patch level and made it PREFIX safe. It was not respecting prefix regarding the recently added mesa.conf configuration file. It was always expecting it to be at /etc/mesa.conf regardless of the ${PREFIX} variable. + Added file: files/mesa-conf.patch It is pre-processed before being applied so that it holds the correct PREFIX safe location. >How-To-Repeat: n/a >Fix: diff -ruN ./Makefile /tmp/Mes/Makefile --- ./Makefile Mon Mar 20 20:23:28 2000 +++ /tmp/Mes/Makefile Thu Mar 30 01:25:10 2000 @@ -11,8 +11,9 @@ CATEGORIES= graphics MASTER_SITES= http://download.sourceforge.net/mesa3d/ \ ftp://iris.ssec.wisc.edu/pub/Mesa/ \ - ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/ -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MesaDemos-${VERSION}.tar.gz + ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/ \ + http://gd.tuwien.ac.at/graphics/libs/Mesa/ +DISTFILES= ${FETCH_FILES_TO} ${PATCH_FILES_EXTRA} MAINTAINER= jseger@FreeBSD.org @@ -21,15 +22,35 @@ CONFIGURE_ARGS+=--with-ggi=${LOCALBASE} .endif +EXTRACT_ONLY= ${FETCH_FILES_TO} +EXTRA_PATCHES= ${WRKDIR}/mesa-conf.patch + +FETCH_FILES_TO= ${DISTNAME}${EXTRACT_SUFX} \ + MesaDemos-${VERSION}${EXTRACT_SUFX} +PATCH_FILES_EXTRA= src/bitmap.c src/vbrender.c src/Makefile.fx \ + include/GL/mesa_wgl.h include/GL/amesa.h \ + src-glu/quadric.c + VERSION= 3.1 GLVER= 14 GLUTVER= 3 WRKSRC= ${WRKDIR}/${PKGNAME} +DIST_SUBDIR= Mesa USE_X_PREFIX= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes CONFIGURE_ENV+= GLVER="${GLVER}" GLUTVER="${GLUTVER}" PLIST_SUB= GLVER="${GLVER}" GLUTVER="${GLUTVER}" + +# it should respect ${PREFIX} +post-extract: + @${SED} s!__DEFINED_MESA_CONF_PATH!${PREFIX}/etc/mesa.conf!g ${FILESDIR}/mesa-conf.patch > ${WRKDIR}/mesa-conf.patch + +# or, post-extract: whichever is more adequate +pre-patch: +.for file in ${PATCH_FILES_EXTRA} + @${CP} ${DISTDIR}/${DIST_SUBDIR}/${file} ${WRKSRC}/${file} +.endfor post-install: .for lib in GL GLU diff -ruN ./files/md5 /tmp/Mes/files/md5 --- ./files/md5 Thu Mar 30 01:31:44 2000 +++ /tmp/Mes/files/md5 Thu Mar 30 01:24:52 2000 @@ -1,2 +1,8 @@ -MD5 (MesaLib-3.1.tar.gz) = 39af22bdf42f280f20afcacfa7ba4599 -MD5 (MesaDemos-3.1.tar.gz) = c788d5206acf290439f718d5f447724c +MD5 (Mesa/MesaLib-3.1.tar.gz) = 39af22bdf42f280f20afcacfa7ba4599 +MD5 (Mesa/MesaDemos-3.1.tar.gz) = c788d5206acf290439f718d5f447724c +MD5 (Mesa/src/bitmap.c) = 4cc89ccb7fbd5b322b149a96581f2a78 +MD5 (Mesa/src/vbrender.c) = 8cf327261b6d570c1f93aa98b6859765 +MD5 (Mesa/src/Makefile.fx) = c1dd412de0b46ee11fe3c041735279d8 +MD5 (Mesa/include/GL/mesa_wgl.h) = c14c9b4048af8b08440aa9b758cd4a66 +MD5 (Mesa/include/GL/amesa.h) = 766f8c080f407c187823bafb1e15a59b +MD5 (Mesa/src-glu/quadric.c) = 3b46c68356f6d01a65e362b255096288 diff -ruN ./files/mesa-conf.patch /tmp/Mes/files/mesa-conf.patch --- ./files/mesa-conf.patch Wed Dec 31 21:00:00 1969 +++ /tmp/Mes/files/mesa-conf.patch Thu Mar 30 00:20:19 2000 @@ -0,0 +1,13 @@ +This will teach it to respect ${PREFIX} + +--- src/config.c.orig Tue Dec 14 16:54:38 1999 ++++ src/config.c Wed Mar 29 23:02:29 2000 +@@ -406,7 +406,7 @@ + #if defined(__WIN32__) || defined(__MSDOS__) + const char *filename = "mesa.cnf"; + #else +- const char *filename = "/etc/mesa.conf"; ++ const char *filename = "__DEFINED_MESA_CONF_PATH"; + #endif + FILE *file; + struct cnode *list; >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message