aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net-im/iserverd/Makefile21
-rw-r--r--net-im/iserverd/distinfo6
-rw-r--r--net-im/iserverd/files/iserverd.in2
-rw-r--r--net-im/iserverd/pkg-install4
4 files changed, 17 insertions, 16 deletions
diff --git a/net-im/iserverd/Makefile b/net-im/iserverd/Makefile
index d173f72c172b..01215ff72c3f 100644
--- a/net-im/iserverd/Makefile
+++ b/net-im/iserverd/Makefile
@@ -7,10 +7,9 @@
PORTNAME= iserverd
PORTVERSION= 2.5.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-im
MASTER_SITES= http://iserverd.khstu.ru/download/
-DISTNAME= IServerd-stable
MAINTAINER= danfocus@gmail.com
COMMENT= Groupware ICQ server clone
@@ -23,13 +22,19 @@ USE_RC_SUBR= iserverd
OPTIONS= KQUEUE "Use kqueue(2) instead of poll(2)" on \
DEBUG "Enable debugging symbols" off
-CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE} \
+CONFIGURE_ARGS= --with-pgsql=${LOCALBASE} \
--with-bindir=${PREFIX}/bin \
--with-etcdir=${PREFIX}/etc/iserverd \
--with-vardir=/var/run/iserverd \
- --with-mandir=${PREFIX}/man \
--with-sbindir=${PREFIX}/bin \
- --with-logdir=/var/log/iserverd \
+ --with-mandir=${PREFIX}/man \
+ --with-logdir=/var/log/iserverd
+
+MAN1= db_convert.1
+MAN5= iserv.conf.5 v3_proto.conf.5 v5_proto.conf.5
+MAN8= iserverd.8
+
+.include <bsd.port.pre.mk>
.if defined(WITH_DEBUG)
CONFIGURE_ARGS+=--enable-debug
@@ -38,10 +43,6 @@ CONFIGURE_ARGS+=--enable-debug
CONFIGURE_ARGS+=--with-kqueue
.endif
-MAN1= db_convert.1
-MAN5= iserv.conf.5 v3_proto.conf.5 v5_proto.conf.5
-MAN8= iserverd.8
-
post-install:
@${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@${CHMOD} 644 ${PREFIX}/etc/iserverd/iserv.conf.default
@@ -55,4 +56,4 @@ post-install:
@${CHOWN} -R iserv /var/log/iserverd
@${CHOWN} -R iserv /var/run/iserverd
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net-im/iserverd/distinfo b/net-im/iserverd/distinfo
index beed81425bee..589868ad614d 100644
--- a/net-im/iserverd/distinfo
+++ b/net-im/iserverd/distinfo
@@ -1,3 +1,3 @@
-MD5 (IServerd-stable.tar.gz) = 039945afa1130c19aa72a208404ab543
-SHA256 (IServerd-stable.tar.gz) = 06b70bbe3a72646dba936698398385179b72222358ce70338e39de6ef56631e3
-SIZE (IServerd-stable.tar.gz) = 623450
+MD5 (iserverd-2.5.5.tar.gz) = 0e013ab4b263f501b2bce6dbeae5d2c5
+SHA256 (iserverd-2.5.5.tar.gz) = 044fc741483f57fe2b28030f123dfcb7e0f67c629c5fff43f43a000ff94dfd54
+SIZE (iserverd-2.5.5.tar.gz) = 622999
diff --git a/net-im/iserverd/files/iserverd.in b/net-im/iserverd/files/iserverd.in
index 0cebf64d44f8..22d49beaa808 100644
--- a/net-im/iserverd/files/iserverd.in
+++ b/net-im/iserverd/files/iserverd.in
@@ -30,7 +30,7 @@ start_cmd=iserverd_start
iserverd_start()
{
- su -l ${iserverd_user} -c "exec ${command} ${command_args}"
+ su ${iserverd_user} -c "exec ${command} ${command_args}"
echo "Starting iserverd."
}
diff --git a/net-im/iserverd/pkg-install b/net-im/iserverd/pkg-install
index 3d5b6f4e1226..631cd96909cb 100644
--- a/net-im/iserverd/pkg-install
+++ b/net-im/iserverd/pkg-install
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FREEBSD$
+# $FreeBSD$
#
PATH=/bin:/usr/sbin
@@ -26,7 +26,7 @@ POST-INSTALL)
echo "You already have a user \"${USER}\", so I will use it."
else
if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
- -d /var/spool/iserv -s /bin/sh -c "iserverd user"
+ -d /nonexistent -s /bin/sh -c "iserverd user"; \
then
echo "Added user \"${USER}\"."
else