Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Files
785076ae390491e2a6a643eea89e933a3f3459b1
pkgsrc-ng/chat/ejabberd/patches/patch-aa
Lionel Sambuc 785076ae39 Import of pkgsrc-2013Q2
2013-09-26 17:14:40 +02:00

178 lines
6.4 KiB
Plaintext
Raw Blame History

$NetBSD: patch-aa,v 1.9 2011/06/06 13:45:38 fhajny Exp $
--- src/Makefile.in.orig 2011-06-06 13:25:51.841507950 +0000
+++ src/Makefile.in
@@ -71,7 +71,7 @@ endif
INSTALL_EPAM=
ifeq (@pam@, pam)
- INSTALL_EPAM=install -m 750 $(O_USER) epam $(PBINDIR)
+ INSTALL_EPAM=$(BSD_INSTALL_DATA) -m 750 $(O_USER) epam $(PBINDIR)
endif
prefix = @prefix@
@@ -89,13 +89,13 @@ BEAMS = $(SOURCES:.erl=.beam)
DESTDIR =
# /etc/ejabberd/
-ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
+ETCDIR = $(DESTDIR)@prefix@/share/examples/ejabberd
# /sbin/
SBINDIR = $(DESTDIR)@sbindir@
# /lib/ejabberd/
-EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
+EJABBERDDIR = $(DESTDIR)@prefix@/lib/erlang/lib/@DISTNAME@
# /share/doc/ejabberd
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -121,16 +121,16 @@ SODIR = $(PRIVDIR)/lib
MSGSDIR = $(PRIVDIR)/msgs
# /var/lib/ejabberd/
-SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
+SPOOLDIR = $(DESTDIR)@EJABBERD_DB@
# /var/lock/ejabberdctl
-CTLLOCKDIR = $(DESTDIR)@localstatedir@/lock/ejabberdctl
+CTLLOCKDIR = $(DESTDIR)@EJABBERD_PIDDIR@
# /var/lib/ejabberd/.erlang.cookie
COOKIEFILE = $(SPOOLDIR)/.erlang.cookie
# /var/log/ejabberd/
-LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd
+LOGDIR = $(DESTDIR)@JABBERD_LOGDIR@
# Assume Linux-style dynamic library flags
DYNAMIC_LIB_CFLAGS = -fpic -shared
@@ -183,10 +183,10 @@ translations:
install: all
#
# Configuration files
- install -d -m 750 $(G_USER) $(ETCDIR)
+ $(BSD_INSTALL_DATA_DIR) -m 750 $(G_USER) $(ETCDIR)
[ -f $(ETCDIR)/ejabberd.cfg ] \
- && install -b -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg-new \
- || install -b -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg
+ && $(BSD_INSTALL_DATA) -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg-new \
+ || $(BSD_INSTALL_DATA) -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg
sed -e "s*@rootdir@*@prefix@*" \
-e "s*@installuser@*@INSTALLUSER@*" \
-e "s*@LIBDIR@*@libdir@*" \
@@ -196,13 +196,13 @@ install: all
-e "s*@erl@*@ERL@*" ejabberdctl.template \
> ejabberdctl.example
[ -f $(ETCDIR)/ejabberdctl.cfg ] \
- && install -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
- || install -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
- install -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
+ && $(BSD_INSTALL_DATA) -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
+ || $(BSD_INSTALL_DATA) -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
+ $(BSD_INSTALL_DATA) -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
#
# Administration script
- [ -d $(SBINDIR) ] || install -d -m 755 $(SBINDIR)
- install -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
+ [ -d $(SBINDIR) ] || $(BSD_INSTALL_DATA_DIR) -m 755 $(SBINDIR)
+ $(BSD_INSTALL_SCRIPT) -m 555 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
#
# Init script
sed -e "s*@ctlscriptpath@*$(SBINDIR)*" \
@@ -211,64 +211,58 @@ install: all
chmod 755 ejabberd.init
#
# Binary Erlang files
- install -d $(BEAMDIR)
- install -m 644 *.app $(BEAMDIR)
- install -m 644 *.beam $(BEAMDIR)
+ $(BSD_INSTALL_DATA_DIR) $(BEAMDIR)
+ $(BSD_INSTALL_DATA) -m 644 *.app $(BEAMDIR)
+ $(BSD_INSTALL_DATA) -m 644 *.beam $(BEAMDIR)
rm -f $(BEAMDIR)/configure.beam
#
# ejabberd header files
- install -d $(INCLUDEDIR)
- install -m 644 *.hrl $(INCLUDEDIR)
- install -d $(INCLUDEDIR)/eldap/
- install -m 644 eldap/*.hrl $(INCLUDEDIR)/eldap/
- install -d $(INCLUDEDIR)/mod_muc/
- install -m 644 mod_muc/*.hrl $(INCLUDEDIR)/mod_muc/
- install -d $(INCLUDEDIR)/mod_proxy65/
- install -m 644 mod_proxy65/*.hrl $(INCLUDEDIR)/mod_proxy65/
- install -d $(INCLUDEDIR)/mod_pubsub/
- install -m 644 mod_pubsub/*.hrl $(INCLUDEDIR)/mod_pubsub/
- install -d $(INCLUDEDIR)/web/
- install -m 644 web/*.hrl $(INCLUDEDIR)/web/
+ $(BSD_INSTALL_DATA_DIR) $(INCLUDEDIR)
+ $(BSD_INSTALL_DATA) -m 644 *.hrl $(INCLUDEDIR)
+ $(BSD_INSTALL_DATA_DIR) $(INCLUDEDIR)/eldap/
+ $(BSD_INSTALL_DATA) -m 644 eldap/*.hrl $(INCLUDEDIR)/eldap/
+ $(BSD_INSTALL_DATA_DIR) $(INCLUDEDIR)/mod_muc/
+ $(BSD_INSTALL_DATA) -m 644 mod_muc/*.hrl $(INCLUDEDIR)/mod_muc/
+ $(BSD_INSTALL_DATA_DIR) $(INCLUDEDIR)/mod_proxy65/
+ $(BSD_INSTALL_DATA) -m 644 mod_proxy65/*.hrl $(INCLUDEDIR)/mod_proxy65/
+ $(BSD_INSTALL_DATA_DIR) $(INCLUDEDIR)/mod_pubsub/
+ $(BSD_INSTALL_DATA) -m 644 mod_pubsub/*.hrl $(INCLUDEDIR)/mod_pubsub/
+ $(BSD_INSTALL_DATA_DIR) $(INCLUDEDIR)/web/
+ $(BSD_INSTALL_DATA) -m 644 web/*.hrl $(INCLUDEDIR)/web/
#
# Binary C programs
- install -d $(PBINDIR)
- install -m 750 $(O_USER) ../tools/captcha.sh $(PBINDIR)
+ $(BSD_INSTALL_SCRIPT_DIR) $(PBINDIR)
+ $(BSD_INSTALL_SCRIPT) -m 750 $(O_USER) ../tools/captcha.sh $(PBINDIR)
$(INSTALL_EPAM)
#
# Binary system libraries
- install -d $(SODIR)
- install -m 644 *.so $(SODIR)
+ $(BSD_INSTALL_LIB_DIR) $(SODIR)
+ $(BSD_INSTALL_LIB) -m 644 *.so $(SODIR)
#
# Translated strings
- install -d $(MSGSDIR)
- install -m 644 msgs/*.msg $(MSGSDIR)
- #
- # Spool directory
- install -d -m 750 $(O_USER) $(SPOOLDIR)
- $(CHOWN_COMMAND) -R @INSTALLUSER@ $(SPOOLDIR) >$(CHOWN_OUTPUT)
- chmod -R 750 $(SPOOLDIR)
- [ ! -f $(COOKIEFILE) ] || { $(CHOWN_COMMAND) @INSTALLUSER@ $(COOKIEFILE) >$(CHOWN_OUTPUT) ; chmod 400 $(COOKIEFILE) ; }
+ $(BSD_INSTALL_DATA_DIR) $(MSGSDIR)
+ $(BSD_INSTALL_DATA) -m 644 msgs/*.msg $(MSGSDIR)
#
# ejabberdctl lock directory
- install -d -m 750 $(O_USER) $(CTLLOCKDIR)
+ $(BSD_INSTALL_DATA_DIR) -m 750 $(O_USER) $(CTLLOCKDIR)
$(CHOWN_COMMAND) -R @INSTALLUSER@ $(CTLLOCKDIR) >$(CHOWN_OUTPUT)
chmod -R 750 $(CTLLOCKDIR)
#
# Log directory
- install -d -m 750 $(O_USER) $(LOGDIR)
+ $(BSD_INSTALL_DATA_DIR) -m 750 $(O_USER) $(LOGDIR)
$(CHOWN_COMMAND) -R @INSTALLUSER@ $(LOGDIR) >$(CHOWN_OUTPUT)
chmod -R 750 $(LOGDIR)
#
# Documentation
- install -d $(DOCDIR)
- install -m 644 ../doc/dev.html $(DOCDIR)
- install -m 644 ../doc/guide.html $(DOCDIR)
- install -m 644 ../doc/*.png $(DOCDIR)
- install -m 644 ../doc/*.txt $(DOCDIR)
+ $(BSD_INSTALL_DATA_DIR) $(DOCDIR)
+ $(BSD_INSTALL_DATA) -m 644 ../doc/dev.html $(DOCDIR)
+ $(BSD_INSTALL_DATA) -m 644 ../doc/guide.html $(DOCDIR)
+ $(BSD_INSTALL_DATA) -m 644 ../doc/*.png $(DOCDIR)
+ $(BSD_INSTALL_DATA) -m 644 ../doc/*.txt $(DOCDIR)
[ -f ../doc/guide.pdf ] \
- && install -m 644 ../doc/guide.pdf $(DOCDIR) \
+ && $(BSD_INSTALL_DATA) -m 644 ../doc/guide.pdf $(DOCDIR) \
|| echo "No ../doc/guide.pdf was built"
- install -m 644 ../COPYING $(DOCDIR)
+ $(BSD_INSTALL_DATA) -m 644 ../COPYING $(DOCDIR)
uninstall: uninstall-binary
Reference in New Issue View Git Blame Copy Permalink