diff options
| author | Ion-Mihai Tetcu <itetcu@FreeBSD.org> | 2009-06-16 21:09:33 +0000 |
|---|---|---|
| committer | Ion-Mihai Tetcu <itetcu@FreeBSD.org> | 2009-06-16 21:09:33 +0000 |
| commit | 868c6b51d635ad954b0ed2ea39ae69659bd6e6e6 (patch) | |
| tree | 3a4be3b719ce96110a433ce5375184ee3e6e03ad /irc | |
| parent | - Document cscope -- multiple buffer overflows (diff) | |
Fix build / deinstall with custom LOCALBASE and PREFIX
Submitted by: maintainer
Reported by: QATty
Notes
Notes:
svn path=/head/; revision=236080
Diffstat (limited to 'irc')
| -rw-r--r-- | irc/ircd-ratbox-devel/Makefile | 2 | ||||
| -rw-r--r-- | irc/ircd-ratbox-devel/pkg-plist | 8 | ||||
| -rw-r--r-- | irc/ratbox-services/Makefile | 1 | ||||
| -rw-r--r-- | irc/ratbox-services/pkg-plist | 10 |
4 files changed, 12 insertions, 9 deletions
diff --git a/irc/ircd-ratbox-devel/Makefile b/irc/ircd-ratbox-devel/Makefile index 6b990469eb65..a4a9cc55f5a4 100644 --- a/irc/ircd-ratbox-devel/Makefile +++ b/irc/ircd-ratbox-devel/Makefile @@ -8,6 +8,7 @@ PORTNAME= ircd-ratbox PORTVERSION= 3.0.4 +PORTREVISION= 1 CATEGORIES= irc ipv6 MASTER_SITES= ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/testing/ \ ftp://ftp.demon.co.uk/pub/mirrors/ircd-ratbox/testing/ \ @@ -42,6 +43,7 @@ CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc/${PORTNAME} \ --libexecdir=${PREFIX}/libexec \ --with-helpdir=${DATADIR}/help \ --libdir=${PREFIX}/lib/${PORTNAME} \ + --with-sqlite3=${LOCALBASE} \ --disable-backups PORTDOCS= [^i]*.txt README.* technical/[^i]*.txt Tao-of-IRC.* diff --git a/irc/ircd-ratbox-devel/pkg-plist b/irc/ircd-ratbox-devel/pkg-plist index 08ec14d33898..73466760719f 100644 --- a/irc/ircd-ratbox-devel/pkg-plist +++ b/irc/ircd-ratbox-devel/pkg-plist @@ -239,12 +239,12 @@ lib/ircd-ratbox/modules/m_squit.so @dirrm %%DATADIR%% etc/ircd-ratbox/genssl.sh etc/ircd-ratbox/ircd-efnet.conf.sample -@unexec if cmp -s %D/etc/ircd-ratbox/ircd.conf.sample %D/etc/ircd-ratbox/ircd.conf; then rm -f %D/etc/ircd-ratbox/ircd.conf; fi +@unexec if cmp -s "%D/etc/ircd-ratbox/ircd.conf.sample" "%D/etc/ircd-ratbox/ircd.conf"; then rm -f "%D/etc/ircd-ratbox/ircd.conf"; fi etc/ircd-ratbox/ircd.conf.sample -@exec if [ ! -f %D/etc/ircd-ratbox/ircd.conf ] ; then cp -p %D/%F %B/ircd.conf; fi -@unexec if cmp -s %D/etc/ircd-ratbox/ircd.motd.sample %D/etc/ircd-ratbox/ircd.motd; then rm -f %D/etc/ircd-ratbox/ircd.motd; fi +@exec if [ ! -f "%D/etc/ircd-ratbox/ircd.conf" ] ; then cp -p "%D/%F" "%B/ircd.conf"; fi +@unexec if cmp -s "%D/etc/ircd-ratbox/ircd.motd.sample" "%D/etc/ircd-ratbox/ircd.motd"; then rm -f "%D/etc/ircd-ratbox/ircd.motd"; fi etc/ircd-ratbox/ircd.motd.sample -@exec if [ ! -f %D/etc/ircd-ratbox/ircd.motd ] ; then cp -p %D/%F %B/ircd.motd; fi +@exec if [ ! -f "%D/etc/ircd-ratbox/ircd.motd" ] ; then cp -p "%D/%F %B/ircd.motd"; fi @dirrmtry etc/ircd-ratbox @cwd / @dirrmtry %%LOGDIR%% diff --git a/irc/ratbox-services/Makefile b/irc/ratbox-services/Makefile index df57aab306a2..02edf38cc5ad 100644 --- a/irc/ratbox-services/Makefile +++ b/irc/ratbox-services/Makefile @@ -6,6 +6,7 @@ PORTNAME= ratbox-services PORTVERSION= 1.2.1 +PORTREVISION= 1 CATEGORIES= irc MASTER_SITES= ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/${PORTNAME}/ \ ftp://ftp.demon.co.uk/pub/mirrors/ircd-ratbox/${PORTNAME}/ \ diff --git a/irc/ratbox-services/pkg-plist b/irc/ratbox-services/pkg-plist index 09cd0095df65..6adb176b17d3 100644 --- a/irc/ratbox-services/pkg-plist +++ b/irc/ratbox-services/pkg-plist @@ -607,14 +607,14 @@ include/client.h %%DATADIR%%/langs/ru.lang @dirrm %%DATADIR%%/help @dirrm %%DATADIR%%/langs -@unexec f="/usr/local/share/ratbox-services/schema-mysql.txt"; if [ -f "$f" ]; then rm -f "$f"; fi -@unexec f="/usr/local/share/ratbox-services/schema-pgsql.txt"; if [ -f "$f" ]; then rm -f "$f"; fi -@unexec f="/usr/local/share/ratbox-services/schema-sqlite.txt"; if [ -f "$f" ]; then rm -f "$f"; fi +@unexec if [ -f "%D/%%DATADIR%%/schema-mysql.txt" ]; then rm -f "%D/%%DATADIR%%/schema-mysql.txt"; fi +@unexec if [ -f "%D/%%DATADIR%%/schema-pgsql.txt" ]; then rm -f "%D/%%DATADIR%%/schema-pgsql.txt"; fi +@unexec if [ -f "%D/%%DATADIR%%/schema-sqlite.txt" ]; then rm -f "%D/%%DATADIR%%/schema-sqlite.txt"; fi @dirrm %%DATADIR%% @dirrmtry %%DBDIR%% %%PORTDOCS%%@dirrmtry %%DOCSDIR%% -@unexec if cmp -s %D/etc/ratbox-services.conf.sample %D/etc/ratbox-services.conf; then rm -f %D/etc/ratbox-services.conf; fi +@unexec if cmp -s "%D/etc/ratbox-services.conf.sample" "%D/etc/ratbox-services.conf"; then rm -f %D/etc/ratbox-services.conf; fi etc/ratbox-services.conf.sample -@exec if [ ! -f %D/etc/ratbox-services.conf ] ; then cp -p %D/%F %B/ratbox-services.conf; fi +@exec if [ ! -f "%D/etc/ratbox-services.conf" ] ; then cp -p "%D/%F" "%B/ratbox-services.conf"; fi @unexec f="/var/log/ratbox-services.log"; if [ ! -s "$f" ]; then rm -f "$f"; fi @unexec f="/var/run/ratbox-services.pid"; if [ ! -s "$f" ]; then rm -f "$f"; fi |