Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Aug 2014 23:39:00 +0000 (UTC)
From:      Stephen Montgomery-Smith <stephen@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r365604 - in head/devel/noweb: . files
Message-ID:  <201408212339.s7LNd0m8060350@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: stephen
Date: Thu Aug 21 23:38:59 2014
New Revision: 365604
URL: http://svnweb.freebsd.org/changeset/ports/365604
QAT: https://qat.redports.org/buildarchive/r365604/

Log:
  - Stage support.

Modified:
  head/devel/noweb/Makefile
  head/devel/noweb/files/patch-Makefile
  head/devel/noweb/pkg-install
  head/devel/noweb/pkg-plist

Modified: head/devel/noweb/Makefile
==============================================================================
--- head/devel/noweb/Makefile	Thu Aug 21 23:37:08 2014	(r365603)
+++ head/devel/noweb/Makefile	Thu Aug 21 23:38:59 2014	(r365604)
@@ -20,16 +20,12 @@ RUN_DEPENDS=	iconx:${PORTSDIR}/lang/icon
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 INSTALL_TARGET=	install-code install-man install-elisp
+MAKE_ENV+=	INSTALL_PREFIX=${STAGEDIR}${PREFIX}
 MAKE_JOBS_UNSAFE=	yes
-MAN1=		cpif.1 htmltoc.1 nodefs.1 noindex.1 noroff.1 noroots.1 \
-		notangle.1 noweb.1 nuweb2noweb.1 sl2h.1
-MAN7=		nowebfilters.7 nowebstyle.7
-MLINKS=		notangle.1 noweave.1	notangle.1 nountangle.1
 
-NOWEBTEXDIR=	${PREFIX}/share/texmf-local/tex/plain/noweb
-NOWEBLATEXDIR=	${PREFIX}/share/texmf-local/tex/latex/noweb
+NOWEBTEXDIR=	${STAGEDIR}${PREFIX}/share/texmf-local/tex/plain/noweb
+NOWEBLATEXDIR=	${STAGEDIR}${PREFIX}/share/texmf-local/tex/latex/noweb
 
-NO_STAGE=	yes
 post-patch:
 	@${TOUCH} ${WRKSRC}/c/modules.[ch]
 
@@ -41,6 +37,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/tex/nwmac.tex ${NOWEBTEXDIR}
 	@${MKDIR} ${NOWEBLATEXDIR}
 	${INSTALL_DATA} ${WRKSRC}/tex/noweb.sty ${NOWEBLATEXDIR}
-	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>

Modified: head/devel/noweb/files/patch-Makefile
==============================================================================
--- head/devel/noweb/files/patch-Makefile	Thu Aug 21 23:37:08 2014	(r365603)
+++ head/devel/noweb/files/patch-Makefile	Thu Aug 21 23:38:59 2014	(r365604)
@@ -1,5 +1,5 @@
---- Makefile.orig	Mon Jun 12 20:14:20 2006
-+++ Makefile	Sat Sep  1 22:34:43 2007
+--- Makefile.orig	2006-06-12 20:14:20.000000000 +0000
++++ Makefile	2014-08-21 23:22:20.000000000 +0000
 @@ -2,13 +2,14 @@
  # See file COPYRIGHT for more information.
  #
@@ -26,18 +26,27 @@
 -BIN=/usr/local/noweb
 -LIB=/usr/local/noweb/lib
 -MAN=/usr/local/noweb/man
-+BIN=${PREFIX}/bin
-+LIB=${PREFIX}/share/noweb
-+MAN=${PREFIX}/man
++BIN=${INSTALL_PREFIX}/bin
++LIB=${INSTALL_PREFIX}/share/noweb
++MAN=${INSTALL_PREFIX}/man
  MANEXT=1
  MAN7EXT=7
 -TEXINPUTS=/usr/local/tex/inputs
 -ELISP=/dev/null
 +TEXINPUTS=${LIB}/tex
-+ELISP=${PREFIX}/share/emacs/site-lisp
++ELISP=${INSTALL_PREFIX}/share/emacs/site-lisp
  
  # change WEAVE if you want a different version of noweave to be installed
  WEAVE=noweave		
+@@ -37,7 +38,7 @@
+ MAN7DIR=$(MAN)/man$(MAN7EXT)
+ CATDIR=$(MAN)/cat$(MANEXT)
+ CAT7DIR=$(MAN)/cat$(MAN7EXT)
+-LIBNAME=$(LIB)
++LIBNAME=${PREFIX}/share/noweb
+ TEXNAME=$(TEXINPUTS)
+ 
+ all: 
 @@ -179,7 +180,7 @@
  	rm -f $(CATDIR)/nountangle.$(MANEXT).gz
  	(cd $(CATDIR); ln notangle.$(MANEXT).gz nountangle.$(MANEXT).gz)

Modified: head/devel/noweb/pkg-install
==============================================================================
--- head/devel/noweb/pkg-install	Thu Aug 21 23:37:08 2014	(r365603)
+++ head/devel/noweb/pkg-install	Thu Aug 21 23:38:59 2014	(r365604)
@@ -1,7 +1,4 @@
 #!/bin/sh
-if [ "$2" != "POST-INSTALL" ]; then
-  exit 0
-fi
 if ! which mktexlsr >/dev/null; then
   echo "I can't find mktexlsr in your search path."
   echo "If you want to use noweb's (La)TeX output"

Modified: head/devel/noweb/pkg-plist
==============================================================================
--- head/devel/noweb/pkg-plist	Thu Aug 21 23:37:08 2014	(r365603)
+++ head/devel/noweb/pkg-plist	Thu Aug 21 23:38:59 2014	(r365604)
@@ -10,6 +10,20 @@ bin/noweb
 bin/nuweb2noweb
 bin/cpif
 bin/sl2h
+man/man1/cpif.1.gz
+man/man1/htmltoc.1.gz
+man/man1/nodefs.1.gz
+man/man1/noindex.1.gz
+man/man1/noroff.1.gz
+man/man1/noroots.1.gz
+man/man1/notangle.1.gz
+man/man1/nountangle.1.gz
+man/man1/noweave.1.gz
+man/man1/noweb.1.gz
+man/man1/nuweb2noweb.1.gz
+man/man1/sl2h.1.gz
+man/man7/nowebfilters.7.gz
+man/man7/nowebstyle.7.gz
 share/emacs/site-lisp/noweb-mode.el
 share/noweb/autodefs.asdl
 share/noweb/autodefs.c



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