aboutsummaryrefslogtreecommitdiffstats
path: root/textproc
diff options
context:
space:
mode:
authorultima <ultima@FreeBSD.org>2017-07-07 03:31:02 +0800
committerultima <ultima@FreeBSD.org>2017-07-07 03:31:02 +0800
commiteffc5fa4ba5572554c85abda39a98953335bbd3c (patch)
treef8b07bfcb49cd5401db713dece444b8b1ced72c2 /textproc
parent4b47a4fa069d070ff9e16e74f364b2fd7aaec6af (diff)
downloadfreebsd-ports-gnome-effc5fa4ba5572554c85abda39a98953335bbd3c.tar.gz
freebsd-ports-gnome-effc5fa4ba5572554c85abda39a98953335bbd3c.tar.zst
freebsd-ports-gnome-effc5fa4ba5572554c85abda39a98953335bbd3c.zip
* Fixed uid:gid of solr directories
PR: 220001 Submitted by: Matthias Fechner <idefix@fechner.net> (maintainer), Reshad Patuck <reshadpatuck1@gmail.com> Reviewed by: lifanov (mentor) Approved by: lifanov (mentor) Differential Revision: https://reviews.freebsd.org/D11501
Diffstat (limited to 'textproc')
-rw-r--r--textproc/apache-solr/Makefile3
-rw-r--r--textproc/apache-solr/files/pkg-install.in22
-rw-r--r--textproc/apache-solr/pkg-plist8
3 files changed, 6 insertions, 27 deletions
diff --git a/textproc/apache-solr/Makefile b/textproc/apache-solr/Makefile
index 1f1d5014c05e..2689eb3cd58e 100644
--- a/textproc/apache-solr/Makefile
+++ b/textproc/apache-solr/Makefile
@@ -3,6 +3,7 @@
PORTNAME= apache-solr
PORTVERSION= 6.5.1
+PORTREVISION= 1
CATEGORIES= textproc java
MASTER_SITES= APACHE/lucene/solr/${PORTVERSION}
DISTNAME= solr-${PORTVERSION}
@@ -23,7 +24,7 @@ JAVA_RUN= yes
NO_BUILD= yes
NO_ARCH= yes
PLIST_SUB+= PORTVERSION="${PORTVERSION}"
-SUB_FILES= pkg-message pkg-install
+SUB_FILES= pkg-message
USE_RC_SUBR= solr
USERS= solr
GROUPS= ${USERS}
diff --git a/textproc/apache-solr/files/pkg-install.in b/textproc/apache-solr/files/pkg-install.in
deleted file mode 100644
index f49b6863f18a..000000000000
--- a/textproc/apache-solr/files/pkg-install.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh
-#
-PATH=/bin:/usr/bin:/usr/sbin
-
-set -e
-case "$2" in
-
-POST-INSTALL)
- echo "---> Starting post-install script"
- LC_ALL=C
- export LC_ALL
-
- echo "Fix permissions"
- /usr/sbin/chown -R solr /var/db/solr
- /usr/bin/chgrp -R solr /var/db/solr
- /usr/sbin/chown -R solr /var/log/solr
- /usr/bin/chgrp -R solr /var/log/solr
- echo "done."
- echo ""
-
- ;;
-esac
diff --git a/textproc/apache-solr/pkg-plist b/textproc/apache-solr/pkg-plist
index 4fcb664b58f9..45e62950cd36 100644
--- a/textproc/apache-solr/pkg-plist
+++ b/textproc/apache-solr/pkg-plist
@@ -1,6 +1,6 @@
@sample etc/solr.in.sh-dist etc/solr.in.sh
-@sample /var/db/solr/solr.xml-dist /var/db/solr/solr.xml
-@sample /var/db/solr/log4j.properties-dist /var/db/solr/log4j.properties
+@sample(solr,solr) /var/db/solr/solr.xml-dist /var/db/solr/solr.xml
+@sample(solr,solr) /var/db/solr/log4j.properties-dist /var/db/solr/log4j.properties
solr/CHANGES.txt
solr/LICENSE.txt
solr/LUCENE_CHANGES.txt
@@ -1829,5 +1829,5 @@ solr/server/solr/configsets/sample_techproducts_configs/conf/xslt/updateXml.xsl
solr/server/solr/solr.xml
solr/server/solr/zoo.cfg
solr/server/start.jar
-@dir /var/db/solr
-@dir /var/log/solr
+@dir(solr,solr) /var/db/solr
+@dir(solr,solr) /var/log/solr