Attachment #37568 for bug #59755

View | Details | Raw Unified | Return to bug 59755
Collapse All | Expand All




# $FreeBSD: ports/graphics/meshviewer/Makefile,v 1.3 2003/04/26 18:20:32 ijliao Exp $

PORTNAME=	meshviewer
PORTVERSION=	0.2.1.1
CATEGORIES=	graphics
MASTER_SITES=	http://www.dai.ed.ac.uk/homes/helmutc/mesh_viewer/
DISTNAME=	mview-src-${PORTVERSION}


LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg

USE_MESA=	yes
USE_QT_VER=	3
USE_GL=		yes
MAKE_ENV=	MOC="${MOC}" \
		QTCPPFLAGS="${QTCPPFLAGS} ${PTHREAD_CFLAGS}" \
		QTCFGLIBS="${QTCFGLIBS} ${PTHREAD_LIBS}"

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/mview ${PREFIX}/bin

Line 1 Link Here

(-)graphics/meshviewer/distinfo (-1 / +1 lines)
1	MD5 (mview-src-0.2.0.1.tar.gz) = bd958804fdd7c081e592560b405e6a65	1	MD5 (mview-src-0.2.1.1.tar.gz) = d572ad5436943e623715c6b419c59831




--- Makefile.orig	Thu Nov 27 08:40:45 2003
+++ Makefile	Thu Nov 27 23:48:26 2003
@@ -1,13 +1,13 @@
 LIBPATH = -L$(QTDIR)/lib -L/usr/local/lib -L/usr/X11R6/lib
 
 #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)

Return to bug 59755

Lines 6-12 Link Here

(-)graphics/meshviewer/Makefile (-6 / +5 lines)
6	# $FreeBSD: ports/graphics/meshviewer/Makefile,v 1.3 2003/04/26 18:20:32 ijliao Exp $	6	# $FreeBSD: ports/graphics/meshviewer/Makefile,v 1.3 2003/04/26 18:20:32 ijliao Exp $
7		7
8	PORTNAME= meshviewer	8	PORTNAME= meshviewer
9	PORTVERSION= 0.2.0.1	9	PORTVERSION= 0.2.1.1
10	CATEGORIES= graphics	10	CATEGORIES= graphics
11	MASTER_SITES= http://www.dai.ed.ac.uk/homes/helmutc/mesh_viewer/	11	MASTER_SITES= http://www.dai.ed.ac.uk/homes/helmutc/mesh_viewer/
12	DISTNAME= mview-src-${PORTVERSION}	12	DISTNAME= mview-src-${PORTVERSION}
Lines 16-27 Link Here
16		16
17	LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg	17	LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
18		18
19	USE_MESA= yes
20	USE_QT_VER= 3	19	USE_QT_VER= 3
21	USE_GMAKE= yes	20	USE_GL= yes
22	MAKE_ENV= MOC="${MOC}" QTDIR="${X11BASE}" \	21	MAKE_ENV= MOC="${MOC}" \
23	CPPFLAGS="${QTCPPFLAGS} ${PTHREAD_CFLAGS}" \	22	QTCPPFLAGS="${QTCPPFLAGS} ${PTHREAD_CFLAGS}" \
24	LIBS="${QTCFGLIBS} ${PTHREAD_LIBS}"	23	QTCFGLIBS="${QTCFGLIBS} ${PTHREAD_LIBS}"
25		24
26	do-install:	25	do-install:
27	${INSTALL_PROGRAM} ${WRKSRC}/mview ${PREFIX}/bin	26	${INSTALL_PROGRAM} ${WRKSRC}/mview ${PREFIX}/bin

Lines 1-22 Link Here

(-)graphics/meshviewer/files/patch-Makefile (-13 / +26 lines)
1	--- Makefile.orig Sun Apr 27 01:08:06 2003	1	--- Makefile.orig Thu Nov 27 08:40:45 2003
2	+++ Makefile Sun Apr 27 01:08:54 2003	2	+++ Makefile Thu Nov 27 23:48:26 2003
3	@@ -4,15 +4,15 @@	3	@@ -1,13 +1,13 @@
4	LIBPATH = -L$(QTDIR)/lib -L/usr/local/lib -L/usr/X11R6/lib
5		4
6	CC=g++	5	#QTDIR=/usr/lib/qt3
		6	-INCPATH = -I. -Itexture -Imesh -Imathvector -I$(QTDIR)/include
		7	-LIBPATH = -L$(QTDIR)/lib -L/usr/local/lib -L/usr/X11R6/lib
		8	+INCPATH = -I. -Itexture -Imesh -Imathvector $(QTCPPFLAGS)
		9	+LIBPATH = ${QTCFGLIBS}
		10
		11	-CC=g++
7	-MOC=$(QTDIR)/bin/moc	12	-MOC=$(QTDIR)/bin/moc
		13	+CC=$(CXX)
8	+#MOC=$(QTDIR)/bin/moc	14	+#MOC=$(QTDIR)/bin/moc
9	EXE=mview	15	EXE=mview
10		16
11	-CPPFLAGS = $(INCPATH) -O2	17	-CPPFLAGS = $(INCPATH) -O2
12	+CPPFLAGS+= $(INCPATH) -O2	18	+CPPFLAGS = $(INCPATH) $(CXXFLAGS)
13	# supposedly compiler options for faster code	19	# supposedly compiler options for faster code
14	#CPPFLAGS = $(INCPATH) -O3 -fexceptions --fast-math -felide-constructors -fexpensive-optimizations -fdelayed-branch -fschedule-insns	20	#CPPFLAGS = $(INCPATH) -O3 -fexceptions --fast-math -felide-constructors -fexpensive-optimizations -fdelayed-branch -fschedule-insns
15		21
16	-LIBS_QT = -lGL -lGLU -lqt-mt -ljpeg	22	@@ -65,11 +65,11 @@
17	-LIBS_GLUT = -lGL -lGLU -lglut -ljpeg	23
18	+LIBS_QT = ${LIBS} -lGL -lGLU -lqt-mt -ljpeg	24	QT:
19	+LIBS_GLUT = ${LIBS} -lGL -lGLU -lglut -ljpeg	25	rm -f qt/mview.o
20		26	- make QT_2
21	QT = qt/main.o \	27	+ $(MAKE) QT_2
22	qt/mview.o \	28
		29	QT_TEXT:
		30	rm -f qt/mview.o
		31	- make QT_TEXT_2 "FLAGS=-DTEXT_MAP"
		32	+ $(MAKE) QT_TEXT_2 "FLAGS=-DTEXT_MAP"
		33
		34	GLUT: $(GLUT) $(TEXT) $(MESH) $(VEC)
		35	$(CC) $? $(LIBPATH) $(LIBS_GLUT) -o $(EXE)