Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 5 Nov 2013 16:14:47 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r332863 - in head/editors/vigor: . files
Message-ID:  <201311051614.rA5GElQo036904@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gahr
Date: Tue Nov  5 16:14:47 2013
New Revision: 332863
URL: http://svnweb.freebsd.org/changeset/ports/332863

Log:
  - Convert to USES+=tk
  - STAGE-clean

Added:
  head/editors/vigor/files/patch-configure   (contents, props changed)
Modified:
  head/editors/vigor/Makefile

Modified: head/editors/vigor/Makefile
==============================================================================
--- head/editors/vigor/Makefile	Tue Nov  5 16:12:04 2013	(r332862)
+++ head/editors/vigor/Makefile	Tue Nov  5 16:14:47 2013	(r332863)
@@ -15,20 +15,17 @@ LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/build
 
-USE_TCL=	yes
-USE_TCL_BUILD=	yes
-USE_TK=		yes
-USE_TK_BUILD=	yes
+USES+=		tk
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--exec-prefix=${STAGEDIR}${PREFIX}
 
 CPPFLAGS+=	-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
 post-patch:
-	${REINPLACE_CMD} -e 's|tcl80|tcl${TCL_VER:S/.//}|; \
-		s|tk80|tk${TK_VER:S/.//}|; \
+	${REINPLACE_CMD} -e 's|tcl80|tcl${TCL_SHLIB_VER}|; \
+		s|tk80|tk${TK_SHLIB_VER}|; \
 		s|^grantpt|XXXgrantpt|;' \
 			${WRKSRC}/configure
 

Added: head/editors/vigor/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/vigor/files/patch-configure	Tue Nov  5 16:14:47 2013	(r332863)
@@ -0,0 +1,11 @@
+--- configure.orig	2013-11-05 17:12:10.000000000 +0100
++++ configure	2013-11-05 17:12:16.000000000 +0100
+@@ -48,7 +48,7 @@
+ bindir='${exec_prefix}/bin'
+ sbindir='${exec_prefix}/sbin'
+ libexecdir='${exec_prefix}/libexec'
+-datadir='${prefix}/share'
++datadir='${exec_prefix}/share'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311051614.rA5GElQo036904>