diff options
| author | Chris Piazza <cpiazza@FreeBSD.org> | 2000-05-19 06:37:24 +0000 |
|---|---|---|
| committer | Chris Piazza <cpiazza@FreeBSD.org> | 2000-05-19 06:37:24 +0000 |
| commit | cc3897a83ebb926470f25dc52c49b4a98b89c0da (patch) | |
| tree | 9809b48d84561edd013eaca756b4102c2606d704 /net-im | |
| parent | Activate openjade. (diff) | |
Make the makefile and INSTALL script to work correctly with pkg_add.
PR: 18635
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=28574
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/jabber/files/patch-ab | 23 | ||||
| -rw-r--r-- | net-im/jabber/pkg-install | 12 |
2 files changed, 22 insertions, 13 deletions
diff --git a/net-im/jabber/files/patch-ab b/net-im/jabber/files/patch-ab index 7827cffe5a3b..6272a4f76e86 100644 --- a/net-im/jabber/files/patch-ab +++ b/net-im/jabber/files/patch-ab @@ -1,20 +1,19 @@ ---- src/Makefile.in.orig Tue Mar 28 22:56:31 2000 -+++ src/Makefile.in Fri Apr 7 20:58:29 2000 -@@ -444,14 +444,15 @@ +--- src/Makefile.in.orig Mon May 1 19:47:49 2000 ++++ src/Makefile.in Wed May 17 17:05:17 2000 +@@ -442,14 +442,8 @@ install-data-local: -+ $(INSTALL_DATA) $(top_builddir)/src/jserver.xml $(sysconfdir)/jserver.xml.default - $(SH) if test ! -f $(sysconfdir)/jserver.xml; then \ - $(mkinstalldirs) $(sysconfdir); \ - $(INSTALL_DATA) $(top_builddir)/src/jserver.xml $(sysconfdir)/jserver.xml; \ - else \ - echo "You already have a jserver.xml installed, not overwriting"; \ - fi +- $(SH) if test ! -f $(sysconfdir)/jserver.xml; then \ +- $(mkinstalldirs) $(sysconfdir); \ +- $(INSTALL_DATA) $(top_builddir)/src/jserver.xml $(sysconfdir)/jserver.xml; \ +- else \ +- echo "You already have a jserver.xml installed, not overwriting"; \ +- fi - $(mkinstalldirs) $(prefix)/var/jspool - $(mkinstalldirs) $(prefix)/var/log -+ $(mkinstalldirs) /var/jspool -+ chmod 700 /var/jspool ++ $(mkinstalldirs) $(sysconfdir); ++ $(INSTALL_DATA) $(top_builddir)/src/jserver.xml $(sysconfdir)/jserver.xml.default # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/net-im/jabber/pkg-install b/net-im/jabber/pkg-install index 794315549287..9a0bf378ad65 100644 --- a/net-im/jabber/pkg-install +++ b/net-im/jabber/pkg-install @@ -110,15 +110,25 @@ EOF user=jserver group=jserver spooldir="/var/jspool" - etcdir=${PREFIX}/etc + etcdir=${PREFIX:-$PKG_PREFIX}/etc echo "" make_account ${user} ${group} "Jabber Daemon" "/nonexistent" + if [ ! -d ${spooldir} ]; then + echo "Creating \"${spooldir}\"." + mkdir -p ${spooldir} + fi + echo "Fixing ownerships and modes in \"${spooldir}\"." chown -R ${user}:${group} ${spooldir} chmod -R go= ${spooldir} + if [ ! -f ${etcdir}/jserver.xml ]; then + echo "Creating \"${etcdir}/jserver.xml\"." + cp -p ${etcdir}/jserver.xml.default ${etcdir}/jserver.xml + fi + echo "Fixing config files ownerships and modes." chown root:${group} ${etcdir}/jserver.xml ${etcdir}/jserver.xml.default chmod 640 ${etcdir}/jserver.xml ${etcdir}/jserver.xml.default |