From f1d0bebadfab42939c7cee2e8eb2cc201e9d59ee Mon Sep 17 00:00:00 2001 From: brad Date: Wed, 21 Nov 2001 14:11:32 +0000 Subject: [PATCH] bye bye, stub this out. --- graphics/Mesa/Makefile | 31 +------- graphics/Mesa/files/md5 | 12 ---- graphics/Mesa/files/mklib.openbsd-static | 33 --------- graphics/Mesa/patches/patch-configure | 13 ---- graphics/Mesa/patches/patch-ltconfig | 51 ------------- graphics/Mesa/patches/patch-ltmain.sh | 92 ------------------------ graphics/Mesa/pkg/DESCR | 9 --- graphics/Mesa/pkg/PFRAG.shared | 7 -- graphics/Mesa/pkg/PLIST | 22 ------ 9 files changed, 3 insertions(+), 267 deletions(-) delete mode 100644 graphics/Mesa/files/md5 delete mode 100755 graphics/Mesa/files/mklib.openbsd-static delete mode 100644 graphics/Mesa/patches/patch-configure delete mode 100644 graphics/Mesa/patches/patch-ltconfig delete mode 100644 graphics/Mesa/patches/patch-ltmain.sh delete mode 100644 graphics/Mesa/pkg/DESCR delete mode 100644 graphics/Mesa/pkg/PFRAG.shared delete mode 100644 graphics/Mesa/pkg/PLIST diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile index 02dceb3fdee..5b0cba82668 100644 --- a/graphics/Mesa/Makefile +++ b/graphics/Mesa/Makefile @@ -1,37 +1,12 @@ -# $OpenBSD: Makefile,v 1.16 2001/04/20 14:05:22 brad Exp $ +# $OpenBSD: Makefile,v 1.17 2001/11/21 14:11:32 brad Exp $ # $FreeBSD: Makefile,v 1.30 1998/11/11 05:37:18 asami Exp $ -COMES_WITH= 2.9 - COMMENT= "graphics library similar to SGI's OpenGL" -DISTNAME= Mesa-3.2.1 +PKGNAME= Mesa CATEGORIES= graphics -NEED_VERSION= 1.384 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= mesa3d -DISTFILES= MesaLib-3.2.1.tar.gz MesaDemos-3.2.1.tar.gz - -HOMEPAGE= http://www.mesa3d.org/ +IGNORE= "is included with X now" MAINTAINER= Brad Smith -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes - -CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} -CONFIGURE_ARGS+= --enable-static - -SHLIB_VERSION= 3.2 -GLUT_VERSION= 3.7 - -post-install: -.for lib in GL GLU - @cd ${PREFIX}/lib && ln -fs lib${lib}.a libMesa${lib}.a && \ - ln -fs lib${lib}.so.${SHLIB_VERSION} libMesa${lib}.so.${SHLIB_VERSION} -.endfor - .include diff --git a/graphics/Mesa/files/md5 b/graphics/Mesa/files/md5 deleted file mode 100644 index eb948a56348..00000000000 --- a/graphics/Mesa/files/md5 +++ /dev/null @@ -1,12 +0,0 @@ -MD5 (MesaDemos-3.0.tar.gz) = 6ec326092bf8f634a23f7203dc66baad -MD5 (MesaDemos-3.2.1.tar.gz) = a5a5dc1660567e28d87e7bd0acf402d5 -MD5 (MesaLib-3.0.tar.gz) = 34af82a8ab6b8283ea77855f3fdf7ef5 -MD5 (MesaLib-3.2.1.tar.gz) = 5b1c54fb8f0f130ac53cceb5010460f6 -RMD160 (MesaDemos-3.0.tar.gz) = 316d6ab48efa69d5fa66eab50f491c90dc4fd562 -RMD160 (MesaDemos-3.2.1.tar.gz) = a153312fa1743e3725b7439deb2925f47d477138 -RMD160 (MesaLib-3.0.tar.gz) = 07d1e8221b46b7e0cd358eeb18f7d1833d052566 -RMD160 (MesaLib-3.2.1.tar.gz) = 1a4bcec68de24862f0d86fcd37a60ac8e5545f03 -SHA1 (MesaDemos-3.0.tar.gz) = 6461da67eb83c8b3a6aeeefe00f5f76cd77c9b7e -SHA1 (MesaDemos-3.2.1.tar.gz) = 232533dc278be1006abac30a3fa64f40347b53fb -SHA1 (MesaLib-3.0.tar.gz) = 4b297bcde4b70d2f38763b18e3eaa22961e34f68 -SHA1 (MesaLib-3.2.1.tar.gz) = ff03e84a4a65be106f8b06853a455cbf6b7d7275 diff --git a/graphics/Mesa/files/mklib.openbsd-static b/graphics/Mesa/files/mklib.openbsd-static deleted file mode 100755 index 98796da32ad..00000000000 --- a/graphics/Mesa/files/mklib.openbsd-static +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -# Make a standard Unix .a library file with 'ar cq' - -#--common-------------------------------------------------------------- - -# Usage: mklib libname major minor file.o ... -# -# First argument is name of output library (LIBRARY) -# Second arg is major version number (MAJOR) -# Third arg is minor version number (MINOR) -# Rest of arguments are object files (OBJECTS) - -LIBRARY=$1 -shift 1 - -MAJOR=$1 -shift 1 - -MINOR=$1 -shift 1 - -OBJECTS=$* - -#--platform------------------------------------------------------------- - -set -x - -rm -f ${LIBRARY} -ar cq ${LIBRARY} ${OBJECTS} -ranlib ${LIBRARY} - -cp ${LIBRARY} ../lib diff --git a/graphics/Mesa/patches/patch-configure b/graphics/Mesa/patches/patch-configure deleted file mode 100644 index adc53a9855c..00000000000 --- a/graphics/Mesa/patches/patch-configure +++ /dev/null @@ -1,13 +0,0 @@ ---- configure.orig Wed Jul 26 16:54:46 2000 -+++ configure Wed Jul 26 16:56:04 2000 -@@ -822,8 +822,8 @@ - MESA_MAJOR=3 - MESA_MINOR=2 - MESA_TINY=1 --LIBGL_VERSION=1:2:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY} --LIBGLU_VERSION=1:1:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY} -+LIBGL_VERSION=${MESA_MAJOR}:${MESA_MINOR}:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY} -+LIBGLU_VERSION=${MESA_MAJOR}:${MESA_MINOR}:0${MESA_MAJOR}0${MESA_MINOR}0${MESA_TINY} - LIBGLUT_VERSION=3:7:0 - - diff --git a/graphics/Mesa/patches/patch-ltconfig b/graphics/Mesa/patches/patch-ltconfig deleted file mode 100644 index 1cf1a959052..00000000000 --- a/graphics/Mesa/patches/patch-ltconfig +++ /dev/null @@ -1,51 +0,0 @@ ---- ltconfig.orig Sat Jan 15 06:48:38 2000 -+++ ltconfig Tue Feb 20 16:22:49 2001 -@@ -1105,6 +1105,9 @@ cygwin* | mingw*) - with_gnu_ld=no - fi - ;; -+openbsd*) -+ with_gnu_ld=no -+ ;; - - esac - -@@ -1396,10 +1399,21 @@ else - ;; - - openbsd*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' -- hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -+ case "$host_os" in -+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' -+ hardcode_libdir_flag_spec='-R$libdir' -+ ;; -+ *) -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then -+ export_dynamic_flag_spec='${wl}-E' -+ fi -+ ;; -+ esac - ;; - - os2*) -@@ -1997,13 +2011,10 @@ netbsd*) - - openbsd*) - version_type=sunos -- if test "$with_gnu_ld" = yes; then -- need_lib_prefix=no -- need_version=no -- fi - library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH -+ deplibs_check_method='pass_all' - ;; - - os2*) diff --git a/graphics/Mesa/patches/patch-ltmain.sh b/graphics/Mesa/patches/patch-ltmain.sh deleted file mode 100644 index 7f32ccc62dd..00000000000 --- a/graphics/Mesa/patches/patch-ltmain.sh +++ /dev/null @@ -1,92 +0,0 @@ ---- ltmain.sh.orig Sat Jan 15 06:48:38 2000 -+++ ltmain.sh Tue Feb 20 16:24:03 2001 -@@ -1079,7 +1079,18 @@ compiler." - # These systems don't actually have c library (as such) - continue - ;; -+ *-*-openbsd*) -+ # Do not include libc due to us having libc/libc_r. -+ continue -+ ;; - esac -+ elif test "$arg" = "-lc_r"; then -+ case "$host" in -+ *-*-openbsd*) -+ # Do not include libc_r directly, use -pthread flag. -+ continue -+ ;; -+ esac - elif test "$arg" = "-lm"; then - case "$host" in - *-*-cygwin* | *-*-beos*) -@@ -1091,6 +1102,10 @@ compiler." - deplibs="$deplibs $arg" - ;; - -+ -?thread) -+ deplibs="$deplibs $arg" -+ ;; -+ - -module) - module=yes - continue -@@ -1802,6 +1817,9 @@ compiler." - *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) - # these systems don't actually have a c library (as such)! - ;; -+ *-*-openbsd*) -+ # Do not include libc due to us having libc/libc_r. -+ ;; - *) - # Add libc to deplibs on all other systems. - deplibs="$deplibs -lc" -@@ -2626,7 +2644,7 @@ static const void *lt_preloaded_setup() - # linked before any other PIC object. But we must not use - # pic_flag when linking with -static. The problem exists in - # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. -- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) -+ *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) - case "$compile_command " in - *" -static "*) ;; - *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";; -@@ -3562,40 +3580,6 @@ libdir='$install_libdir'\ - # Exit here if they wanted silent mode. - test "$show" = : && exit 0 - -- echo "----------------------------------------------------------------------" -- echo "Libraries have been installed in:" -- for libdir in $libdirs; do -- echo " $libdir" -- done -- echo -- echo "If you ever happen to want to link against installed libraries" -- echo "in a given directory, LIBDIR, you must either use libtool, and" -- echo "specify the full pathname of the library, or use \`-LLIBDIR'" -- echo "flag during linking and do at least one of the following:" -- if test -n "$shlibpath_var"; then -- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -- echo " during execution" -- fi -- if test -n "$runpath_var"; then -- echo " - add LIBDIR to the \`$runpath_var' environment variable" -- echo " during linking" -- fi -- if test -n "$hardcode_libdir_flag_spec"; then -- libdir=LIBDIR -- eval flag=\"$hardcode_libdir_flag_spec\" -- -- echo " - use the \`$flag' linker flag" -- fi -- if test -n "$admincmds"; then -- echo " - have your system administrator run these commands:$admincmds" -- fi -- if test -f /etc/ld.so.conf; then -- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -- fi -- echo -- echo "See any operating system documentation about shared libraries for" -- echo "more information, such as the ld(1) and ld.so(8) manual pages." -- echo "----------------------------------------------------------------------" - exit 0 - ;; - diff --git a/graphics/Mesa/pkg/DESCR b/graphics/Mesa/pkg/DESCR deleted file mode 100644 index 5533c02df91..00000000000 --- a/graphics/Mesa/pkg/DESCR +++ /dev/null @@ -1,9 +0,0 @@ -Mesa is a 3-D graphics library with an API which is very similar to that -of OpenGL*. To the extent that Mesa utilizes the OpenGL command syntax -or state machine, it is being used with authorization from Silicon Graphics, -Inc. However, the author makes no claim that Mesa is in any way a -compatible replacement for OpenGL or associated with Silicon Graphics, Inc. -Those who want a licensed implementation of OpenGL should contact a licensed -vendor. - -WWW: ${HOMEPAGE} diff --git a/graphics/Mesa/pkg/PFRAG.shared b/graphics/Mesa/pkg/PFRAG.shared deleted file mode 100644 index bf4f2b9ed81..00000000000 --- a/graphics/Mesa/pkg/PFRAG.shared +++ /dev/null @@ -1,7 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.3 2000/07/26 23:54:38 brad Exp $ -lib/libGL.so.3.2 -lib/libGLU.so.3.2 -lib/libMesaGL.so.3.2 -lib/libMesaGLU.so.3.2 -lib/libglut.so.3.7 -DYNLIBDIR(%B) diff --git a/graphics/Mesa/pkg/PLIST b/graphics/Mesa/pkg/PLIST deleted file mode 100644 index 19914203cf9..00000000000 --- a/graphics/Mesa/pkg/PLIST +++ /dev/null @@ -1,22 +0,0 @@ -@comment $OpenBSD: PLIST,v 1.3 2000/07/26 23:54:38 brad Exp $ -include/GL/gl.h -include/GL/gl_mangle.h -include/GL/glu.h -include/GL/glu_mangle.h -include/GL/glut.h -include/GL/glx.h -include/GL/glx_mangle.h -include/GL/osmesa.h -include/GL/xmesa.h -include/GL/xmesa_x.h -include/GL/xmesa_xf86.h -lib/libGL.a -lib/libGL.la -lib/libGLU.a -lib/libGLU.la -lib/libMesaGL.a -lib/libMesaGLU.a -lib/libglut.a -lib/libglut.la -%%SHARED%% -@dirrm include/GL