svn commit: r359789 - in head/print/tex: . files

Antoine Brodin antoine at FreeBSD.org
Sun Jun 29 18:49:39 UTC 2014


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


More information about the svn-ports-head mailing list