3 files changed, 12 insertions, 118 deletions

diff --git a/graphics/togl/Makefile b/graphics/togl/Makefile
index 313984c2ecc6..d537d46610bf 100644
--- a/graphics/togl/Makefile
+++ b/graphics/togl/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	togl
-PORTVERSION=	1.6
-PORTREVISION=	2
+PORTVERSION=	1.7
 CATEGORIES=	graphics tk84
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	Togl-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -20,9 +18,15 @@ LIB_DEPENDS=	tk84.1:${PORTSDIR}/x11-toolkits/tk84 \
 		tcl84.1:${PORTSDIR}/lang/tcl84
 
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 USE_GL=		yes
 MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
+CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include/tk8.4" \
+		LDFLAGS="-L${LOCALBASE}/lib/tk8.4"
+CONFIGURE_ARGS=	--with-tk=${LOCALBASE}/lib/tk8.4 \
+		--with-tcl=${LOCALBASE}/lib/tcl8.4 \
+		--with-tclinclude=${LOCALBASE}/include/tcl8.4 \
 
 TOGL_INSTDIR=	${PREFIX}/lib/tk8.4/${DISTNAME}
 PLIST_SUB=	TOGL_INSTDIR=${TOGL_INSTDIR:S,^${PREFIX}/,,}
@@ -36,7 +40,7 @@ post-patch:
 
 do-install:
 	@${MKDIR} ${TOGL_INSTDIR}
