From 96f66631f6a6ceab2b3c8c1a852fe1b37052dcd1 Mon Sep 17 00:00:00 2001 From: Ion-Mihai Tetcu Date: Tue, 1 Aug 2006 19:36:52 +0000 Subject: [PATCH] Update to version 0.3.0 PR: ports/101193 Submitted by: KATO Tsuguru --- graphics/meshviewer/Makefile | 15 ++++++++-- graphics/meshviewer/distinfo | 6 ++-- graphics/meshviewer/files/patch-Makefile | 35 ------------------------ graphics/meshviewer/files/patch-mesh.cc | 11 -------- graphics/meshviewer/pkg-plist | 23 ++++++++++------ 5 files changed, 30 insertions(+), 60 deletions(-) delete mode 100644 graphics/meshviewer/files/patch-Makefile delete mode 100644 graphics/meshviewer/files/patch-mesh.cc diff --git a/graphics/meshviewer/Makefile b/graphics/meshviewer/Makefile index 66274bb18986..38e97bb7e209 100644 --- a/graphics/meshviewer/Makefile +++ b/graphics/meshviewer/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ PORTNAME= meshviewer -PORTVERSION= 0.2.3 +PORTVERSION= 0.3.0 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= mview @@ -21,7 +21,18 @@ MAKE_ENV= MOC="${MOC}" \ QTCPPFLAGS="${QTCPPFLAGS} ${PTHREAD_CFLAGS}" \ QTCFGLIBS="${QTCFGLIBS} ${PTHREAD_LIBS}" -CFLAGS+= -fpermissive +post-patch: + @${REINPLACE_CMD} -e \ + 's|-I$$(QTDIR)/include|$${QTCPPFLAGS}|g ; \ + s|-L$$(QTDIR)/lib|$${QTCFGLIBS}|g ; \ + s|-L/usr/local/lib||g ; \ + s|-L${X11BASE}/lib||g ; \ + s|=g\+\+|=$${CXX}|g ; \ + s|^MOC=|#MOC=|g ; \ + s|-O2|$${CXXFLAGS}|g ; \ + s|make |$$(MAKE) |g' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e \ + 's|||g' ${WRKSRC}/mesh/mesh.cpp do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mview ${PREFIX}/bin diff --git a/graphics/meshviewer/distinfo b/graphics/meshviewer/distinfo index 42ae2be6c5b9..661ba7304cf1 100644 --- a/graphics/meshviewer/distinfo +++ b/graphics/meshviewer/distinfo @@ -1,3 +1,3 @@ -MD5 (mview-src-0.2.3.tar.gz) = 70e31823a8f8390549cd7bd47d5b3b08 -SHA256 (mview-src-0.2.3.tar.gz) = 2f5a9962ed0cabdab03fff666e24da7b690ce1ae3b080d224d4a6e28480d8c5e -SIZE (mview-src-0.2.3.tar.gz) = 637845 +MD5 (mview-src-0.3.0.tar.gz) = 7fa3605f502e780ca8a536f9a65553b3 +SHA256 (mview-src-0.3.0.tar.gz) = 759669af1c4a592589a72d291374db216ccf8893999469bf95e7a4a945b650ff +SIZE (mview-src-0.3.0.tar.gz) = 610246 diff --git a/graphics/meshviewer/files/patch-Makefile b/graphics/meshviewer/files/patch-Makefile deleted file mode 100644 index fb84a410bb4e..000000000000 --- a/graphics/meshviewer/files/patch-Makefile +++ /dev/null @@ -1,35 +0,0 @@ ---- Makefile.orig Thu Nov 27 08:40:45 2003 -+++ Makefile Thu Nov 27 23:48:26 2003 -@@ -1,13 +1,13 @@ - - #QTDIR=/usr/lib/qt3 --INCPATH = -I. -Itexture -Imesh -Imathvector -I$(QTDIR)/include --LIBPATH = -L$(QTDIR)/lib -L/usr/local/lib -L/usr/X11R6/lib -+INCPATH = -I. -Itexture -Imesh -Imathvector $(QTCPPFLAGS) -+LIBPATH = ${QTCFGLIBS} - --CC=g++ --MOC=$(QTDIR)/bin/moc -+CC=$(CXX) -+#MOC=$(QTDIR)/bin/moc - EXE=mview - --CPPFLAGS = $(INCPATH) -O2 -+CPPFLAGS = $(INCPATH) $(CXXFLAGS) - # supposedly compiler options for faster code - #CPPFLAGS = $(INCPATH) -O3 -fexceptions --fast-math -felide-constructors -fexpensive-optimizations -fdelayed-branch -fschedule-insns - -@@ -65,11 +65,11 @@ - - QT: - rm -f qt/mview.o -- make QT_2 -+ $(MAKE) QT_2 - - QT_TEXT: - rm -f qt/mview.o -- make QT_TEXT_2 "FLAGS=-DTEXT_MAP" -+ $(MAKE) QT_TEXT_2 "FLAGS=-DTEXT_MAP" - - GLUT: $(GLUT) $(TEXT) $(MESH) $(VEC) - $(CC) $? $(LIBPATH) $(LIBS_GLUT) -o $(EXE) diff --git a/graphics/meshviewer/files/patch-mesh.cc b/graphics/meshviewer/files/patch-mesh.cc deleted file mode 100644 index eeefcfd53a74..000000000000 --- a/graphics/meshviewer/files/patch-mesh.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- mesh/mesh.cc.orig Sat Feb 8 18:14:00 2003 -+++ mesh/mesh.cc Sat Feb 8 18:14:11 2003 -@@ -9,7 +9,7 @@ - #include - - // for MAXFLOAT --#include -+#include - - #include "mesh.h" - diff --git a/graphics/meshviewer/pkg-plist b/graphics/meshviewer/pkg-plist index 661018e71534..07e4137fa849 100644 --- a/graphics/meshviewer/pkg-plist +++ b/graphics/meshviewer/pkg-plist @@ -1,26 +1,31 @@ bin/mview +%%PORTDOCS%%%%DOCSDIR%%/build.html +%%PORTDOCS%%%%DOCSDIR%%/bunny.html %%PORTDOCS%%%%DOCSDIR%%/calc_text_map.html %%PORTDOCS%%%%DOCSDIR%%/castle.html %%PORTDOCS%%%%DOCSDIR%%/changelog.html +%%PORTDOCS%%%%DOCSDIR%%/formats.html %%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/momie.html +%%PORTDOCS%%%%DOCSDIR%%/mummy.html +%%PORTDOCS%%%%DOCSDIR%%/pics/bigben_small.jpg +%%PORTDOCS%%%%DOCSDIR%%/pics/bunny.jpg %%PORTDOCS%%%%DOCSDIR%%/pics/bunny_normals.png +%%PORTDOCS%%%%DOCSDIR%%/pics/bunny_small.jpg %%PORTDOCS%%%%DOCSDIR%%/pics/bunny_solid.png -%%PORTDOCS%%%%DOCSDIR%%/pics/bunny_tm.jpg %%PORTDOCS%%%%DOCSDIR%%/pics/bunny_wire.png +%%PORTDOCS%%%%DOCSDIR%%/pics/castle.jpg %%PORTDOCS%%%%DOCSDIR%%/pics/castle_small.jpg %%PORTDOCS%%%%DOCSDIR%%/pics/castle_solid.png %%PORTDOCS%%%%DOCSDIR%%/pics/castle_text1.png %%PORTDOCS%%%%DOCSDIR%%/pics/castle_text2.png -%%PORTDOCS%%%%DOCSDIR%%/pics/castle_tm.jpg %%PORTDOCS%%%%DOCSDIR%%/pics/mapping1.png %%PORTDOCS%%%%DOCSDIR%%/pics/mapping2.png %%PORTDOCS%%%%DOCSDIR%%/pics/mesh_title.jpg -%%PORTDOCS%%%%DOCSDIR%%/pics/momie_text.png -%%PORTDOCS%%%%DOCSDIR%%/pics/momie_tm.jpg -%%PORTDOCS%%%%DOCSDIR%%/pics/momie_wire1.png -%%PORTDOCS%%%%DOCSDIR%%/pics/momie_wire2.png -%%PORTDOCS%%%%DOCSDIR%%/rabbit.html -%%PORTDOCS%%%%DOCSDIR%%/test.wrl +%%PORTDOCS%%%%DOCSDIR%%/pics/mummy.jpg +%%PORTDOCS%%%%DOCSDIR%%/pics/mummy_text.png +%%PORTDOCS%%%%DOCSDIR%%/pics/mummy_wire1.png +%%PORTDOCS%%%%DOCSDIR%%/pics/mummy_wire2.png +%%PORTDOCS%%%%DOCSDIR%%/pics/totem_small.jpg +%%PORTDOCS%%%%DOCSDIR%%/style.css %%PORTDOCS%%@dirrm %%DOCSDIR%%/pics %%PORTDOCS%%@dirrm %%DOCSDIR%%