diff options
| author | Kirill Ponomarev <krion@FreeBSD.org> | 2003-12-04 10:26:54 +0000 |
|---|---|---|
| committer | Kirill Ponomarev <krion@FreeBSD.org> | 2003-12-04 10:26:54 +0000 |
| commit | 7fea8c4e24c04210ad305fcea808f177fefbaba2 (patch) | |
| tree | ddbdb385207be868510c47d762bce033859c09d9 /graphics/meshviewer | |
| parent | Downgrade to 3.65 after a repocopy of net/p5-Net-SNMP. (diff) | |
- Update to version 0.2.1.1
PR: 59755
Submitted by: Ports Fury
Notes
Notes:
svn path=/head/; revision=94935
Diffstat (limited to 'graphics/meshviewer')
| -rw-r--r-- | graphics/meshviewer/Makefile | 11 | ||||
| -rw-r--r-- | graphics/meshviewer/distinfo | 2 | ||||
| -rw-r--r-- | graphics/meshviewer/files/patch-Makefile | 39 |
3 files changed, 32 insertions, 20 deletions
diff --git a/graphics/meshviewer/Makefile b/graphics/meshviewer/Makefile index dfab6c760daf..b3f09302cb96 100644 --- a/graphics/meshviewer/Makefile +++ b/graphics/meshviewer/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ PORTNAME= meshviewer -PORTVERSION= 0.2.0.1 +PORTVERSION= 0.2.1.1 CATEGORIES= graphics MASTER_SITES= http://www.dai.ed.ac.uk/homes/helmutc/mesh_viewer/ DISTNAME= mview-src-${PORTVERSION} @@ -16,12 +16,11 @@ COMMENT= Mesh Viewer LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg -USE_MESA= yes USE_QT_VER= 3 -USE_GMAKE= yes -MAKE_ENV= MOC="${MOC}" QTDIR="${X11BASE}" \ - CPPFLAGS="${QTCPPFLAGS} ${PTHREAD_CFLAGS}" \ - LIBS="${QTCFGLIBS} ${PTHREAD_LIBS}" +USE_GL= yes +MAKE_ENV= MOC="${MOC}" \ + QTCPPFLAGS="${QTCPPFLAGS} ${PTHREAD_CFLAGS}" \ + QTCFGLIBS="${QTCFGLIBS} ${PTHREAD_LIBS}" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mview ${PREFIX}/bin diff --git a/graphics/meshviewer/distinfo b/graphics/meshviewer/distinfo index 92c657524b71..b7f33aae1f7c 100644 --- a/graphics/meshviewer/distinfo +++ b/graphics/meshviewer/distinfo @@ -1 +1 @@ -MD5 (mview-src-0.2.0.1.tar.gz) = bd958804fdd7c081e592560b405e6a65 +MD5 (mview-src-0.2.1.1.tar.gz) = d572ad5436943e623715c6b419c59831 diff --git a/graphics/meshviewer/files/patch-Makefile b/graphics/meshviewer/files/patch-Makefile index ea742a753426..fb84a410bb4e 100644 --- a/graphics/meshviewer/files/patch-Makefile +++ b/graphics/meshviewer/files/patch-Makefile @@ -1,22 +1,35 @@ ---- Makefile.orig Sun Apr 27 01:08:06 2003 -+++ Makefile Sun Apr 27 01:08:54 2003 -@@ -4,15 +4,15 @@ - LIBPATH = -L$(QTDIR)/lib -L/usr/local/lib -L/usr/X11R6/lib +--- Makefile.orig Thu Nov 27 08:40:45 2003 ++++ Makefile Thu Nov 27 23:48:26 2003 +@@ -1,13 +1,13 @@ - CC=g++ + #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) -O2 ++CPPFLAGS = $(INCPATH) $(CXXFLAGS) # supposedly compiler options for faster code #CPPFLAGS = $(INCPATH) -O3 -fexceptions --fast-math -felide-constructors -fexpensive-optimizations -fdelayed-branch -fschedule-insns --LIBS_QT = -lGL -lGLU -lqt-mt -ljpeg --LIBS_GLUT = -lGL -lGLU -lglut -ljpeg -+LIBS_QT = ${LIBS} -lGL -lGLU -lqt-mt -ljpeg -+LIBS_GLUT = ${LIBS} -lGL -lGLU -lglut -ljpeg - - QT = qt/main.o \ - qt/mview.o \ +@@ -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) |