Attachment 86120 Details for Bug 122499 – file.diff

[patch] file.diff

file.diff (text/plain), 5.34 KB, created by tkato432 on 2008-04-06 17:10:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2008-04-06 17:10:07 UTC

Size: 5.34 KB

patch

obsolete

>diff -urN /usr/ports/graphics/qslim/Makefile graphics/qslim/Makefile
>--- /usr/ports/graphics/qslim/Makefile	2008-03-20 19:48:16.000000000 +0900
>+++ graphics/qslim/Makefile	2008-03-24 03:55:23.000000000 +0900
>@@ -7,43 +7,41 @@
> #
> 
> PORTNAME=	qslim
>-PORTVERSION=	2.0
>-PORTREVISION=	3
>+PORTVERSION=	2.1
> CATEGORIES=	graphics
> MASTER_SITES=	http://graphics.cs.uiuc.edu/~garland/dist/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	SlimKit Surface Modeling Tools
> 
>+BUILD_DEPENDS=	${LOCALBASE}/include/gfx/gfx.h:${PORTSDIR}/graphics/libgfx
> LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
> 		tiff.4:${PORTSDIR}/graphics/tiff \
>-		forms.1:${PORTSDIR}/x11-toolkits/xforms \
>-		glut.4:${PORTSDIR}/graphics/libglut
>+		fltk.1:${PORTSDIR}/x11-toolkits/fltk
> 
>-CONFIGURE_WRKSRC=	${WRKSRC}/mixkit/build
>-BUILD_WRKSRC=	${WRKSRC}/mixkit/src
>+CONFIGURE_WRKSRC=	${WRKDIR}/${DISTNAME}/mixkit
>+BUILD_WRKSRC=	${WRKDIR}/${DISTNAME}/mixkit/src
> 
>+USE_GNOME=	gnometarget
>+USE_GL=		glu
> USE_GMAKE=	yes
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
> ALL_TARGET=	# none
> 
>-CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include \
>-		-I${X11BASE}/include/X11 ${PTHREAD_CFLAGS}
>-LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
>+CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
>+LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
> 
> CFLAGS+=	-DMIX_ANSI_IOSTREAMS -fpermissive
> 
>-post-extract:
>-	@${RM} -f ${WRKSRC}/mixkit/src/getopt.h
>-
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|\@XFORMS_LIBS\@|-lforms -lformsGL -lXpm|g' \
>-		${CONFIGURE_WRKSRC}/mix-config.in
>+pre-configure:
>+	@(cd ${CONFIGURE_WRKSRC}/../libgfx && ${SETENV} ${CONFIGURE_ENV} \
>+		CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \
>+		CXXFLAGS="${CXXFLAGS}" ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
> 
> post-build:
>-	@(cd ${BUILD_WRKSRC}/../../tools/qslim ; ${GMAKE} all)
>-	@(cd ${BUILD_WRKSRC}/../../tools/filters ; ${GMAKE} all)
>+	@(cd ${BUILD_WRKSRC}/../../tools/qslim && ${SETENV} ${MAKE_ENV} \
>+		${GMAKE} ${MAKE_ARGS} ${ALL_TARGET})
> 
> do-install:
> 	${INSTALL_DATA} ${WRKSRC}/mixkit/src/libmix.a ${PREFIX}/lib
>diff -urN /usr/ports/graphics/qslim/distinfo graphics/qslim/distinfo
>--- /usr/ports/graphics/qslim/distinfo	2005-11-26 19:25:27.000000000 +0900
>+++ graphics/qslim/distinfo	2005-10-07 19:40:11.000000000 +0900
>@@ -1,3 +1,2 @@
>-MD5 (qslim-2.0.tar.gz) = 0795b179309df3b890e65b07621b81ca
>-SHA256 (qslim-2.0.tar.gz) = 6b093da157086de437a46c25547150ee942fcfc2076e7bd9e42d833f700e7f0b
>-SIZE (qslim-2.0.tar.gz) = 160250
>+MD5 (qslim-2.1.tar.gz) = 07dce2db7e577e7852b1bcaa86aa5d0f
>+SIZE (qslim-2.1.tar.gz) = 287513
>diff -urN /usr/ports/graphics/qslim/files/patch-mixkit::src::MxAsp.cxx graphics/qslim/files/patch-mixkit::src::MxAsp.cxx
>--- /usr/ports/graphics/qslim/files/patch-mixkit::src::MxAsp.cxx	2003-11-04 04:26:41.000000000 +0900
>+++ graphics/qslim/files/patch-mixkit::src::MxAsp.cxx	1970-01-01 09:00:00.000000000 +0900
>@@ -1,31 +0,0 @@
>---- mixkit/src/MxAsp.cxx.orig	Sat Jan 23 06:50:45 1999
>-+++ mixkit/src/MxAsp.cxx	Mon Nov  3 22:09:45 2003
>-@@ -53,8 +53,8 @@
>- }
>- 
>- #define asprint(V)\
>--out<< *as##.##V##_var; \
>--for(i=1; i<size; i++) out << " " << as##.##V##_var[i]
>-+out<< *as.V##_var; \
>-+for(i=1; i<size; i++) out << " " << as.V##_var[i]
>- 
>- ostream& MxAspVar::print(ostream& out) const
>- {
>-@@ -79,7 +79,7 @@
>- #define defset(V, T) \
>- bool MxAspVar::set_##V(V val, uint i) \
>- {\
>--     if( type==T && i<size ) { as##.##V##_var[i]=val; return true; } \
>-+     if( type==T && i<size ) { as.V##_var[i]=val; return true; } \
>-      else  return false; \
>- }
>- 
>-@@ -94,7 +94,7 @@
>- #define defget(V, T) \
>- V *MxAspVar::get_##V(V *out, uint i) \
>- {\
>--     if( type==T && i<size ) { *out = as##.##V##_var[i]; return out; } \
>-+     if( type==T && i<size ) { *out = as.V##_var[i]; return out; } \
>-      else  return NULL; \
>- } 
>- 
>diff -urN /usr/ports/graphics/qslim/pkg-plist graphics/qslim/pkg-plist
>--- /usr/ports/graphics/qslim/pkg-plist	2002-09-20 19:33:37.000000000 +0900
>+++ graphics/qslim/pkg-plist	2005-10-07 21:10:03.000000000 +0900
>@@ -1,6 +1,5 @@
> bin/qslim
> bin/qvis
>-include/mixkit/MxArcball.h
> include/mixkit/MxAsp.h
> include/mixkit/MxBlock.h
> include/mixkit/MxBlock2.h
>@@ -8,15 +7,21 @@
> include/mixkit/MxBlockModel.h
> include/mixkit/MxCamera.h
> include/mixkit/MxCmdParser.h
>+include/mixkit/MxDualModel.h
>+include/mixkit/MxDualSlim.h
> include/mixkit/MxDynBlock.h
> include/mixkit/MxEdgeFilter.h
>+include/mixkit/MxFaceTree.h
>+include/mixkit/MxFeatureFilter.h
>+include/mixkit/MxFitFrame.h
>+include/mixkit/MxFrame.h
> include/mixkit/MxGL.h
>-include/mixkit/MxGLPane.h
> include/mixkit/MxGLUtils.h
>+include/mixkit/MxGUI.h
> include/mixkit/MxGeoPrims.h
>+include/mixkit/MxGeom2D.h
> include/mixkit/MxGeom3D.h
> include/mixkit/MxHeap.h
>-include/mixkit/MxLineModel.h
> include/mixkit/MxManipulator.h
> include/mixkit/MxMat2.h
> include/mixkit/MxMat3.h
>@@ -25,21 +30,20 @@
> include/mixkit/MxMatrix.h
> include/mixkit/MxPropSlim.h
> include/mixkit/MxQMetric.h
>-include/mixkit/MxQMetric2.h
> include/mixkit/MxQMetric3.h
> include/mixkit/MxQSlim.h
> include/mixkit/MxRaster.h
> include/mixkit/MxSMF.h
> include/mixkit/MxStack.h
>+include/mixkit/MxStdGUI.h
> include/mixkit/MxStdModel.h
>-include/mixkit/MxStdPane.h
> include/mixkit/MxStdSlim.h
>+include/mixkit/MxString.h
> include/mixkit/MxTimer.h
> include/mixkit/MxVec2.h
> include/mixkit/MxVec3.h
> include/mixkit/MxVec4.h
> include/mixkit/MxVector.h
>-include/mixkit/mixcfg.h
> include/mixkit/mixio.h
> include/mixkit/mixmops.h
> include/mixkit/mixmsg.h

Actions: View | Diff

Attachments on bug 122499: 86120