From owner-svn-ports-head@FreeBSD.ORG  Sun Jun 29 18:49:39 2014
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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7DB0BFE2;
 Sun, 29 Jun 2014 18:49:39 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6AD822FB3;
 Sun, 29 Jun 2014 18:49:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5TIndNH073190;
 Sun, 29 Jun 2014 18:49:39 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5TIndDZ073188;
 Sun, 29 Jun 2014 18:49:39 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201406291849.s5TIndDZ073188@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Sun, 29 Jun 2014 18:49:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r359789 - in head/print/tex: . 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.18
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: Sun, 29 Jun 2014 18:49:39 -0000

Author: antoine
Date: Sun Jun 29 18:49:38 2014
New Revision: 359789
URL: http://svnweb.freebsd.org/changeset/ports/359789
QAT: https://qat.redports.org/buildarchive/r359789/

Log:
  Fix installation/packaging when ${PREFIX}/share/texmf already existed,
  it installed there instead of into ${STAGEDIR}

Modified:
  head/print/tex/Makefile
  head/print/tex/files/patch-ab

Modified: head/print/tex/Makefile
==============================================================================
--- head/print/tex/Makefile	Sun Jun 29 18:31:49 2014	(r359788)
+++ head/print/tex/Makefile	Sun Jun 29 18:49:38 2014	(r359789)
@@ -24,6 +24,7 @@ CONFLICTS=	teTeX*
 
 USES=		desthack gmake makeinfo
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--datadir=\$${${DESTDIRNAME}}${PREFIX}/share
 
 INFO=		kpathsea web2c
 MAKE_FLAGS=	fmts= all_mems=

Modified: head/print/tex/files/patch-ab
==============================================================================
--- head/print/tex/files/patch-ab	Sun Jun 29 18:31:49 2014	(r359788)
+++ head/print/tex/files/patch-ab	Sun Jun 29 18:49:38 2014	(r359789)
@@ -1,5 +1,5 @@
---- configure.orig	Sun May 13 15:01:20 2001
-+++ configure	Sun May 13 15:02:43 2001
+--- ./configure.orig	1998-03-10 22:38:41.000000000 +0000
++++ ./configure	2014-06-29 18:10:24.000000000 +0000
 @@ -990,8 +990,7 @@
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -10,6 +10,15 @@
  
  # Check whether --with-dtl or --without-dtl was given.
  if test "${with_dtl+set}" = set; then
+@@ -1220,7 +1219,7 @@
+   # First case, datadir is defined...
+   eval p=\"$datadir\"
+   if test -d "$p/texmf"; then
+-    texmfmain="$p/texmf"
++    texmfmain="$datadir/texmf"
+   fi
+ else
+   # Second case, datadir is default...
 @@ -1840,6 +1839,7 @@
  s%@LN_S@%$LN_S%g
  s%@TEX@%$TEX%g