Attachment 176649 Details for Bug 214199 – respect PREFIX

[patch] respect PREFIX

netgen.prefix.diff (text/plain), 4.27 KB, created by Jan Beich on 2016-11-05 04:55:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2016-11-05 04:55:49 UTC

Size: 4.27 KB

patch

obsolete

>From 2e6a07eefef3d060ae3703690bdbe25284578388 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Sat, 5 Nov 2016 04:01:07 +0000
>Subject: [1/2] cad/netgen: respect PREFIX/LOCALBASE
>
>- Switch to CONFIGURE_ENV + post-patch for |make makepatch| sake
>
>PR:		214199
>Approved by:	stephen (maintainer)
>---
> cad/netgen/Makefile                     | 17 ++++++++---------
> cad/netgen/files/patch-configure        |  4 ++--
> cad/netgen/files/patch-ng_ng.tcl        | 11 -----------
> cad/netgen/files/patch-ng_ngappinit.cpp | 11 -----------
> 4 files changed, 10 insertions(+), 33 deletions(-)
> delete mode 100644 cad/netgen/files/patch-ng_ng.tcl
> delete mode 100644 cad/netgen/files/patch-ng_ngappinit.cpp
>
>diff --git a/cad/netgen/Makefile b/cad/netgen/Makefile
>index 88ce81a..a716854 100644
>--- a/cad/netgen/Makefile
>+++ b/cad/netgen/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	netgen
> PORTVERSION=	5.3.1
>+PORTREVISION=	1
> CATEGORIES=	cad
> MASTER_SITES=	SF/netgen-mesher/netgen-mesher/${PORTVERSION:C|\.[[:digit:]]+$||}/
> 
>@@ -15,12 +16,11 @@ LIB_DEPENDS=	libTix8.4.3.so:x11-toolkits/tix \
> OCC_BROKEN=	Does not compile because of issues with cad/opencascade
> 
> USE_LDCONFIG=	yes
>-USES=		gmake jpeg libtool tk:tea
>+USES=		gmake jpeg libtool localbase tk:tea
> USE_GL=		yes
> USE_XORG=	xmu xi
> MAKE_JOBS_UNSAFE=	yes
>-LDFLAGS+=	-L${LOCALBASE}/lib
>-CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/lib/Togl-1.7
>+CPPFLAGS+=	-isystem ${LOCALBASE}/lib/Togl-1.7
> CONFIGURE_ARGS=	--enable-jpeglib
> 
> FETCH_BEFORE_ARGS+=	-o ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
>@@ -38,6 +38,8 @@ OCC_CONFIGURE_ON=	--enable-occ
> 
> FFMPEG_LIB_DEPENDS=	libavcodec0.so:multimedia/ffmpeg0
> FFMPEG_CONFIGURE_ON=	--enable-ffmpeg
>+FFMPEG_CPPFLAGS+=	-isystem ${LOCALBASE}/include/ffmpeg0
>+FFMPEG_LIBS+=		-L${LOCALBASE}/lib/ffmpeg0
> 
> MACHINE=	${OPSYS:tu}
> 
>@@ -48,14 +50,11 @@ MAKE_ENV=	TK_VER=${TK_VER} TCL_VER=${TCL_VER}	\
> 		TK_INCLUDEDIR="${TK_INCLUDEDIR}"	\
> 		MACHINE=${MACHINE} MAKE=${MAKE_CMD}
> 
>-pre-configure:
>-	@${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|"	\
>+post-patch:
>+	@${REINPLACE_CMD} -e '/ngdir/s,"\.","${PREFIX}/bin",' \
>+		${WRKSRC}/ng/ng.tcl \
> 		${WRKSRC}/ng/ngappinit.cpp
> 
>-post-configure:
>-	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|"	\
>-		${WRKSRC}/configure
>-
> post-install:
> #	copy some additional headers for build cad/salome-netgenplugin
> 	${MKDIR} ${STAGEDIR}${DATADIR}/include
>diff --git a/cad/netgen/files/patch-configure b/cad/netgen/files/patch-configure
>index 3bc8ef0..f060275 100644
>--- a/cad/netgen/files/patch-configure
>+++ b/cad/netgen/files/patch-configure
>@@ -158,10 +158,10 @@
>  # Check whether --enable-ffmpeg was given.
>  if test "${enable_ffmpeg+set}" = set; then :
> -  enableval=$enable_ffmpeg; FFMPEG_INCLUDES="-DFFMPEG -D__STDC_CONSTANT_MACROS"
>-+  enableval=$enable_ffmpeg; FFMPEG_INCLUDES="-I/usr/local/include/ffmpeg0 -DFFMPEG -D__STDC_CONSTANT_MACROS"
>++  enableval=$enable_ffmpeg; FFMPEG_INCLUDES="-DFFMPEG -D__STDC_CONSTANT_MACROS"
>  
> -        FFMPEG_LIBS="-lavutil -lavformat -lavcodec -lavutil -lswscale -lz -lbz2"
>-+        FFMPEG_LIBS="-L/usr/local/lib/ffmpeg0 -lavutil0 -lavformat0 -lavcodec0 -lavutil0 -lswscale -lz -lbz2"
>++        FFMPEG_LIBS="-lavutil0 -lavformat0 -lavcodec0 -lavutil0 -lswscale -lz -lbz2"
>  
>          if test "$enableval" = yes; then ffmpegon=true; else ffmpegon=false; fi
>  
>diff --git a/cad/netgen/files/patch-ng_ng.tcl b/cad/netgen/files/patch-ng_ng.tcl
>deleted file mode 100644
>index c517fe0..0000000
>--- a/cad/netgen/files/patch-ng_ng.tcl
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- ng/ng.tcl.orig	2014-08-29 09:54:01 UTC
>-+++ ng/ng.tcl
>-@@ -32,7 +32,7 @@ if { [lsearch [array names env] NETGENDI
>-     set ngdir $env(NETGENDIR) 
>- }
>- if { [string length $ngdir] == 0 } {
>--    set ngdir "." 
>-+    set ngdir "/usr/local/bin" 
>- }
>- 
>- set nguserdir ""
>diff --git a/cad/netgen/files/patch-ng_ngappinit.cpp b/cad/netgen/files/patch-ng_ngappinit.cpp
>deleted file mode 100644
>index 16d94905..0000000
>--- a/cad/netgen/files/patch-ng_ngappinit.cpp
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- ng/ngappinit.cpp.orig	2014-08-29 09:54:01 UTC
>-+++ ng/ngappinit.cpp
>-@@ -149,7 +149,7 @@ int main(int argc, char ** argv)
>-   if (getenv ("NETGENDIR") && strlen (getenv ("NETGENDIR")))
>-     ngdir = getenv ("NETGENDIR");
>-   else
>--    ngdir = ".";
>-+    ngdir = "/usr/local/bin";
>-   
>-   verbose = parameters.GetDefineFlag ("V");
>-

Flags:

jbeich: maintainer-approval? (stephen)

Actions: View | Diff

Attachments on bug 214199: 176647 | 176648 | 176649