-	${INSTALL_DATA} ${WRKSRC}/togl.so ${TOGL_INSTDIR}
+	${INSTALL_DATA} ${WRKSRC}/libTogl1.7.so ${TOGL_INSTDIR}/togl.so
 	${INSTALL_DATA} ${WRKSRC}/togl.h ${WRKSRC}/pkgIndex.tcl ${TOGL_INSTDIR}
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/Makefile ${EXAMPLESDIR}
diff --git a/graphics/togl/distinfo b/graphics/togl/distinfo
index cc1b7b20e851..2a696a4f6b20 100644
--- a/graphics/togl/distinfo
+++ b/graphics/togl/distinfo
@@ -1,3 +1,3 @@
-MD5 (Togl-1.6.tar.gz) = 1019f483ee1564c98310ff3ca9a75463
-SHA256 (Togl-1.6.tar.gz) = 245982b6ac1f7f6280476e5f70f33a9857cddb1f695602b0267e2e9f4221872a
-SIZE (Togl-1.6.tar.gz) = 130323
+MD5 (Togl-1.7.tar.gz) = 0e7da2559513b064dbb0934dc128b46d
+SHA256 (Togl-1.7.tar.gz) = 56b7580e3001cc4d334ff31bf6b9d730d05abb2faba7a3dbbc1c959ff7f7bcaf
+SIZE (Togl-1.7.tar.gz) = 205532
diff --git a/graphics/togl/files/patch-aa b/graphics/togl/files/patch-aa
deleted file mode 100644
index 50b0480a39a5..000000000000
--- a/graphics/togl/files/patch-aa
+++ /dev/null
@@ -1,110 +0,0 @@
---- Makefile.orig	Wed May  7 09:50:13 2003
-+++ Makefile	Tue Apr  6 17:00:50 2004
-@@ -7,7 +7,7 @@
- 
- 
- # The C compiler:
--CC = cc
-+CC ?= cc
- 
- # Compiler options:
- # for DEC
-@@ -17,7 +17,7 @@
- # for IBM
- #COPTS = -c -g -qchars=signed -DIBM
- # for PC_LINUX
--COPTS = -c -g -fPIC -mcpu=i586 -DPC_LINUX -DDEBUG -DUSE_TCL_STUBS -DUSE_TK_STUBS -DUSE_LOCAL_TK_H
-+COPTS = -c -fPIC -DPC_LINUX -DDEBUG -DUSE_TCL_STUBS -DUSE_TK_STUBS -DUSE_LOCAL_TK_H
- # for SGI
- #COPTS = -c -g -n32 -signed -DSGI
- # for SUN
-@@ -25,17 +25,20 @@
- 
- 
- # Shared library linker command:
--SHLINK = cc -shared
-+SHLINK = ${CC} -shared
- 
- 
- # Where to find tcl.h, tk.h, OpenGL/Mesa headers, etc:
- 
--TCL_PREFIX = /usr
-+TCL_PREFIX = ${PREFIX}
-+TK_PREFIX = ${PREFIX}
- #TCL_VER = 8.3
--TCL_VER = 
-+TCL_VER = 8.4
-+TK_VER = 8.4
- 
- # uncomment exactly one
--TCL_INCLUDE = -I$(TCL_PREFIX)/include
-+TCL_INCLUDE = -I$(TCL_PREFIX)/include/tcl${TCL_VER}
-+TK_INCLUDE = -I${TK_PREFIX}/include/tk${TK_VER}
- #TCL_INCLUDE = -I/pkg/tcl-tk/8.3.0/include
- # for DEC
- #INCLUDES = $(TCL_INCLUDE)
-@@ -44,7 +47,7 @@
- # for IBM
- #INCLUDES = -I/usr/lpp/OpenGL/include $(TCL_INCLUDE)
- # for PC_LINUX
--INCLUDES = -I/usr/X11R6/include $(TCL_INCLUDE)
-+INCLUDES = -I${X11BASE}/include $(TCL_INCLUDE) ${TK_INCLUDE}
- # for SGI
- #INCLUDES = $(TCL_INCLUDE)
- # for SUN
-@@ -54,6 +57,7 @@
- # Where to find libtcl.a, libtk.a, OpenGL/Mesa libraries:
- # uncomment exactly one
- TCL_LIB = -L$(TCL_PREFIX)/lib
-+TK_LIB = -L$(TK_PREFIX)/lib
- # for DEC
- #LIBDIRS =  $(TCL_LIB)
- # for HP
-@@ -61,19 +65,21 @@
- # for IBM
- #LIBDIRS = -L/usr/lpp/OpenGL/lib $(TCL_LIB)
- # for PC_LINUX
--LIBDIRS = $(TCL_LIB) -L/usr/X11R6/lib -Xlinker -rpath -Xlinker $(TCL_PREFIX)/lib
-+LIBDIRS = $(TCL_LIB) ${TK_LIB} -L${X11BASE}/lib -Xlinker -rpath -Xlinker
- # for SGI
- #LIBDIRS = $(TCL_LIB)
- # for SUN
- #LIBDIRS = -L/usr/openwin/lib $(TCL_LIB)
- 
--TCL_LIBS = -ltcl$(TCL_VER) -ltk$(TCL_VER)
--TCL_STUB_LIBS = -ltclstub$(TCL_VER) -ltkstub$(TCL_VER)
-+TCL_LIBS = -ltcl84
-+TK_LIBS = -ltk84
-+TCL_STUB_LIBS = -ltclstub84
-+TK_STUB_LIBS = -ltkstub84
- 
- # Libraries to link with (-ldl for Linux only?):
- # NOTE: use -ltcl8.1 -ltk8.1 for Tcl/Tk version 8.1
--LIBS = $(TCL_LIBS) -lGLU -lGL -L/usr/X11/lib -lX11 -lXmu -lXext -lXt -lm -ldl
--STUB_LIBS = $(TCL_STUB_LIBS) -lGLU -lGL -L/usr/X11/lib -lX11 -lXmu -lXext -lXt -lm -ldl
-+LIBS = $(TCL_LIBS) ${TK_LIBS} -lGLU -lGL -L/usr/X11/lib -lX11 -lXmu -lXext -lXt -lm
-+STUB_LIBS = $(TCL_STUB_LIBS) ${TK_STUB_LIBS} -lGLU -lGL -L/usr/X11/lib -lX11 -lXmu -lXext -lXt -lm
- 
- TK_FLAGS =
- 
-@@ -81,9 +87,9 @@
- #### Shouldn't have to change anything beyond this point ####
- 
- 
--CFLAGS = $(COPTS) $(INCLUDES) $(TK_FLAGS)
-+CFLAGS += $(COPTS) $(INCLUDES) $(TK_FLAGS) ${PTHREAD_CFLAGS}
- 
--LFLAGS = $(LIBDIRS)
-+LFLAGS = $(LIBDIRS) ${PTHREAD_LIBS}
- 
- 
- all: togl.so double.so texture.so index.so overlay.so gears.so pkgIndex
-@@ -162,7 +168,7 @@
- 	$(TOGL)/ben.rgb
- 
- pkgIndex:
--	echo 'puts [pkg::create -name Togl -version $(TOGL_VERSION) -load togl[info sharedlibextension]]' | tclsh > pkgIndex.tcl 
-+	echo 'puts [pkg::create -name Togl -version $(TOGL_VERSION) -load togl[info sharedlibextension]]' | tclsh${TCL_VER} > pkgIndex.tcl 
- 
- tar:
- 	cd .. ; \