svn commit: r323569 - in head: cad/netgen graphics/togl

[Pietro Cerutti]

Author: gahr
Date: Wed Jul 24 06:53:48 2013
New Revision: 323569
URL: http://svnweb.freebsd.org/changeset/ports/323569

Log:
  - Make graphics/togl's libraries location independent from the Tcl/Tk version
    used to build it
  - Fix cad/netgen to use this new location
  
  Reported by:	bapt

Modified:
  head/cad/netgen/Makefile   (contents, props changed)
  head/graphics/togl/Makefile
  head/graphics/togl/pkg-plist

Modified: head/cad/netgen/Makefile
==============================================================================
--- head/cad/netgen/Makefile	Wed Jul 24 06:50:23 2013	(r323568)
+++ head/cad/netgen/Makefile	Wed Jul 24 06:53:48 2013	(r323569)
@@ -16,14 +16,13 @@ LIB_DEPENDS=	Tix8.4.3:${PORTSDIR}/x11-to
 
 USE_LDCONFIG=	yes
 USES=		gmake
-USE_TK=		85
-USE_TK_BUILD=	84
+USE_TK=		yes
 USE_GL=		yes
 USE_XORG=	xmu xi
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
-CPPFLAGS+=	-I${LOCALBASE}/include -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} -I${TK_LIBDIR}/Togl-1.7
+CPPFLAGS+=	-I${LOCALBASE}/include -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} -I${LOCALBASE}/lib/Togl-1.7
 CONFIGURE_ARGS+=	--with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR} --enable-jpeglib
 
 FETCH_BEFORE_ARGS+=	-o ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}

Modified: head/graphics/togl/Makefile
==============================================================================
--- head/graphics/togl/Makefile	Wed Jul 24 06:50:23 2013	(r323568)
+++ head/graphics/togl/Makefile	Wed Jul 24 06:53:48 2013	(r323569)
@@ -13,21 +13,15 @@ COMMENT=	Tk OpenGL widget
 
 USE_XORG=	x11 xt xmu
 USE_GL=		gl
-USE_TCL_BUILD=	84+
-USE_TCL=	84+
-USE_TK_BUILD=	84+
-USE_TK=		84+
+USE_TK=		yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-tk=${TK_LIBDIR} \
 		--with-tcl=${TCL_LIBDIR} \
 		--with-tclinclude=${TCL_INCLUDEDIR}
-MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
 USE_LDCONFIG=	yes
 
-TOGL_INSTDIR=	${PREFIX}/lib/tk${TK_VER}/${DISTNAME}
-PLIST_SUB=	TOGL_INSTDIR="${TOGL_INSTDIR:S,^${PREFIX}/,,}"
+TOGL_INSTDIR=	${PREFIX}/lib/${DISTNAME}
 
 CPPFLAGS+=	-I${TK_INCLUDEDIR}
 LDFLAGS+=	-L${TK_LIBDIR}

Modified: head/graphics/togl/pkg-plist
==============================================================================
--- head/graphics/togl/pkg-plist	Wed Jul 24 06:50:23 2013	(r323568)
+++ head/graphics/togl/pkg-plist	Wed Jul 24 06:53:48 2013	(r323569)
@@ -1,10 +1,10 @@
 lib/libtogl.so
 lib/libtogl.so.1
-lib/tk%%TK_VER%%/Togl-1.7/togl.h
-lib/tk%%TK_VER%%/Togl-1.7/togl_ws.h
-lib/tk%%TK_VER%%/Togl-1.7/libTogl1.7.so
-lib/tk%%TK_VER%%/Togl-1.7/pkgIndex.tcl
-lib/tk%%TK_VER%%/Togl-1.7/libtogl.so.1
+lib/Togl-1.7/togl.h
+lib/Togl-1.7/togl_ws.h
+lib/Togl-1.7/libTogl1.7.so
+lib/Togl-1.7/pkgIndex.tcl
+lib/Togl-1.7/libtogl.so.1
 %%PORTDOCS%%%%DOCSDIR%%/Togl.html
 %%EXAMPLESDIR%%/Makefile
 %%EXAMPLESDIR%%/ben.rgb
@@ -27,4 +27,4 @@ lib/tk%%TK_VER%%/Togl-1.7/libtogl.so.1
 %%EXAMPLESDIR%%/tree2.rgba
 @dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm lib/tk%%TK_VER%%/Togl-1.7
+ at dirrm lib/Togl-1.7