head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.54 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.52 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.50 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.48 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.46 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.44 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.42 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.40 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.38 pkgsrc-2008Q2-base:1.5 pkgsrc-2008Q1:1.5.0.36 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.34 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.32 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.30 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.28 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.26 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.24 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.22 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.20 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.18 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.16 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.14 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.5.0.12 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.5.0.10 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.5.0.8 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.5.0.6 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.5.0.4 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.5.0.2 pkgsrc-2003Q4-base:1.5 buildlink2-base:1.5 netbsd-1-5-PATCH001:1.4 netbsd-1-5-RELEASE:1.3 netbsd-1-4-PATCH003:1.3 netbsd-1-4-PATCH002:1.1 comdex-fall-1999:1.1; locks; strict; comment @# @; 1.5 date 2002.01.24.16.15.22; author tron; state dead; branches; next 1.4; 1.4 date 2000.12.28.17.29.45; author wiz; state Exp; branches; next 1.3; 1.3 date 2000.08.14.07.27.39; author tron; state Exp; branches; next 1.2; 1.2 date 2000.04.11.22.36.05; author tron; state Exp; branches; next 1.1; 1.1 date 99.10.01.18.43.18; author tron; state Exp; branches; next ; desc @@ 1.5 log @Remove "Mesa-glx" package which has been broken for nine month now. 3D acceleration requires XFree86 4.x these days anyway. @ text @$NetBSD: patch-ab,v 1.4 2000/12/28 17:29:45 wiz Exp $ --- libGL/Makefile.in.orig Sat Jun 3 10:16:36 2000 +++ libGL/Makefile.in @@@@ -14,7 +14,7 @@@@ # These define the name/version of the shared library we're building # ------------------------------------------------------------------ LIBNAME = GL -SOGLREV = 1.0 +SOGLREV = 3:0 # Source and Object files # ----------------------- @@@@ -23,7 +23,6 @@@@ map_points.c pointers.c glx_varray.c direct_protocol.c OBJS = ${SRCS:.c=.o} -UNSHARED_OBJS = unshared/*.o # Additional compiler rules @@@@ -50,22 +49,12 @@@@ ${CC} ${ALL_CFLAGS} -E $*.c > $@@ .c.o: -ifeq "${USE_DYNAMIC_MODULE}" "yes" - ${RM} $@@ - ${CC} ${ALL_CFLAGS} ${SHARED_CFLAGS} -c $< -else - ${RM} unshared/$@@ - ${CC} ${ALL_CFLAGS} -c $< -o unshared/$@@ -endif + ${LIBTOOL} ${CC} ${ALL_CFLAGS} -c $< # Main targets # ------------ -ifeq "${USE_DYNAMIC_MODULE}" "yes" -all : lib${LIBNAME}.so.${SOGLREV} -else -all : unshared-subdir lib${LIBNAME}.a -endif +all : lib${LIBNAME}.la clean : @@@@ -79,20 +68,8 @@@@ ${DEPEND} -f .deps -- ${ALL_CFLAGS} -- ${SRCS} -ifeq "${USE_DYNAMIC_MODULE}" "yes" -install: lib${LIBNAME}.so.${SOGLREV} - @@if [ -d ${DESTDIR}${INSTALL_libdir} ]; then set +x; \ - else (set -x; ${MKDIR} ${DESTDIR}${INSTALL_libdir}); fi - ${INSTALL} ${INSTALLFLAGS} ${INSTBINFLAGS} lib${LIBNAME}.so.${SOGLREV} ${DESTDIR}${INSTALL_libdir} - @@T=`echo ${DESTDIR}${INSTALL_libdir}/lib${LIBNAME}.so.${SOGLREV} | sed 's/\.[^\.]*$$//'`; set -x; ${RM} $$T && ${LN} lib${LIBNAME}.so.${SOGLREV} $$T - ${RM} ${DESTDIR}${INSTALL_libdir}/lib${LIBNAME}.so - ${LN} lib${LIBNAME}.so.${SOGLREV} ${DESTDIR}${INSTALL_libdir}/lib${LIBNAME}.so -else -install: lib${LIBNAME}.a - @@if [ -d ${DESTDIR}${INSTALL_libdir} ]; then set +x; \ - else (set -x; ${MKDIR} ${DESTDIR}${INSTALL_libdir}); fi - ${INSTALL} ${INSTALLFLAGS} ${INSTBINFLAGS} lib${LIBNAME}.a ${DESTDIR}${INSTALL_libdir} -endif +install: lib${LIBNAME}.la + ${LIBTOOL} ${BSD_INSTALL_DATA} $< ${DESTDIR}${INSTALL_libdir} tags : ${TAGS} -w *.[ch] @@@@ -110,21 +87,10 @@@@ render.c: genlib.tcl genGL.tcl ${TCLSH} genlib.tcl -lib${LIBNAME}.so.${SOGLREV} : render.c ${OBJS} - ${RM} $@@~ - @@SONAME=`echo $@@ | sed 's/\.[^\.]*$$//'`; set -x; \ - if [ `uname` = "SunOS" ] ; then \ - ${CC} -o ./$@@~ ${SHARED_LDFLAGS} -Wl,-h,$$SONAME ${OBJS} \ - ${XLIBDIR} ${XLIBS} ${LIBS} ${MATHLIBS}; \ - else \ - ${CC} -o ./$@@~ ${SHARED_LDFLAGS} -Wl,-soname,$$SONAME ${OBJS} \ - ${XLIBDIR} ${XLIBS} ${LIBS} ${MATHLIBS}; \ - fi; \ - ${RM} $$SONAME; ${LN} $@@ $$SONAME; \ - ${RM} $@@ - ${MV} $@@~ $@@ - ${RM} lib${LIBNAME}.so - ${LN} $@@ lib${LIBNAME}.so +lib${LIBNAME}.la : render.c ${OBJS} + ${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${INSTALL_libdir} \ + -version-info ${SOGLREV} -Wl,-R${X11BASE}/lib ${XLIBDIR} ${XLIBS} \ + ${LIBS} ${MATHLIBS} -o $@@ ${OBJS:.o=.lo} lib${LIBNAME}.a : render.c ${UNSHARED_OBJS} ${RM} $@@~ @ 1.4 log @Fix library dependencies for libGL. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Update "Mesa-glx" package to version 20000813. Most of the work was done by Thomas Klausner. A change list is not available unfortunately. @ text @d4 1 a4 1 +++ libGL/Makefile.in Sun Aug 13 23:46:13 2000 d70 1 a70 1 @@@@ -110,21 +87,9 @@@@ d91 2 a92 1 + -version-info ${SOGLREV} -o $@@ ${OBJS:.o=.lo} @ 1.2 log @Update "Mesa-glx" to "20000407" snapshot based on Mesa 3.1. It now supports the following graphic chipsets: - MGA (Matrox G200/G400) - Mach64 (ATI Rage Pro) - NVIDIA RIVA TNT/TNT2 - Intel i810 - S3 ViRGE DX/GX/GX2/MX (** EXPERIMENTAL **) - SiS 6326 (** EXPERIMENTAL **) The libraries must no longer be compiled for a certain chipset. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1.1.1 1999/09/29 22:44:17 tron Exp $ d3 2 a4 2 --- libGL/Makefile.in.orig Sun Feb 27 13:52:53 2000 +++ libGL/Makefile.in Thu Apr 6 23:29:08 2000 d47 1 a47 1 @@@@ -78,20 +67,8 @@@@ d53 6 a58 6 - @@if [ -d ${INSTALL_libdir} ]; then set +x; \ - else (set -x; ${MKDIR} ${INSTALL_libdir}); fi - ${INSTALL} ${INSTALLFLAGS} ${INSTBINFLAGS} lib${LIBNAME}.so.${SOGLREV} ${INSTALL_libdir} - @@T=`echo ${INSTALL_libdir}/lib${LIBNAME}.so.${SOGLREV} | sed 's/\.[^\.]*$$//'`; set -x; ${RM} $$T && ${LN} lib${LIBNAME}.so.${SOGLREV} $$T - ${RM} ${INSTALL_libdir}/lib${LIBNAME}.so - ${LN} lib${LIBNAME}.so.${SOGLREV} ${INSTALL_libdir}/lib${LIBNAME}.so d61 3 a63 3 - @@if [ -d ${INSTALL_libdir} ]; then set +x; \ - else (set -x; ${MKDIR} ${INSTALL_libdir}); fi - ${INSTALL} ${INSTALLFLAGS} ${INSTBINFLAGS} lib${LIBNAME}.a ${INSTALL_libdir} d66 1 a66 1 + ${LIBTOOL} ${BSD_INSTALL_DATA} $< ${INSTALL_libdir} d70 1 a70 1 @@@@ -109,21 +86,9 @@@@ d90 1 a90 1 + ${LIBTOOL} --mode=link ${CC} -rpath ${INSTALL_libdir} \ @ 1.1 log @Add missing build dependences on "perl" package and use correct path "${LOCALBASE}/bin/perl" to execute the binary. Problem noted by Mario Kemper in private e-mail. @ text @d1 1 a1 1 $NetBSD$ d3 8 a10 8 --- servGL/hwglx/mga/Makefile.in.orig Sat Jul 31 09:07:55 1999 +++ servGL/hwglx/mga/Makefile.in Fri Oct 1 19:43:02 1999 @@@@ -80,7 +80,7 @@@@ # ------------- mgaregs.h : mgaregs.pl - ./mgaregs.pl + ${PERL} ./mgaregs.pl d12 83 a94 2 #tritmpl.h : tmplgen.sh # ./tmplgen.sh triangle.tmpl @