5 files changed, 42 insertions, 26 deletions

diff --git a/graphics/k3d/Makefile b/graphics/k3d/Makefile
index 0ad388116dc9..d2204c057915 100644
--- a/graphics/k3d/Makefile
+++ b/graphics/k3d/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	k3d
-PORTVERSION=	0.4.1.0
-PORTREVISION=	2
+PORTVERSION=	0.4.4.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -27,9 +26,11 @@ LIB_DEPENDS=	sigc.1:${PORTSDIR}/devel/libsigc++ \
 		Half.2:${PORTSDIR}/graphics/OpenEXR \
 		gts.3:${PORTSDIR}/graphics/gts
 
+CONFLICTS=	atlas-3* superlu-3*
+
+USE_LIBTOOL_VER=15
 USE_GL=		yes
 USE_GNOME=	gnometarget gtk12 libxslt
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	\
 	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
@@ -44,15 +45,9 @@ MAN1=	k3d.1
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 502126
-BROKEN=		"Does not compile on FreeBSD >= 5.x"
-.endif
-
 .if ${OSVERSION} < 500000
 BROKEN=		"Does not compile on FreeBSD 4.x"
 .endif
-EXPIRATION_DATE=2005-02-18
-DEPRECATED=	"Does not compile"
 
 post-install:
 .for dir in ${PREFIX}/include/k3d ${PREFIX}/share/k3d ${PREFIX}/lib/k3d
diff --git a/graphics/k3d/distinfo b/graphics/k3d/distinfo
index 3e1a71df2e8e..af89ec5983a8 100644
--- a/graphics/k3d/distinfo
+++ b/graphics/k3d/distinfo
@@ -1,2 +1,2 @@
-MD5 (k3d-0.4.1.0.tgz) = 2c42382ade409af4ced7f42f4b471bb1
-SIZE (k3d-0.4.1.0.tgz) = 5399787
+MD5 (k3d-0.4.4.0.tgz) = 246ebc6446aa47709de48d9275d00f19
+SIZE (k3d-0.4.4.0.tgz) = 6075049
diff --git a/graphics/k3d/files/patch-Makefile.in b/graphics/k3d/files/patch-Makefile.in
new file mode 100644
index 000000000000..7963533afb19
--- /dev/null
+++ b/graphics/k3d/files/patch-Makefile.in
@@ -0,0 +1,19 @@
+--- Makefile.in.orig	Thu Nov  4 09:13:13 2004
++++ Makefile.in	Sat Jan 15 21:53:47 2005
+@@ -203,16 +203,11 @@
+ 
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+  configure.lineno
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+-	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  Makefile
+ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
+ 
+ $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	$(SHELL) ./config.status --recheck
+-$(srcdir)/configure:  $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+-	cd $(srcdir) && $(AUTOCONF)
+ 
+ $(ACLOCAL_M4):  configure.ac acinclude.m4
+ 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
diff --git a/graphics/k3d/files/patch-ltmain.sh b/graphics/k3d/files/patch-ltmain.sh
deleted file mode 100644
index dac9e30fb3f1..000000000000
--- a/graphics/k3d/files/patch-ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- ltmain.sh.orig	Thu Jun 10 09:49:38 2004
-+++ ltmain.sh	Thu Jun 10 09:49:53 2004
-@@ -4383,10 +4383,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false ; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/graphics/k3d/pkg-plist b/graphics/k3d/pkg-plist
index c1c6771547c9..aca9f842fee5 100644
--- a/graphics/k3d/pkg-plist
+++ b/graphics/k3d/pkg-plist
@@ -7,19 +7,36 @@ bin/k3d-renderframe
 bin/k3d-renderjob
 bin/k3d-uuidgen
 bin/sl2xml
+lib/libHapy.a
 lib/libHapy.so
 lib/libHapy.so.0
+lib/libcblas.a
+lib/libcblas.so
+lib/libcblas.so.0
+lib/libk3dembed.a
 lib/libk3dembed.so
 lib/libk3dembed.so.0
+lib/libk3dsdk.a
 lib/libk3dsdk.so
 lib/libk3dsdk.so.0
+lib/libk3dui.a
 lib/libk3dui.so
 lib/libk3dui.so.0
+lib/libsdpgl.a
 lib/libsdpgl.so
 lib/libsdpgl.so.0
+lib/libsdpgtk.a
 lib/libsdpgtk.so
 lib/libsdpgtk.so.0
+lib/libsdpsl.a
 lib/libsdpsl.so
 lib/libsdpsl.so.0
+lib/libsdpxml.a
 lib/libsdpxml.so
 lib/libsdpxml.so.0
+lib/libsuperlu.a
+lib/libsuperlu.so
+lib/libsuperlu.so.0
+lib/libsurface_polygonizer_library.a
+lib/libsurface_polygonizer_library.so
+lib/libsurface_polygonizer_library.so.0