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 (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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
@@ -85,21 +85,20 @@ do-install: @@ -85,21 +85,20 @@ do-install:
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"