Attachment 33857 Details for Bug 55246 – file.diff

[patch] file.diff

file.diff (text/plain), 4.66 KB, created by tkato on 2003-08-04 16:20:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2003-08-04 16:20:12 UTC

Size: 4.66 KB

patch

obsolete

>diff -urN /usr/ports/graphics/view3ds/Makefile graphics/view3ds/Makefile
>--- /usr/ports/graphics/view3ds/Makefile	Tue Jul 29 21:32:25 2003
>+++ graphics/view3ds/Makefile	Mon Aug  4 13:13:03 2003
>@@ -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 -urN /usr/ports/graphics/view3ds/distinfo graphics/view3ds/distinfo
>--- /usr/ports/graphics/view3ds/distinfo	Fri Jan 19 04:06:25 2001
>+++ graphics/view3ds/distinfo	Sun Aug  3 02:34:07 2003
>@@ -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 -urN /usr/ports/graphics/view3ds/files/patch-configure graphics/view3ds/files/patch-configure
>--- /usr/ports/graphics/view3ds/files/patch-configure	Thu Apr  5 23:08:24 2001
>+++ graphics/view3ds/files/patch-configure	Thu Jan  1 09:00:00 1970
>@@ -1,42 +0,0 @@
>-
>-$FreeBSD: ports/graphics/view3ds/files/patch-configure,v 1.2 2001/04/05 14:08:24 sobomax Exp $
>-
>---- 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 -urN /usr/ports/graphics/view3ds/files/patch-view3ds::document.cpp graphics/view3ds/files/patch-view3ds::document.cpp
>--- /usr/ports/graphics/view3ds/files/patch-view3ds::document.cpp	Wed Apr 24 23:05:05 2002
>+++ graphics/view3ds/files/patch-view3ds::document.cpp	Thu Jan  1 09:00:00 1970
>@@ -1,38 +0,0 @@
>-
>-$FreeBSD: ports/graphics/view3ds/files/patch-view3ds::document.cpp,v 1.1 2002/04/24 14:05:05 sobomax Exp $
>-
>---- 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 -urN /usr/ports/graphics/view3ds/pkg-descr graphics/view3ds/pkg-descr
>--- /usr/ports/graphics/view3ds/pkg-descr	Fri Jan 19 04:06:25 2001
>+++ graphics/view3ds/pkg-descr	Sun Aug  3 02:43:41 2003
>@@ -1,3 +1 @@
> A simple realtime 3DS file previewer based on the Lib3ds Library.
>-
>-WWW: http://lib3ds.sourceforge.net/

Actions: View | Diff

Attachments on bug 55246: 33857