Fri Jul 3 11:50:57 2020 UTC ()
Don't ${CHOWN} at do-install target to fix a build error.
The pkgsrc infrastructure takes care of it.


(yyamano)
diff -r1.2 -r1.3 pkgsrc/databases/apache-solr/Makefile
cvs diff -r1.2 -r1.3 pkgsrc/databases/apache-solr/Makefile (switch to unified diff)

--- pkgsrc/databases/apache-solr/Makefile 2020/06/11 15:41:23 1.2
+++ pkgsrc/databases/apache-solr/Makefile 2020/07/03 11:50:57 1.3
@@ -1,105 +1,104 @@ @@ -1,105 +1,104 @@
1# $NetBSD: Makefile,v 1.2 2020/06/11 15:41:23 jym Exp $ 1# $NetBSD: Makefile,v 1.3 2020/07/03 11:50:57 yyamano Exp $
2 2
3DISTNAME= solr-${SOLR_VER} 3DISTNAME= solr-${SOLR_VER}
4PKGNAME= apache-solr-${SOLR_VER} 4PKGNAME= apache-solr-${SOLR_VER}
5SOLR_VER= 8.5.2 5SOLR_VER= 8.5.2
6CATEGORIES= databases textproc 6CATEGORIES= databases textproc
7MASTER_SITES= ${MASTER_SITE_APACHE:=lucene/solr/${SOLR_VER}/} 7MASTER_SITES= ${MASTER_SITE_APACHE:=lucene/solr/${SOLR_VER}/}
8EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
9 9
10MAINTAINER= jym@NetBSD.org 10MAINTAINER= jym@NetBSD.org
11HOMEPAGE= https://lucene.apache.org/solr/ 11HOMEPAGE= https://lucene.apache.org/solr/
12COMMENT= High performance search server built using Lucene Java 12COMMENT= High performance search server built using Lucene Java
13LICENSE= apache-2.0 13LICENSE= apache-2.0
14 14
15NO_BUILD= yes 15NO_BUILD= yes
16USE_LANGUAGES= # none 16USE_LANGUAGES= # none
17USE_JAVA= run 17USE_JAVA= run
18USE_JAVA2= 8 18USE_JAVA2= 8
19USE_TOOLS+= bash:run pax 19USE_TOOLS+= bash:run pax
20 20
21# Used by solr launch script to test for presence of the listening socket 21# Used by solr launch script to test for presence of the listening socket
22DEPENDS+= lsof-[0-9]*:../../sysutils/lsof 22DEPENDS+= lsof-[0-9]*:../../sysutils/lsof
23 23
24REPLACE_INTERPRETER+= bash 24REPLACE_INTERPRETER+= bash
25REPLACE.bash.old= /usr/bin/env bash 25REPLACE.bash.old= /usr/bin/env bash
26REPLACE.bash.new= ${TOOLS_PATH.bash} 26REPLACE.bash.new= ${TOOLS_PATH.bash}
27REPLACE_FILES.bash= bin/solr server/scripts/cloud-scripts/*.sh 27REPLACE_FILES.bash= bin/solr server/scripts/cloud-scripts/*.sh
28 28
29.include "../../mk/bsd.prefs.mk" 29.include "../../mk/bsd.prefs.mk"
30 30
31EGDIR= ${PREFIX}/share/examples/solr 31EGDIR= ${PREFIX}/share/examples/solr
32DOCDIR= ${PREFIX}/share/doc/solr 32DOCDIR= ${PREFIX}/share/doc/solr
33SOLR_DIR?= ${PREFIX}/solr 33SOLR_DIR?= ${PREFIX}/solr
34SOLR_LOGDIR?= ${VARBASE}/log/solr 34SOLR_LOGDIR?= ${VARBASE}/log/solr
35SOLR_PIDDIR?= ${VARBASE}/run/solr 35SOLR_PIDDIR?= ${VARBASE}/run/solr
36SOLR_EXAMPLE?= ${EGDIR}/example 36SOLR_EXAMPLE?= ${EGDIR}/example
37 37
38BUILD_DEFS+= SOLR_USER SOLR_GROUP SOLR_HOME SOLR_PORT 38BUILD_DEFS+= SOLR_USER SOLR_GROUP SOLR_HOME SOLR_PORT
39BUILD_DEFS+= SOLR_LOGDIR SOLR_PIDDIR VARBASE 39BUILD_DEFS+= SOLR_LOGDIR SOLR_PIDDIR VARBASE
40 40
41CONF_FILES+= ${EGDIR}/log4j.properties ${PKG_SYSCONFDIR}/log4j.properties 41CONF_FILES+= ${EGDIR}/log4j.properties ${PKG_SYSCONFDIR}/log4j.properties
42CONF_FILES+= ${EGDIR}/solr.in.sh ${PKG_SYSCONFDIR}/solr.in.sh 42CONF_FILES+= ${EGDIR}/solr.in.sh ${PKG_SYSCONFDIR}/solr.in.sh
43CONF_FILES+= ${EGDIR}/solr.xml ${PKG_SYSCONFDIR}/solr.xml 43CONF_FILES+= ${EGDIR}/solr.xml ${PKG_SYSCONFDIR}/solr.xml
44 44
45DOCS= CHANGES.txt LICENSE.txt NOTICE.txt README.txt 45DOCS= CHANGES.txt LICENSE.txt NOTICE.txt README.txt
46PAXDIRS= contrib dist server 46PAXDIRS= contrib dist server
47 47
48RCD_SCRIPTS= solr 48RCD_SCRIPTS= solr
49# Solr binding port 49# Solr binding port
50SOLR_PORT?= 8983 50SOLR_PORT?= 8983
51SOLR_USER?= solr 51SOLR_USER?= solr
52SOLR_GROUP?= ${SOLR_USER} 52SOLR_GROUP?= ${SOLR_USER}
53SOLR_HOME?= ${SOLR_DIR} 53SOLR_HOME?= ${SOLR_DIR}
54 54
55PKG_SYSCONFSUBDIR= solr 55PKG_SYSCONFSUBDIR= solr
56PKG_USERS= ${SOLR_USER}:${SOLR_GROUP} 56PKG_USERS= ${SOLR_USER}:${SOLR_GROUP}
57PKG_GROUPS= ${SOLR_GROUP} 57PKG_GROUPS= ${SOLR_GROUP}
58PKG_HOME.solr= ${SOLR_HOME} 58PKG_HOME.solr= ${SOLR_HOME}
59PKG_USERS_VARS+= SOLR_USER 59PKG_USERS_VARS+= SOLR_USER
60PKG_GROUPS_VARS+= SOLR_GROUP 60PKG_GROUPS_VARS+= SOLR_GROUP
61 61
62SUBST_CLASSES+= paths 62SUBST_CLASSES+= paths
63SUBST_STAGE.paths= pre-configure 63SUBST_STAGE.paths= pre-configure
64SUBST_FILES.paths= solr.in.sh log4j.properties bin/solr 64SUBST_FILES.paths= solr.in.sh log4j.properties bin/solr
65SUBST_VARS.paths+= PKG_SYSCONFDIR PREFIX SOLR_HOME SOLR_PORT 65SUBST_VARS.paths+= PKG_SYSCONFDIR PREFIX SOLR_HOME SOLR_PORT
66SUBST_VARS.paths+= SOLR_EXAMPLE SOLR_LOGDIR SOLR_PIDDIR 66SUBST_VARS.paths+= SOLR_EXAMPLE SOLR_LOGDIR SOLR_PIDDIR
67 67
68FILES_SUBST+= JAVA_HOME=${PKG_JAVA_HOME:Q} \ 68FILES_SUBST+= JAVA_HOME=${PKG_JAVA_HOME:Q} \
69 SOLR_LOGDIR=${SOLR_LOGDIR:Q} SOLR_HOME=${SOLR_HOME:Q} \ 69 SOLR_LOGDIR=${SOLR_LOGDIR:Q} SOLR_HOME=${SOLR_HOME:Q} \
70 SOLR_PIDDIR=${SOLR_PIDDIR:Q} SOLR_PORT=${SOLR_PORT:Q} \ 70 SOLR_PIDDIR=${SOLR_PIDDIR:Q} SOLR_PORT=${SOLR_PORT:Q} \
71 SOLR_USER=${SOLR_USER} SOLR_GROUP=${SOLR_GROUP} 71 SOLR_USER=${SOLR_USER} SOLR_GROUP=${SOLR_GROUP}
72 72
73OWN_DIRS_PERMS+= ${SOLR_HOME} ${SOLR_USER} ${SOLR_GROUP} 0700 73OWN_DIRS_PERMS+= ${SOLR_HOME} ${SOLR_USER} ${SOLR_GROUP} 0700
74OWN_DIRS_PERMS+= ${SOLR_LOGDIR} ${SOLR_USER} ${SOLR_GROUP} 0700 74OWN_DIRS_PERMS+= ${SOLR_LOGDIR} ${SOLR_USER} ${SOLR_GROUP} 0700
75OWN_DIRS_PERMS+= ${SOLR_PIDDIR} ${SOLR_USER} ${SOLR_GROUP} 0700 75OWN_DIRS_PERMS+= ${SOLR_PIDDIR} ${SOLR_USER} ${SOLR_GROUP} 0700
76 76
77INSTALLATION_DIRS= bin ${DOCDIR} ${EGDIR} ${SOLR_DIR} 77INSTALLATION_DIRS= bin ${DOCDIR} ${EGDIR} ${SOLR_DIR}
78 78
79pre-patch: 79pre-patch:
80 ${CP} ${FILESDIR}/solr.in.sh ${WRKSRC}/solr.in.sh 80 ${CP} ${FILESDIR}/solr.in.sh ${WRKSRC}/solr.in.sh
81 ${CP} ${FILESDIR}/log4j.properties ${WRKSRC}/log4j.properties 81 ${CP} ${FILESDIR}/log4j.properties ${WRKSRC}/log4j.properties
82 82
83do-install: 83do-install:
84.for f in ${DOCS} 84.for f in ${DOCS}
85 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR} 85 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}
86.endfor 86.endfor
87.for d in ${PAXDIRS} 87.for d in ${PAXDIRS}
88 ${INSTALL_DATA_DIR} ${DESTDIR}${SOLR_DIR}/${d} 88 ${INSTALL_DATA_DIR} ${DESTDIR}${SOLR_DIR}/${d}
89 cd ${WRKSRC}/${d} && pax -rwpam . ${DESTDIR}${SOLR_DIR}/${d} 89 cd ${WRKSRC}/${d} && pax -rwpam . ${DESTDIR}${SOLR_DIR}/${d}
90.endfor 90.endfor
91 ${INSTALL_DATA} ${WRKSRC}/solr.in.sh ${DESTDIR}${EGDIR}/solr.in.sh 91 ${INSTALL_DATA} ${WRKSRC}/solr.in.sh ${DESTDIR}${EGDIR}/solr.in.sh
92 ${INSTALL_DATA} ${WRKSRC}/log4j.properties \ 92 ${INSTALL_DATA} ${WRKSRC}/log4j.properties \
93 ${DESTDIR}${EGDIR}/log4j.properties 93 ${DESTDIR}${EGDIR}/log4j.properties
94 ${INSTALL_DATA} ${WRKSRC}/server/solr/solr.xml \ 94 ${INSTALL_DATA} ${WRKSRC}/server/solr/solr.xml \
95 ${DESTDIR}${EGDIR}/solr.xml 95 ${DESTDIR}${EGDIR}/solr.xml
96 ${INSTALL_DATA_DIR} ${DESTDIR}${SOLR_EXAMPLE} 96 ${INSTALL_DATA_DIR} ${DESTDIR}${SOLR_EXAMPLE}
97 cd ${WRKSRC}/example && pax -rwpam . ${DESTDIR}${SOLR_EXAMPLE} 97 cd ${WRKSRC}/example && pax -rwpam . ${DESTDIR}${SOLR_EXAMPLE}
98 ${CHOWN} -R ${SOLR_USER}:${SOLR_GROUP} ${DESTDIR}${SOLR_EXAMPLE} 
99 98
100 ${INSTALL_DATA_DIR} ${DESTDIR}${SOLR_DIR}/bin 99 ${INSTALL_DATA_DIR} ${DESTDIR}${SOLR_DIR}/bin
101 ${INSTALL_SCRIPT} ${WRKSRC}/bin/solr ${DESTDIR}${SOLR_DIR}/bin/solr 100 ${INSTALL_SCRIPT} ${WRKSRC}/bin/solr ${DESTDIR}${SOLR_DIR}/bin/solr
102 ${LN} -s ${DESTDIR}${SOLR_DIR}/bin/solr ${DESTDIR}${PREFIX}/bin/solr 101 ${LN} -s ${DESTDIR}${SOLR_DIR}/bin/solr ${DESTDIR}${PREFIX}/bin/solr
103 102
104.include "../../mk/java-vm.mk" 103.include "../../mk/java-vm.mk"
105.include "../../mk/bsd.pkg.mk" 104.include "../../mk/bsd.pkg.mk"