summaryrefslogtreecommitdiff
path: root/graphics/glut
diff options
context:
space:
mode:
authorjschauma <jschauma>2003-11-18 16:10:55 +0000
committerjschauma <jschauma>2003-11-18 16:10:55 +0000
commite953c7f3fa6e05c9187b4fe3854f5e046b21c96d (patch)
tree2bb68f730e1b8885e40673667ec8b888cc17ebc3 /graphics/glut
parent40b5b342ee8b6ae1f3e28b8dbc93653d709a661f (diff)
downloadpkgsrc-e953c7f3fa6e05c9187b4fe3854f5e046b21c96d.tar.gz
Finally update Mesa and friends after the distfile changed on the website
without a version bump. Changes made, according to the website, for libtool/autofoo fixes. Some changes from Ron Roskens: glut depends upon graphics/glu (otherwise its linked against X11R6 libs) MesaDemos: rather than using the pre-built distribution makefiles, use the automake/configure built makefiles which have the build dependencies all setup. This closes PR pkg/23476.
Diffstat (limited to 'graphics/glut')
-rw-r--r--graphics/glut/Makefile7
-rw-r--r--graphics/glut/distinfo12
-rw-r--r--graphics/glut/patches/patch-ad14
-rw-r--r--graphics/glut/patches/patch-ae17
4 files changed, 43 insertions, 7 deletions
diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile
index 2040843cbfc..6692bac31d1 100644
--- a/graphics/glut/Makefile
+++ b/graphics/glut/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2003/11/09 02:23:18 jschauma Exp $
+# $NetBSD: Makefile,v 1.22 2003/11/18 16:10:56 jschauma Exp $
PKGNAME= ${DISTNAME:S/MesaLib/glut/}
-PKGREVISION= 1
+PKGREVISION= 2
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
DISTFILES+= ${DISTNAME:S/MesaLib/MesaDemos/}${EXTRACT_SUFX}
WRKSRC= ${WRKDIR}/${DISTNAME:S/Lib//}
@@ -17,6 +17,8 @@ USE_BUILDLINK2= yes
USE_X11BASE= yes
CONFIGURE_DIRS= ${WRKSRC}
BUILD_DIRS= ${WRKSRC}/src-glut
+USE_LIBTOOL= yes
+LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/include/GL
@@ -27,6 +29,7 @@ post-install:
done
.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/glu/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
# must be below bsd.pkg.mk to overwrite values
diff --git a/graphics/glut/distinfo b/graphics/glut/distinfo
index c6d6dba5a15..347c94fadd3 100644
--- a/graphics/glut/distinfo
+++ b/graphics/glut/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.16 2003/11/09 02:23:18 jschauma Exp $
+$NetBSD: distinfo,v 1.17 2003/11/18 16:10:56 jschauma Exp $
-SHA1 (MesaLib-5.0.2.tar.bz2) = 948b9e1b11d1341a4230a081469f4636f702ebdc
-Size (MesaLib-5.0.2.tar.bz2) = 1704278 bytes
-SHA1 (MesaDemos-5.0.2.tar.bz2) = 012d635c3e39dfa391b1183425f0630b1f428985
-Size (MesaDemos-5.0.2.tar.bz2) = 896368 bytes
+SHA1 (Mesa-5.0.2/MesaLib-5.0.2.tar.bz2) = a49234ad74d6c67b2727c1dd8a8c8e1ed7f63192
+Size (Mesa-5.0.2/MesaLib-5.0.2.tar.bz2) = 1719544 bytes
+SHA1 (Mesa-5.0.2/MesaDemos-5.0.2.tar.bz2) = 3c6f948023f5f41b8d5bd308076e9d8cfd194115
+Size (Mesa-5.0.2/MesaDemos-5.0.2.tar.bz2) = 901632 bytes
SHA1 (patch-aa) = d7a7dab7da7068c814a28b996bb3af6c24b48801
SHA1 (patch-ab) = 807b07b1505735f23dd4148c8c838df08af6333e
+SHA1 (patch-ad) = 4fac0779bb50f90b3f9bf2c0a73d7ff485a3db9e
+SHA1 (patch-ae) = 58bb48fb84edae72ecfb62682061cf6d723fe100
diff --git a/graphics/glut/patches/patch-ad b/graphics/glut/patches/patch-ad
new file mode 100644
index 00000000000..345892d2e74
--- /dev/null
+++ b/graphics/glut/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1 2003/11/18 16:10:56 jschauma Exp $
+
+--- src-glut/Makefile.am.orig 2003-11-07 11:36:19.000000000 -0500
++++ src-glut/Makefile.am 2003-11-17 23:48:12.000000000 -0500
+@@ -8,8 +8,7 @@
+ lib_LTLIBRARIES = libglut.la
+ EXTRA_PROGRAMS = capturexfont
+
+-#libglut_la_LDFLAGS = -version-info @LIBGLUT_VERSION_INFO@ -L../@GLU_DIR@
+-libglut_la_LDFLAGS = -L../@GLU_DIR@
++libglut_la_LDFLAGS = -version-info @LIBGLUT_VERSION_INFO@ -L../@GLU_DIR@
+ libglut_la_LIBADD = -lGLU
+ libglut_la_SOURCES = \
+ glutwin32.h \
diff --git a/graphics/glut/patches/patch-ae b/graphics/glut/patches/patch-ae
new file mode 100644
index 00000000000..d5f41da33a8
--- /dev/null
+++ b/graphics/glut/patches/patch-ae
@@ -0,0 +1,17 @@
+$NetBSD: patch-ae,v 1.1 2003/11/18 16:10:56 jschauma Exp $
+
+--- src/GGI/Makefile.am.orig 2003-11-13 21:47:55.000000000 -0500
++++ src/GGI/Makefile.am 2003-11-13 21:48:04.000000000 -0500
+@@ -7,10 +7,10 @@
+ ggimesaconfdatadir = ${sysconfdir}/ggi
+ ggimesaconfdata_DATA = ggimesa.conf
+
+-INCLUDES += -I$(top_srcdir)/include -I$(top_srcdir)/src/GGI/include \
++INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/GGI/include \
+ -I$(top_srcdir)/src $(GGI_CFLAGS)
+
+-DEFS += -DGGIMESACONFFILE=\"$(ggimesaconfdatadir)/ggimesa.conf\"
++DEFS = -DGGIMESACONFFILE=\"$(ggimesaconfdatadir)/ggimesa.conf\"
+
+ if HAVE_GGI
+ # Build a libtool convenience library.