Upgrade to 2.4.0.

8 files changed, 63 insertions, 114 deletions

diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile
index 5c5b2a185131..084381995b54 100644
--- a/graphics/freeglut/Makefile
+++ b/graphics/freeglut/Makefile
@@ -6,40 +6,39 @@
 #
 
 PORTNAME=		freeglut
-PORTVERSION=		2.2.0
+PORTVERSION=		2.4.0
 CATEGORIES=		x11-toolkits
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An alternative to the OpenGL Utility Toolkit (GLUT) library
+MAINTAINER=		ports@FreeBSD.org
+COMMENT=		An alternative to the OpenGL Utility Toolkit (GLUT) library
 
-USE_AUTOMAKE_VER=	14
-USE_AUTOCONF_VER=	213
-USE_AUTOHEADER_VER=	213
-USE_INC_LIBTOOL_VER=	13
-HAS_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
-USE_XLIB=	yes
-CONFIGURE_ARGS=	--x-includes=${X11BASE}/include			\
-		--x-libraries=${X11BASE}/lib			\
-		--enable-replace-glut
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include"
+USE_LIBTOOL_VER=	15
+INSTALLS_SHLIB=		yes
+USE_XLIB=		yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS=		--x-includes=${X11BASE}/include	\
+			--x-libraries=${X11BASE}/lib
+CONFIGURE_ENV=		CPPFLAGS="-I${X11BASE}/include" LDFLAGS="-lusbhid"
 
-USE_REINPLACE=	yes
-REINPLACE_ARGS=	-i ""
+USE_REINPLACE=		yes
+REINPLACE_ARGS=		-i ""
 
-PKGMESSAGE=	${WRKDIR}/pkg-message
+PKGMESSAGE=		${WRKDIR}/pkg-message
+SUB_FILES=		pkg-message
 
 DOCS=	download.html freeglut.html freeglut_logo.png		\
 	freeglut_user_interface.html index.html ogl_sm.png	\
 	progress.html structure.html
 BINS=	CallbackMaker Fractals Fractals_random Lorenz One shapes
 
