Thu Sep 27 22:44:31 2018 UTC ()
fop: SUBST in pre-configure doesn't work when NO_CONFIGURE=yes


(tnn)
diff -r1.36 -r1.37 pkgsrc/textproc/fop/Makefile
cvs diff -r1.36 -r1.37 pkgsrc/textproc/fop/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/fop/Makefile 2018/07/04 13:40:39 1.36
+++ pkgsrc/textproc/fop/Makefile 2018/09/27 22:44:31 1.37
@@ -1,41 +1,41 @@ @@ -1,41 +1,41 @@
1# $NetBSD: Makefile,v 1.36 2018/07/04 13:40:39 jperkin Exp $ 1# $NetBSD: Makefile,v 1.37 2018/09/27 22:44:31 tnn Exp $
2# 2#
3# Note: we currently use the pre-built (-bin) distribution of FOP, 3# Note: we currently use the pre-built (-bin) distribution of FOP,
4# 4#
5 5
6DISTNAME= fop-${VERSION}-bin 6DISTNAME= fop-${VERSION}-bin
7PKGNAME= fop-${VERSION} 7PKGNAME= fop-${VERSION}
8VERSION= 1.1 8VERSION= 1.1
9CATEGORIES= textproc www 9CATEGORIES= textproc www
10MASTER_SITES= ${MASTER_SITE_APACHE:=xmlgraphics/fop/binaries/} 10MASTER_SITES= ${MASTER_SITE_APACHE:=xmlgraphics/fop/binaries/}
11 11
12MAINTAINER= ftigeot@users.sourceforge.net 12MAINTAINER= ftigeot@users.sourceforge.net
13HOMEPAGE= https://xmlgraphics.apache.org/fop/ 13HOMEPAGE= https://xmlgraphics.apache.org/fop/
14COMMENT= Print formatter driven by XSL Formatting Objects (XSL-FO) 14COMMENT= Print formatter driven by XSL Formatting Objects (XSL-FO)
15LICENSE= apache-2.0 15LICENSE= apache-2.0
16 16
17USE_JAVA= run 17USE_JAVA= run
18USE_TOOLS+= pax 18USE_TOOLS+= pax
19NO_CONFIGURE= yes 19NO_CONFIGURE= yes
20NO_BUILD= yes 20NO_BUILD= yes
21INSTALLATION_DIRS= bin share/java/fop 21INSTALLATION_DIRS= bin share/java/fop
22 22
23WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 23WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
24 24
25PLIST_SRC= ${PKGDIR}/PLIST 25PLIST_SRC= ${PKGDIR}/PLIST
26 26
27SUBST_CLASSES+= java_home 27SUBST_CLASSES+= java_home
28SUBST_STAGE.java_home= pre-configure 28SUBST_STAGE.java_home= pre-install
29SUBST_MESSAGE.java_home= Setting JAVA_HOME to a sane value. 29SUBST_MESSAGE.java_home= Setting JAVA_HOME to a sane value.
30SUBST_FILES.java_home= fop 30SUBST_FILES.java_home= fop
31SUBST_FILES.java_home+= fop-ttfreader.sh 31SUBST_FILES.java_home+= fop-ttfreader.sh
32SUBST_VARS.java_home= PKG_JAVA_HOME PREFIX SH 32SUBST_VARS.java_home= PKG_JAVA_HOME PREFIX SH
33 33
34.include "options.mk" 34.include "options.mk"
35 35
36fop-ttfreader: 36fop-ttfreader:
37 ${CP} ${FILESDIR}/fop-ttfreader.sh \ 37 ${CP} ${FILESDIR}/fop-ttfreader.sh \
38 ${WRKSRC}/fop-ttfreader.sh 38 ${WRKSRC}/fop-ttfreader.sh
39 39
40do-install: 40do-install:
41 cd ${WRKSRC} && ${PAX} -rw . ${DESTDIR}${PREFIX}/share/java/fop 41 cd ${WRKSRC} && ${PAX} -rw . ${DESTDIR}${PREFIX}/share/java/fop