From owner-svn-ports-head@FreeBSD.ORG  Mon May 13 13:22:56 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 262B54CE;
 Mon, 13 May 2013 13:22:56 +0000 (UTC)
 (envelope-from gahr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id F336F236;
 Mon, 13 May 2013 13:22:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4DDMsIM024098;
 Mon, 13 May 2013 13:22:54 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4DDMsgp024096;
 Mon, 13 May 2013 13:22:54 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201305131322.r4DDMsgp024096@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Mon, 13 May 2013 13:22:54 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r318077 - in head/x11-toolkits/tktable: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 May 2013 13:22:56 -0000

Author: gahr
Date: Mon May 13 13:22:54 2013
New Revision: 318077
URL: http://svnweb.freebsd.org/changeset/ports/318077

Log:
  - Respect PREFIX and DOCSDIR
  
  Reported by:	miwi (Tcl/Tk 86 exp-run)

Modified:
  head/x11-toolkits/tktable/Makefile   (contents, props changed)
  head/x11-toolkits/tktable/files/patch-Makefile.in   (contents, props changed)

Modified: head/x11-toolkits/tktable/Makefile
==============================================================================
--- head/x11-toolkits/tktable/Makefile	Mon May 13 12:57:18 2013	(r318076)
+++ head/x11-toolkits/tktable/Makefile	Mon May 13 13:22:54 2013	(r318077)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:  tktable
-# Date created:         25 Jun 2003
-# Whom:                 thierry@pompo.net
-#
+# Created by: thierry@pompo.net
 # $FreeBSD$
-#
 
 PORTNAME=	tktable
 PORTVERSION=	2.10
@@ -18,7 +14,6 @@ COMMENT=	A table/matrix widget extension
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/license.txt
 
-USE_XORG=	x11
 USE_TK=		84+
 
 GNU_CONFIGURE=	yes
@@ -26,28 +21,27 @@ PORTDOCS=	*
 
 PLIST_SUB=	DISTNAME=${DISTNAME}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
 		--with-tk=${TK_LIBDIR} \
 		--with-tclinclude=${TCL_INCLUDEDIR} \
 		--with-tkinclude=${TK_INCLUDEDIR} \
-		--with-x
+		--with-x \
+		--prefix=${PREFIX} \
+		--exec-prefix=${PREFIX}
 
 post-patch:
-.if !defined(NOPORTDOCS)
+	${REINPLACE_CMD} -e 's|%%DOCSDIR%%|${DOCSDIR}|' \
+	    ${WRKSRC}/Makefile.in
+.if ${PORT_OPTIONS:MDOCS}
 INSTALL_TARGET=	install install-doc
 .endif
 
-post-install:
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-.endif
-
 .if defined(MAINTAINER_MODE)
 test: build
 	(cd ${WRKSRC};  \
 	${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test)
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/x11-toolkits/tktable/files/patch-Makefile.in
==============================================================================
--- head/x11-toolkits/tktable/files/patch-Makefile.in	Mon May 13 12:57:18 2013	(r318076)
+++ head/x11-toolkits/tktable/files/patch-Makefile.in	Mon May 13 13:22:54 2013	(r318077)
@@ -13,7 +13,7 @@
  datadir		= @datadir@
  mandir		= @mandir@
  includedir	= @includedir@
-+docsdir		= /usr/local/share/doc/tktable
++docsdir		= %%DOCSDIR%%
  
  DESTDIR		=