Date: Sat, 29 Oct 2005 14:23:03 GMT From: Gerrit Beine <tux@pinguru.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/88177: Update port: irc/thales Message-ID: <200510291423.j9TEN3In056632@www.freebsd.org> Resent-Message-ID: <200510291430.j9TEUADp042832@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 88177
>Category: ports
>Synopsis: Update port: irc/thales
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Oct 29 14:30:10 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Gerrit Beine
>Release: FreeBSD 5.4-RELEASE-p7
>Organization:
>Environment:
FreeBSD asus.beine-computer.de 5.4-RELEASE-p7 FreeBSD 5.4-RELEASE-p7 #2: Sun Oct 2 13:06:59 CEST 2005 root@asus.beine-computer.de:/usr/src/sys/i386/compile/ASUS i386
>Description:
This update contains the following changes
* the port now honors LOCALBASE
* the thales executable moved to libexec
* thales using an rc-script for starting
* logfile is placed under /var/log
* pidfile is placed under /var/pid
>How-To-Repeat:
>Fix:
diff -Nur /usr/ports/irc/thales/Makefile thales/Makefile
--- /usr/ports/irc/thales/Makefile Thu Apr 28 11:26:16 2005
+++ thales/Makefile Sat Oct 29 16:14:06 2005
@@ -7,6 +7,7 @@
PORTNAME= thales
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= irc
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,6 +18,7 @@
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_MYSQL= yes
+USE_RC_SUBR= thales.sh
USE_REINPLACE= yes
# Currently, not all supported IRCDs are handled here, only the ones
@@ -34,7 +36,10 @@
# ``Assign with expansion'' is needed here, otherwise we cannot override
# WITH_IRCD value supplied as make(1) argument (which can be bogus).
-CONFIGURE_ARGS:= --with-ircd=${WITH_IRCD}
+CONFIGURE_ARGS:= --with-ircd=${WITH_IRCD} \
+ --prefix=${PREFIX}/libexec/thales \
+ --with-mysql=${LOCALBASE} \
+ --with-mysql-libraries=${LOCALBASE}/lib/mysql
.if defined(WITHOUT_MODES)
CONFIGURE_ARGS+= --enable-no-modes
@@ -61,7 +66,7 @@
do-install:
@${MKDIR} ${DATADIR}
- ${INSTALL_PROGRAM} ${WRKSRC}/src/thales ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/thales ${PREFIX}/libexec
${INSTALL_DATA} ${WRKSRC}/data/thales.conf.default ${PREFIX}/etc
${INSTALL_DATA} ${WRKSRC}/data/*.sql ${DATADIR}
.if !defined(NOPORTDOCS)
diff -Nur /usr/ports/irc/thales/files/patch-conf.h thales/files/patch-conf.h
--- /usr/ports/irc/thales/files/patch-conf.h Thu Jan 1 01:00:00 1970
+++ thales/files/patch-conf.h Sat Apr 2 10:42:51 2005
@@ -0,0 +1,11 @@
+--- src/conf.h Sun Jan 11 00:26:12 2004
++++ src/conf.h Sat Apr 2 10:42:03 2005
+@@ -23,7 +23,7 @@
+ #include "log.h"
+
+ /* Configuration directives. */
+-#define THALES_CONF "thales.conf"
++#define THALES_CONF "%%PREFIX%%/etc/thales.conf"
+ #define MAXPARAMS 4
+
+ typedef struct
diff -Nur /usr/ports/irc/thales/files/patch-thales.conf.default thales/files/patch-thales.conf.default
--- /usr/ports/irc/thales/files/patch-thales.conf.default Thu Jan 1 01:00:00 1970
+++ thales/files/patch-thales.conf.default Sat Apr 2 10:58:23 2005
@@ -0,0 +1,17 @@
+--- data/thales.conf.default Sat Jul 5 17:04:39 2003
++++ data/thales.conf.default Sat Apr 2 10:57:47 2005
+@@ -144,12 +144,12 @@
+ # PIDFile <filename> [REQUIRED]
+ # Specifies the name of the file containing Services' process ID.
+
+-PIDFile thales.pid
++PIDFile /var/run/thales.pid
+
+ # LogFile <filename> [REQUIRED]
+ # Specifies the name of the log file.
+
+-LogFile thales.log
++LogFile /var/log/thales.log
+
+ ###########################################################################
+ #
diff -Nur /usr/ports/irc/thales/files/thales.sh.in thales/files/thales.sh.in
--- /usr/ports/irc/thales/files/thales.sh.in Thu Jan 1 01:00:00 1970
+++ thales/files/thales.sh.in Sat Oct 29 00:00:45 2005
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: thales
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: shutdown
+
+#
+# Add the following line to /etc/rc.conf to enable Thales:
+# thales_enable (bool): Set to "NO" by default.
+# Set it to "YES" to enable Thales
+#
+
+. %%RC_SUBR%%
+
+name="thales"
+rcvar=`set_rcvar`
+
+command="%%PREFIX%%/bin/thales"
+
+[ -z "$thales_enable" ] && thales_enable="NO"
+
+required_files="%%PREFIX%%/etc/thales.conf"
+
+load_rc_config $name
+run_rc_command "$1"
diff -Nur /usr/ports/irc/thales/pkg-plist thales/pkg-plist
--- /usr/ports/irc/thales/pkg-plist Tue Apr 26 07:45:48 2005
+++ thales/pkg-plist Sat Oct 29 16:06:07 2005
@@ -1,4 +1,4 @@
-bin/thales
+libexec/thales
etc/thales.conf.default
%%DATADIR%%/mysql-bahamut.sql
%%DATADIR%%/mysql-hybrid.sql
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200510291423.j9TEN3In056632>