sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make the makefile and INSTALL script to work correctly with pkg_add.

Browse source 
PR:		18635
Submitted by:	maintainer
This commit is contained in:
Chris Piazza 2000-05-19 06:37:24 +00:00
parent de9c92cea7
commit cc3897a83e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=28574
6 changed files with 66 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
net-im/jabber/files/patch-ab
View file

@ -1,20 +1,19 @@
--- src/Makefile.in.orig Tue Mar 28 22:56:31 2000 --- src/Makefile.in.orig Mon May 1 19:47:49 2000
+++ src/Makefile.in Fri Apr 7 20:58:29 2000 +++ src/Makefile.in Wed May 17 17:05:17 2000
@@ -444,14 +444,15 @@ @@ -442,14 +442,8 @@
install-data-local: install-data-local:
+ $(INSTALL_DATA) $(top_builddir)/src/jserver.xml $(sysconfdir)/jserver.xml.default - $(SH) if test ! -f $(sysconfdir)/jserver.xml; then \
$(SH) if test ! -f $(sysconfdir)/jserver.xml; then \ - $(mkinstalldirs) $(sysconfdir); \
$(mkinstalldirs) $(sysconfdir); \ - $(INSTALL_DATA) $(top_builddir)/src/jserver.xml $(sysconfdir)/jserver.xml; \
$(INSTALL_DATA) $(top_builddir)/src/jserver.xml $(sysconfdir)/jserver.xml; \ - else \
else \ - echo "You already have a jserver.xml installed, not overwriting"; \
echo "You already have a jserver.xml installed, not overwriting"; \ - fi
fi
- $(mkinstalldirs) $(prefix)/var/jspool - $(mkinstalldirs) $(prefix)/var/jspool
- $(mkinstalldirs) $(prefix)/var/log - $(mkinstalldirs) $(prefix)/var/log
+ $(mkinstalldirs) /var/jspool + $(mkinstalldirs) $(sysconfdir);
+ chmod 700 /var/jspool + $(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. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.

12
net-im/jabber/pkg-install
View file

@ -110,15 +110,25 @@ EOF
user=jserver user=jserver
group=jserver group=jserver
spooldir="/var/jspool" spooldir="/var/jspool"
etcdir=${PREFIX}/etc etcdir=${PREFIX:-$PKG_PREFIX}/etc
echo "" echo ""
make_account ${user} ${group} "Jabber Daemon" "/nonexistent" 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}\"." echo "Fixing ownerships and modes in \"${spooldir}\"."
chown -R ${user}:${group} ${spooldir} chown -R ${user}:${group} ${spooldir}
chmod -R go= ${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." echo "Fixing config files ownerships and modes."
chown root:${group} ${etcdir}/jserver.xml ${etcdir}/jserver.xml.default chown root:${group} ${etcdir}/jserver.xml ${etcdir}/jserver.xml.default
chmod 640 ${etcdir}/jserver.xml ${etcdir}/jserver.xml.default chmod 640 ${etcdir}/jserver.xml ${etcdir}/jserver.xml.default

23
net/jabber-transport/files/patch-ab
View file

@ -1,20 +1,19 @@
--- src/Makefile.in.orig Tue Mar 28 22:56:31 2000 --- src/Makefile.in.orig Mon May 1 19:47:49 2000
+++ src/Makefile.in Fri Apr 7 20:58:29 2000 +++ src/Makefile.in Wed May 17 17:05:17 2000
@@ -444,14 +444,15 @@ @@ -442,14 +442,8 @@
install-data-local: install-data-local:
+ $(INSTALL_DATA) $(top_builddir)/src/jserver.xml $(sysconfdir)/jserver.xml.default - $(SH) if test ! -f $(sysconfdir)/jserver.xml; then \
$(SH) if test ! -f $(sysconfdir)/jserver.xml; then \ - $(mkinstalldirs) $(sysconfdir); \
$(mkinstalldirs) $(sysconfdir); \ - $(INSTALL_DATA) $(top_builddir)/src/jserver.xml $(sysconfdir)/jserver.xml; \
$(INSTALL_DATA) $(top_builddir)/src/jserver.xml $(sysconfdir)/jserver.xml; \ - else \
else \ - echo "You already have a jserver.xml installed, not overwriting"; \
echo "You already have a jserver.xml installed, not overwriting"; \ - fi
fi
- $(mkinstalldirs) $(prefix)/var/jspool - $(mkinstalldirs) $(prefix)/var/jspool
- $(mkinstalldirs) $(prefix)/var/log - $(mkinstalldirs) $(prefix)/var/log
+ $(mkinstalldirs) /var/jspool + $(mkinstalldirs) $(sysconfdir);
+ chmod 700 /var/jspool + $(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. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.

12
net/jabber-transport/pkg-install
View file

@ -110,15 +110,25 @@ EOF
user=jserver user=jserver
group=jserver group=jserver
spooldir="/var/jspool" spooldir="/var/jspool"
etcdir=${PREFIX}/etc etcdir=${PREFIX:-$PKG_PREFIX}/etc
echo "" echo ""
make_account ${user} ${group} "Jabber Daemon" "/nonexistent" 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}\"." echo "Fixing ownerships and modes in \"${spooldir}\"."
chown -R ${user}:${group} ${spooldir} chown -R ${user}:${group} ${spooldir}
chmod -R go= ${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." echo "Fixing config files ownerships and modes."
chown root:${group} ${etcdir}/jserver.xml ${etcdir}/jserver.xml.default chown root:${group} ${etcdir}/jserver.xml ${etcdir}/jserver.xml.default
chmod 640 ${etcdir}/jserver.xml ${etcdir}/jserver.xml.default chmod 640 ${etcdir}/jserver.xml ${etcdir}/jserver.xml.default

23
net/jabber/files/patch-ab
View file

@ -1,20 +1,19 @@
--- src/Makefile.in.orig Tue Mar 28 22:56:31 2000 --- src/Makefile.in.orig Mon May 1 19:47:49 2000
+++ src/Makefile.in Fri Apr 7 20:58:29 2000 +++ src/Makefile.in Wed May 17 17:05:17 2000
@@ -444,14 +444,15 @@ @@ -442,14 +442,8 @@
install-data-local: install-data-local:
+ $(INSTALL_DATA) $(top_builddir)/src/jserver.xml $(sysconfdir)/jserver.xml.default - $(SH) if test ! -f $(sysconfdir)/jserver.xml; then \
$(SH) if test ! -f $(sysconfdir)/jserver.xml; then \ - $(mkinstalldirs) $(sysconfdir); \
$(mkinstalldirs) $(sysconfdir); \ - $(INSTALL_DATA) $(top_builddir)/src/jserver.xml $(sysconfdir)/jserver.xml; \
$(INSTALL_DATA) $(top_builddir)/src/jserver.xml $(sysconfdir)/jserver.xml; \ - else \
else \ - echo "You already have a jserver.xml installed, not overwriting"; \
echo "You already have a jserver.xml installed, not overwriting"; \ - fi
fi
- $(mkinstalldirs) $(prefix)/var/jspool - $(mkinstalldirs) $(prefix)/var/jspool
- $(mkinstalldirs) $(prefix)/var/log - $(mkinstalldirs) $(prefix)/var/log
+ $(mkinstalldirs) /var/jspool + $(mkinstalldirs) $(sysconfdir);
+ chmod 700 /var/jspool + $(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. # 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. # Otherwise a system limit (for SysV at least) may be exceeded.

12
net/jabber/pkg-install
View file

@ -110,15 +110,25 @@ EOF
user=jserver user=jserver
group=jserver group=jserver
spooldir="/var/jspool" spooldir="/var/jspool"
etcdir=${PREFIX}/etc etcdir=${PREFIX:-$PKG_PREFIX}/etc
echo "" echo ""
make_account ${user} ${group} "Jabber Daemon" "/nonexistent" 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}\"." echo "Fixing ownerships and modes in \"${spooldir}\"."
chown -R ${user}:${group} ${spooldir} chown -R ${user}:${group} ${spooldir}
chmod -R go= ${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." echo "Fixing config files ownerships and modes."
chown root:${group} ${etcdir}/jserver.xml ${etcdir}/jserver.xml.default chown root:${group} ${etcdir}/jserver.xml ${etcdir}/jserver.xml.default
chmod 640 ${etcdir}/jserver.xml ${etcdir}/jserver.xml.default chmod 640 ${etcdir}/jserver.xml ${etcdir}/jserver.xml.default