4 files changed, 63 insertions, 10 deletions

diff --git a/math/k3dsurf/Makefile b/math/k3dsurf/Makefile
index 93a112a907d6..5427ac52658c 100644
--- a/math/k3dsurf/Makefile
+++ b/math/k3dsurf/Makefile
@@ -1,26 +1,25 @@
-# New ports collection makefile for:	K3DSurf
-# Date created:		Sun 19 feb 2006
-# Whom:			thierry@pompo.net
+# Created by: thierry@pompo.net
 #
 # $FreeBSD$
 #
 
 PORTNAME=	k3dsurf
-PORTVERSION=	0.6.2
-PORTREVISION=	5
+PORTVERSION=	0.6.2.4
 CATEGORIES=	math graphics
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}_Linux/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}_Linux/${PORTVERSION:R}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Visualize and manipulate Mathematical surfaces or curves
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
 
 USE_GL=		yes
 USE_QT_VER=	3
-QTDIR?=		${QT_PREFIX}
+QTDIR=		${QT_PREFIX}
 MAKE_ENV=	QMAKESPEC="${LOCALBASE}/share/qt/mkspecs/freebsd-g++"	\
-		QTDIR="${QTDIR}"
+		QTDIR="${QTDIR}" PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/math/k3dsurf/distinfo b/math/k3dsurf/distinfo
index 5ac115aa3eae..f83224de38b2 100644
--- a/math/k3dsurf/distinfo
+++ b/math/k3dsurf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (k3dsurf-0.6.2.tar.gz) = 7d98781df74d3197b49a5a9ff748de088b8a8038ddaa6e53ee044c4c17440761
-SIZE (k3dsurf-0.6.2.tar.gz) = 1346107
+SHA256 (k3dsurf-0.6.2.4.tar.gz) = dc8d2b9b092ee03fd5a3d4ce211c24fa86d81d5278b0fd14dcb45e7f007cdc3e
+SIZE (k3dsurf-0.6.2.4.tar.gz) = 4317832
diff --git a/math/k3dsurf/files/patch-Makefile b/math/k3dsurf/files/patch-Makefile
new file mode 100644
index 000000000000..230b0ae85f04
--- /dev/null
+++ b/math/k3dsurf/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.orig	2009-05-24 17:52:01.000000000 +0200
++++ Makefile	2012-11-13 22:10:45.000000000 +0100
+@@ -26,7 +26,7 @@
+ sub-src: src/$(MAKEFILE) FORCE
+ 	cd src && $(MAKE) -f $(MAKEFILE)
+ 
+-Makefile: k3dsurf.pro  /usr/share/qt3/mkspecs/default/qmake.conf 
++Makefile: k3dsurf.pro
+ 	$(QMAKE) -o Makefile k3dsurf.pro
+ qmake: qmake_all
+ 	@$(QMAKE) -o Makefile k3dsurf.pro
diff --git a/math/k3dsurf/files/patch-src_Makefile b/math/k3dsurf/files/patch-src_Makefile
new file mode 100644
index 000000000000..647251d6270a
--- /dev/null
+++ b/math/k3dsurf/files/patch-src_Makefile
@@ -0,0 +1,43 @@
+--- src/Makefile.orig	2009-05-24 17:52:07.000000000 +0200
++++ src/Makefile	2012-11-13 22:29:38.000000000 +0100
+@@ -8,22 +8,22 @@
+ 
+ ####### Compiler, tools and options
+ 
+-CC       = gcc
+-CXX      = g++
++#CC       = gcc
++#CXX      = g++
+ LEX      = flex
+ YACC     = yacc
+-CFLAGS   = -pipe -g -Wall -W -O2 -D_REENTRANT  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT
+-CXXFLAGS = -pipe -g -Wall -W -O2 -D_REENTRANT  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT
++CFLAGS   += -D_REENTRANT  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT
++CXXFLAGS += -D_REENTRANT  -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT
+ LEXFLAGS = 
+ YACCFLAGS= -d
+-INCPATH  = -I/usr/share/qt3/mkspecs/default -I. -I/usr/include/qt3 -I/usr/X11R6/include -I/usr/X11R6/include
+-LINK     = g++
++INCPATH  = -I. -I$(QTDIR)/include
++LINK     = $(CXX)
+ LFLAGS   = 
+-LIBS     = $(SUBLIBS) -L/usr/share/qt3/lib -L/usr/X11R6/lib -L/usr/X11R6/lib -lqt-mt -lGLU -lGL -lXmu -lXext -lX11 -lm -lpthread
++LIBS     = $(SUBLIBS) -L/$(QTDIR)/lib -lqt-mt -lGLU -lGL -lXmu -lXext -lX11 -lm $(PTHREAD_LIBS)
+ AR       = ar cqs
+ RANLIB   = 
+-MOC      = /usr/share/qt3/bin/moc
+-UIC      = /usr/share/qt3/bin/uic
++MOC      = $(LOCALBASE)/bin/moc
++UIC      = $(LOCALBASE)/bin/uic
+ QMAKE    = qmake
+ TAR      = tar -cf
+ GZIP     = gzip -9f
+@@ -201,7 +201,7 @@
+ $(MOC): 
+ 	( cd $(QTDIR)/src/moc && $(MAKE) )
+ 
+-Makefile: src.pro  /usr/share/qt3/mkspecs/default/qmake.conf /usr/share/qt3/lib/libqt-mt.prl
++Makefile: src.pro
+ 	$(QMAKE) -o Makefile src.pro
+ qmake: 
+ 	@$(QMAKE) -o Makefile src.pro