Attachment #176647 for bug #214199

Lines 3-8 Link Here

(-)b/cad/netgen/Makefile (-9 / +8 lines)
3		3
4	PORTNAME= netgen	4	PORTNAME= netgen
5	PORTVERSION= 5.3.1	5	PORTVERSION= 5.3.1
		6	PORTREVISION= 1
6	CATEGORIES= cad	7	CATEGORIES= cad
7	MASTER_SITES= SF/netgen-mesher/netgen-mesher/${PORTVERSION:C\|\.[[:digit:]]+$\|\|}/	8	MASTER_SITES= SF/netgen-mesher/netgen-mesher/${PORTVERSION:C\|\.[[:digit:]]+$\|\|}/
8		9
Lines 15-26 LIB_DEPENDS= libTix8.4.3.so:x11-toolkits/tix \ Link Here
15	OCC_BROKEN= Does not compile because of issues with cad/opencascade	16	OCC_BROKEN= Does not compile because of issues with cad/opencascade
16		17
17	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
18	USES= gmake jpeg libtool tk:tea	19	USES= gmake jpeg libtool localbase tk:tea
19	USE_GL= yes	20	USE_GL= yes
20	USE_XORG= xmu xi	21	USE_XORG= xmu xi
21	MAKE_JOBS_UNSAFE= yes	22	MAKE_JOBS_UNSAFE= yes
22	LDFLAGS+= -L${LOCALBASE}/lib	23	CPPFLAGS+= -isystem ${LOCALBASE}/lib/Togl-1.7
23	CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/lib/Togl-1.7
24	CONFIGURE_ARGS= --enable-jpeglib	24	CONFIGURE_ARGS= --enable-jpeglib
25		25
26	FETCH_BEFORE_ARGS+= -o ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}	26	FETCH_BEFORE_ARGS+= -o ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
Lines 37-42 OCC_CXXFLAGS= -DOCCGEOMETRY -DHAVE_CONFIG_H -D${ARCH} -I${LOCALBASE}/include/Op Link Here
37	OCC_CONFIGURE_ON= --enable-occ	37	OCC_CONFIGURE_ON= --enable-occ
38		38
39	FFMPEG_LIB_DEPENDS= libavcodec0.so:multimedia/ffmpeg0	39	FFMPEG_LIB_DEPENDS= libavcodec0.so:multimedia/ffmpeg0
		40	FFMPEG_CPPFLAGS+= -isystem ${LOCALBASE}/include/ffmpeg0
		41	FFMPEG_LIBS+= -L${LOCALBASE}/lib/ffmpeg0
40	FFMPEG_CONFIGURE_ON= --enable-ffmpeg	42	FFMPEG_CONFIGURE_ON= --enable-ffmpeg
41		43
42	MACHINE= ${OPSYS:tu}	44	MACHINE= ${OPSYS:tu}
Lines 48-61 MAKE_ENV= TK_VER=${TK_VER} TCL_VER=${TCL_VER} \ Link Here
48	TK_INCLUDEDIR="${TK_INCLUDEDIR}" \	50	TK_INCLUDEDIR="${TK_INCLUDEDIR}" \
49	MACHINE=${MACHINE} MAKE=${MAKE_CMD}	51	MACHINE=${MACHINE} MAKE=${MAKE_CMD}
50		52
51	pre-configure:	53	post-patch:
52	@${REINPLACE_CMD} -e "s\|%%DATADIR%%\|${DATADIR}\|" \	54	@${REINPLACE_CMD} -e '/ngdir/s,"\.","${PREFIX}/bin",' \
		55	${WRKSRC}/ng/ng.tcl \
53	${WRKSRC}/ng/ngappinit.cpp	56	${WRKSRC}/ng/ngappinit.cpp
54		57
55	post-configure:
56	@${REINPLACE_CMD} -e "s\|%%LOCALBASE%%\|${LOCALBASE}\|" \
57	${WRKSRC}/configure
58
59	post-install:	58	post-install:
60	# copy some additional headers for build cad/salome-netgenplugin	59	# copy some additional headers for build cad/salome-netgenplugin
61	${MKDIR} ${STAGEDIR}${DATADIR}/include	60	${MKDIR} ${STAGEDIR}${DATADIR}/include

Lines 158-167 Link Here

(-)b/cad/netgen/files/patch-configure (-2 / +2 lines)
158	# Check whether --enable-ffmpeg was given.	158	# Check whether --enable-ffmpeg was given.
159	if test "${enable_ffmpeg+set}" = set; then :	159	if test "${enable_ffmpeg+set}" = set; then :
160	- enableval=$enable_ffmpeg; FFMPEG_INCLUDES="-DFFMPEG -D__STDC_CONSTANT_MACROS"	160	- enableval=$enable_ffmpeg; FFMPEG_INCLUDES="-DFFMPEG -D__STDC_CONSTANT_MACROS"
161	+ enableval=$enable_ffmpeg; FFMPEG_INCLUDES="-I/usr/local/include/ffmpeg0 -DFFMPEG -D__STDC_CONSTANT_MACROS"	161	+ enableval=$enable_ffmpeg; FFMPEG_INCLUDES="-DFFMPEG -D__STDC_CONSTANT_MACROS"
162		162
163	- FFMPEG_LIBS="-lavutil -lavformat -lavcodec -lavutil -lswscale -lz -lbz2"	163	- FFMPEG_LIBS="-lavutil -lavformat -lavcodec -lavutil -lswscale -lz -lbz2"
164	+ FFMPEG_LIBS="-L/usr/local/lib/ffmpeg0 -lavutil0 -lavformat0 -lavcodec0 -lavutil0 -lswscale -lz -lbz2"	164	+ FFMPEG_LIBS="-lavutil0 -lavformat0 -lavcodec0 -lavutil0 -lswscale -lz -lbz2"
165		165
166	if test "$enableval" = yes; then ffmpegon=true; else ffmpegon=false; fi	166	if test "$enableval" = yes; then ffmpegon=true; else ffmpegon=false; fi
167		167

Removed Link Here

(-)a/cad/netgen/files/patch-ng_ng.tcl (-11 lines)
1	--- ng/ng.tcl.orig 2014-08-29 09:54:01 UTC
2	+++ ng/ng.tcl
3	@@ -32,7 +32,7 @@ if { [lsearch [array names env] NETGENDI
4	set ngdir $env(NETGENDIR)
5	}
6	if { [string length $ngdir] == 0 } {
7	- set ngdir "."
8	+ set ngdir "/usr/local/bin"
9	}
10
11	set nguserdir ""

Removed Link Here

(-)a/cad/netgen/files/patch-ng_ngappinit.cpp (-11 lines)
1	--- ng/ngappinit.cpp.orig 2014-08-29 09:54:01 UTC
2	+++ ng/ngappinit.cpp
3	@@ -149,7 +149,7 @@ int main(int argc, char ** argv)
4	if (getenv ("NETGENDIR") && strlen (getenv ("NETGENDIR")))
5	ngdir = getenv ("NETGENDIR");
6	else
7	- ngdir = ".";
8	+ ngdir = "/usr/local/bin";
9
10	verbose = parameters.GetDefineFlag ("V");
11

Return to bug 214199