-post-patch:
-	@${REINPLACE_CMD} -e "s|/usr/X11R6|${X11BASE}|g"	\
-			-e "s|/usr/local|${LOCALBASE}|g"	\
-		${WRKSRC}/aclocal.m4
+.include <bsd.port.pre.mk>
+
+pre-configure:
+.if ${OSVERSION} < 500000
+	@${REINPLACE_CMD} -e "s|-Werror||" ${WRKSRC}/configure
+.endif
 .for fract in /fractals.c _random/fractals_random.c
 	@${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|g"		\
 		${WRKSRC}/progs/demos/Fractals${fract}
@@ -48,8 +47,6 @@ post-patch:
 post-build:
 	@${MV} ${WRKSRC}/progs/demos/CallbackMaker/.libs/CallbackMaker	\
 		${WRKSRC}/progs/demos/CallbackMaker/.libs/callbackmaker
-	@${CAT} pkg-message | ${SED} 's|%%X11BASE%%|${X11BASE}| ; \
-		s|%%PREFIX%%|${PREFIX}|' > ${PKGMESSAGE}
 
 post-install:
 .if !defined(NOPORTDOCS)
@@ -73,4 +70,4 @@ post-install:
 			-e "s|/usr/X11R6|${X11BASE}|"
 	@${ECHO_MSG}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/freeglut/distinfo b/graphics/freeglut/distinfo
index 378efe13c6b2..7e508f6a58d0 100644
--- a/graphics/freeglut/distinfo
+++ b/graphics/freeglut/distinfo
@@ -1,2 +1,2 @@
-MD5 (freeglut-2.2.0.tar.gz) = 9439b8745f443131c2dad00bc93dc0ef
-SIZE (freeglut-2.2.0.tar.gz) = 384055
+MD5 (freeglut-2.4.0.tar.gz) = 6d16873bd876fbf4980a927cfbc496a1
+SIZE (freeglut-2.4.0.tar.gz) = 469557
diff --git a/graphics/freeglut/files/patch-aclocal.m4 b/graphics/freeglut/files/patch-aclocal.m4
deleted file mode 100644
index e577623d2ff3..000000000000
--- a/graphics/freeglut/files/patch-aclocal.m4
+++ /dev/null
@@ -1,25 +0,0 @@
---- aclocal.m4.orig	Mon Sep 29 22:00:33 2003
-+++ aclocal.m4	Mon Sep 29 22:58:34 2003
-@@ -77,10 +77,10 @@
- # Some tools Automake needs.
- AC_REQUIRE([AM_SANITY_CHECK])dnl
- AC_REQUIRE([AC_ARG_PROGRAM])dnl
--AM_MISSING_PROG(ACLOCAL, aclocal)
--AM_MISSING_PROG(AUTOCONF, autoconf)
--AM_MISSING_PROG(AUTOMAKE, automake)
--AM_MISSING_PROG(AUTOHEADER, autoheader)
-+AM_MISSING_PROG(ACLOCAL, ${ACLOCAL})
-+AM_MISSING_PROG(AUTOCONF, ${AUTOCONF})
-+AM_MISSING_PROG(AUTOMAKE, ${AUTOMAKE})
-+AM_MISSING_PROG(AUTOHEADER, ${AUTOHEADER})
- AM_MISSING_PROG(MAKEINFO, makeinfo)
- AM_MISSING_PROG(AMTAR, tar)
- AM_PROG_INSTALL_SH
-@@ -567,6 +567,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/graphics/freeglut/files/patch-configure.in b/graphics/freeglut/files/patch-configure.in
deleted file mode 100644
index be7bb60f73f6..000000000000
--- a/graphics/freeglut/files/patch-configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.in.orig	Sat Sep 20 18:14:07 2003
-+++ configure.in	Mon Sep 22 21:19:52 2003
-@@ -8,8 +8,7 @@
- AC_PROG_CC
- AC_C_CONST
- AC_EXEEXT
--AC_LIBTOOL_DLOPEN
--AM_PROG_LIBTOOL
-+AC_PROG_LIBTOOL
- AC_SUBST(LIBTOOL_DEPS)
- 
- dnl Checks for libraries.
diff --git a/graphics/freeglut/files/patch-progs::demos::Lorenz::lorenz.c b/graphics/freeglut/files/patch-progs::demos::Lorenz::lorenz.c
index 16fbfb15078b..508cef726b90 100644
--- a/graphics/freeglut/files/patch-progs::demos::Lorenz::lorenz.c
+++ b/graphics/freeglut/files/patch-progs::demos::Lorenz::lorenz.c
@@ -1,11 +1,11 @@
---- progs/demos/Lorenz/lorenz.c.orig	Thu Dec 11 02:32:08 2003
-+++ progs/demos/Lorenz/lorenz.c	Sat Dec 13 10:19:26 2003
-@@ -32,7 +32,7 @@
+--- progs/demos/Lorenz/lorenz.c.orig	Mon Jan  3 11:24:15 2005
++++ progs/demos/Lorenz/lorenz.c	Sat Jun 11 14:06:07 2005
+@@ -31,7 +31,7 @@
+ #include <stdlib.h>
  #include <string.h>
  #include <math.h>
- #include <time.h>
 -#include <GL/freeglut.h>
 +#include "../../../include/GL/freeglut.h"
  #ifdef WIN32
- #include <crtdbg.h>  // DUMP MEMORY LEAKS
- #endif
+ /* DUMP MEMORY LEAKS */
+ #include <crtdbg.h>
diff --git a/graphics/freeglut/files/patch-src::Makefile.am b/graphics/freeglut/files/patch-src::Makefile.am
deleted file mode 100644
index 91705102960b..000000000000
--- a/graphics/freeglut/files/patch-src::Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/Makefile.am.orig	Thu Dec 11 02:32:09 2003
-+++ src/Makefile.am	Sat Dec 13 14:20:21 2003
-@@ -3,13 +3,13 @@
- #
- # The library we want to build
- #
--lib_LTLIBRARIES = lib@LIBRARY@.la
-+lib_LTLIBRARIES = libglut.la
- 
- noinst_HEADERS = freeglut_internal.h
- #
- # Those source files build the freeglut library
- #
--lib@LIBRARY@_la_SOURCES = freeglut_callbacks.c \
-+libglut_la_SOURCES = freeglut_callbacks.c \
- 			 freeglut_cursor.c \
- 			 freeglut_display.c \
- 			 freeglut_ext.c \
-@@ -35,9 +35,9 @@
- #
- # Additional linker flags
- #	 
--lib@LIBRARY@_la_LIBADD = $(LIBM) $(X_LIBS) -lGL -lGLU -lXext -lX11 $(LIBXXF86VM)
--lib@LIBRARY@_la_LDFLAGS = -version-info 11:0:8
--lib@LIBRARY@_la_CFLAGS = $(X_CFLAGS)
-+libglut_la_LIBADD = $(LIBM) $(X_LIBS) -lGL -lGLU -lXext -lX11 $(LIBXXF86VM)
-+libglut_la_LDFLAGS = -version-info 11:0:8
-+libglut_la_CFLAGS = $(X_CFLAGS)
- 
- #
- # End of file
diff --git a/graphics/freeglut/files/patch-src::freeglut_joystick.c b/graphics/freeglut/files/patch-src::freeglut_joystick.c
index 839f07f5e0c5..23f02203881a 100644
--- a/graphics/freeglut/files/patch-src::freeglut_joystick.c
+++ b/graphics/freeglut/files/patch-src::freeglut_joystick.c
@@ -1,14 +1,34 @@
-
-$FreeBSD$
-
---- src/freeglut_joystick.c.orig	Mon Nov 10 01:09:42 2003
-+++ src/freeglut_joystick.c	Mon Nov 10 01:10:52 2003
-@@ -57,7 +57,7 @@
- #   include <unistd.h>
- #   include <fcntl.h>
- #   if defined(__FreeBSD__) || defined(__NetBSD__)
--#   if __FreeBSD_version >= 500000
-+#   if defined(__FreeBSD__)
- #       include <sys/joystick.h>
- #   else
- #       include <machine/joystick.h>
+--- src/freeglut_joystick.c.orig	Wed May  4 14:53:48 2005
++++ src/freeglut_joystick.c	Sat Jun 11 14:40:48 2005
+@@ -80,7 +80,7 @@
+ /* XXX The below hack is done until freeglut's autoconf is updated. */
+ #        define HAVE_USB_JS    1
+ 
+-#        if defined(__FreeBSD__) && __FreeBSD_version >= 500000
++#        if defined(__FreeBSD__)
+ #            include <sys/joystick.h>
+ #        else
+ /*
+@@ -656,9 +656,9 @@
+                if (usage > 0 && usage < _JS_MAX_BUTTONS + 1)
+                {
+                    if (d)
+-                       joy->os->cache_buttons |= (1 << usage - 1);
++                       joy->os->cache_buttons |= (1 << (usage - 1));
+                    else
+-                       joy->os->cache_buttons &= ~(1 << usage - 1);
++                       joy->os->cache_buttons &= ~(1 <<( usage - 1));
+                }
+             }
+         }
+@@ -1060,7 +1060,9 @@
+ #    ifdef JS_NEW
+        unsigned char u;
+ #    else
+-       int counter;
++#      if defined( __linux__ )
++         int counter;
++#      endif
+ #    endif
+ #endif
+ 
diff --git a/graphics/freeglut/pkg-message b/graphics/freeglut/files/pkg-message.in
index d4009cb79482..d4009cb79482 100644
--- a/graphics/freeglut/pkg-message
+++ b/graphics/freeglut/files/pkg-message.in