From owner-freebsd-ports  Wed May 17 21:40:10 2000
Delivered-To: freebsd-ports@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id 2F15F37B995
	for <freebsd-ports@FreeBSD.org>; Wed, 17 May 2000 21:40:02 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id VAA97462;
	Wed, 17 May 2000 21:40:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: from sapa.ivcme.elektra.ru (IVCME-NC-LL.Elektra.RU [193.125.127.58])
	by hub.freebsd.org (Postfix) with ESMTP id 9905637B975
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 17 May 2000 21:33:37 -0700 (PDT)
	(envelope-from lukin@sapa.ivcme.elektra.ru)
Received: (from lukin@localhost)
	by sapa.ivcme.elektra.ru (8.9.3/8.8.8) id TAA34261;
	Wed, 17 May 2000 19:37:59 +0400 (MSD)
	(envelope-from lukin)
Message-Id: <200005171537.TAA34261@sapa.ivcme.elektra.ru>
Date: Wed, 17 May 2000 19:37:59 +0400 (MSD)
From: Kostya Lukin <lukin@sapa.ivcme.elektra.ru>
Reply-To: lukin@sapa.ivcme.elektra.ru
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: ports/18635: Update port: net/jabber-transport
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         18635
>Category:       ports
>Synopsis:       Update port: net/jabber-transport
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 17 21:40:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Kostya Lukin
>Release:        FreeBSD 3.3-RELEASE i386
>Organization:
IVC Mosenergo
>Environment:

	

>Description:

Changes makefile and INSTALL script to work correctly with pkg_add.

>How-To-Repeat:

	

>Fix:

diff -ruN jabber-transport.bak/patches/patch-ab jabber-transport/patches/patch-ab
--- jabber-transport.bak/patches/patch-ab	Mon May  1 07:25:18 2000
+++ jabber-transport/patches/patch-ab	Wed May 17 17:15:11 2000
@@ -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 -ruN jabber-transport.bak/pkg/INSTALL jabber-transport/pkg/INSTALL
--- jabber-transport.bak/pkg/INSTALL	Tue May 16 18:18:46 2000
+++ jabber-transport/pkg/INSTALL	Wed May 17 17:10:19 2000
@@ -110,14 +110,24 @@
     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

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message