- Convert to use Qt3

- Fix MASTER_SITES
- Remove obsolete WWW: line

PR:		55246
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

5 files changed, 18 insertions, 89 deletions

diff --git a/graphics/view3ds/Makefile b/graphics/view3ds/Makefile
index bb04492321e2..dca5c8b3a2f9 100644
--- a/graphics/view3ds/Makefile
+++ b/graphics/view3ds/Makefile
@@ -7,22 +7,32 @@
 
 PORTNAME=	view3ds
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	lib3ds
+MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
+DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
+
+PATCH_SITES=	${MASTER_SITES}
+PATCHFILES=	${PORTNAME}_${PORTVERSION}-9.diff.gz
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simple realtime 3DS file previewer based on the Lib3ds Library
 
 LIB_DEPENDS=	3ds.1:${PORTSDIR}/graphics/lib3ds
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
 USE_X_PREFIX=	yes
-USE_QT_VER=	2
+USE_QT_VER=	3
 USE_MESA=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ENV=	CPPFLAGS="-fno-rtti -fno-exceptions" \
-		LDFLAGS="-lm ${PTHREAD_LIBS}" \
-		QTDIR=${X11BASE}
+CONFIGURE_ENV=	QTDIR="${QT_PREFIX}"
+MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
+		AUTOHEADER="${TRUE}"
+
+QTCPPFLAGS+=	${PTHREAD_CFLAGS}
+QTCFGLIBS+=	${PTHREAD_LIBS}
 
 .include <bsd.port.mk>
diff --git a/graphics/view3ds/distinfo b/graphics/view3ds/distinfo
index 7061cc894605..f37186dc597c 100644
--- a/graphics/view3ds/distinfo
+++ b/graphics/view3ds/distinfo
@@ -1 +1,2 @@
-MD5 (view3ds-1.0.0.tar.gz) = d2b297379865111654537dd141e0e79a
+MD5 (view3ds_1.0.0.orig.tar.gz) = d2b297379865111654537dd141e0e79a
+MD5 (view3ds_1.0.0-9.diff.gz) = 40b99e53ab69aa03bcb3ff0c310f9bf1
diff --git a/graphics/view3ds/files/patch-configure b/graphics/view3ds/files/patch-configure
deleted file mode 100644
index c5f9e3c91854..000000000000
--- a/graphics/view3ds/files/patch-configure
+++ /dev/null
@@ -1,42 +0,0 @@
-
-$FreeBSD$
-
---- configure	2001/01/18 18:11:47	1.1
-+++ configure	2001/01/18 18:15:35
-@@ -2939,10 +2939,10 @@
-       echo "$ac_t""no" 1>&6
-     else
-       echo "$ac_t""yes" 1>&6
--      qt_includes="$QTDIR/include" 
-+      qt_includes="$QTDIR/include/qt2" 
-       qt_libraries="$QTDIR/lib" 
-       qt_binaries="$QTDIR/bin"
--      MOC="$qt_binaries/moc";
-+      MOC="$qt_binaries/moc2";
-       UIC="$qt_binaries/uic";
-     fi
-   fi
-@@ -3012,9 +3012,9 @@
-     saved_LIBS="$LIBS"
-     CPPFLAGS="$saved_CPPFLAGS -I$qt_includes"
-     if test -n "$qt_libraries"; then
--      LIBS="$saved_LIBS -L$qt_libraries -lqt"
-+      LIBS="$saved_LIBS -L$qt_libraries -lqtgl"
-     else
--      LIBS="$saved_LIBS -lqt -lm $X11_LIBS"
-+      LIBS="$saved_LIBS -lqtgl -lm $X11_LIBS"
-     fi
-     echo $ac_n "checking for QT includes ($qt_includes)""... $ac_c" 1>&6
- echo "configure:3021: checking for QT includes ($qt_includes)" >&5
-@@ -3086,9 +3086,9 @@
- rm -f conftest*
-       if test "$qt_libraries_found" = "yes"; then
-         if test -n "$qt_libraries"; then
--          QT_LIBS="-L$qt_libraries -lqt -lm $X11_LIBS";
-+          QT_LIBS="-L$qt_libraries -lqtgl -lm $X11_LIBS";
-         else
--          QT_LIBS="-lqt -lm $X11_LIBS";
-+          QT_LIBS="-lqtgl -lm $X11_LIBS";
-         fi
-         echo "$ac_t""yes" 1>&6
-       else
diff --git a/graphics/view3ds/files/patch-view3ds::document.cpp b/graphics/view3ds/files/patch-view3ds::document.cpp
deleted file mode 100644
index 6f2d0ae8e1ea..000000000000
--- a/graphics/view3ds/files/patch-view3ds::document.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-
-$FreeBSD$
-
---- view3ds/document.cpp	2002/04/24 11:23:51	1.1
-+++ view3ds/document.cpp	2002/04/24 11:24:33
-@@ -42,7 +42,9 @@
- Document::~Document()
- {
-   if (d_file) {
-+#if 0
-     lib3ds_close(d_file);
-+#endif
-     d_file=0;
-   }
- }
-@@ -55,17 +57,21 @@
- Document::open(QString filename)
- {
-   if (d_file) {
-+#if 0
-     lib3ds_close(d_file);
-+#endif
-     d_file=0;
-   }
--  d_file=lib3ds_open((const char*)filename);
-+  d_file=lib3ds_file_load((const char*)filename);
-   if (!d_file) {
-     puts("***ERROR*** Loading 3DS file failed.");
-     return(false);
-   }
-   if (!d_file->cameras) {
-     puts("***ERROR*** No Camera found.");
-+#if 0
-     lib3ds_close(d_file);
-+#endif
-     d_file=0;
-     return(false);
-   }
diff --git a/graphics/view3ds/pkg-descr b/graphics/view3ds/pkg-descr
index 8d09e2899691..b2f23eb5939a 100644
--- a/graphics/view3ds/pkg-descr
+++ b/graphics/view3ds/pkg-descr
@@ -1,3 +1 @@
 A simple realtime 3DS file previewer based on the Lib3ds Library.
-
-WWW: http://lib3ds.sourceforge.net/