| 1 |
mr_bones_ 09/06/30 02:01:23 |
| 2 |
|
| 3 |
Added: pvpgn-1.8.5-fhs.patch |
| 4 |
Log: |
| 5 |
version bump (bug #197911) |
| 6 |
(Portage version: 2.1.6.13/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 games-server/pvpgn/files/pvpgn-1.8.5-fhs.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-server/pvpgn/files/pvpgn-1.8.5-fhs.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-server/pvpgn/files/pvpgn-1.8.5-fhs.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: pvpgn-1.8.5-fhs.patch |
| 15 |
=================================================================== |
| 16 |
diff -ruN pvpgn-1.8.0rc2.orig/conf/bnetd.conf.in pvpgn-1.8.0rc2/conf/bnetd.conf.in |
| 17 |
--- pvpgn-1.8.0rc2.orig/conf/bnetd.conf.in 2005-09-19 08:17:50.000000000 -0400 |
| 18 |
+++ pvpgn-1.8.0rc2/conf/bnetd.conf.in 2006-08-16 23:34:10.000000000 -0400 |
| 19 |
@@ -50,22 +50,22 @@ |
| 20 |
# - "prefix" : prefix to use for all pvpgn tables (default "") # |
| 21 |
# # |
| 22 |
# Examples: # |
| 23 |
-# storage_path = file:mode=plain;dir=/usr/local/var/users;clan=/usr/local/var/clans;team=/usr/local/var/teams;default=/usr/local/etc/bnetd_default_user.plain |
| 24 |
-# storage_path = file:mode=cdb;dir=/usr/local/var/userscdb;clan=/usr/local/var/clans;team=/usr/local/var/teams;default=/usr/local/etc/bnetd_default_user.cdb |
| 25 |
+# storage_path = file:mode=plain;dir=%statedir%/users;clan=%statedir%/clans;team=%statedir%/teams;default=%confdir%/bnetd_default_user.plain |
| 26 |
+# storage_path = file:mode=cdb;dir=%statedir%/userscdb;clan=%statedir%/clans;team=%statedir%/teams;default=%confdir%/bnetd_default_user.cdb |
| 27 |
# storage_path = sql:mode=mysql;host=127.0.0.1;name=PVPGN;user=pvpgn;pass=pvpgnrocks;default=0;prefix=pvpgn_ |
| 28 |
# storage_path = sql:mode=pgsql;host=127.0.0.1;name=pvpgn;user=pvpgn;pass=pvpgnrocks;default=0;prefix=pvpgn_ |
| 29 |
-# storage_path = sql:mode=sqlite3;name=/usr/local/var/users.db;default=0;prefix=pvpgn_ |
| 30 |
+# storage_path = sql:mode=sqlite3;name=%statedir%/users.db;default=0;prefix=pvpgn_ |
| 31 |
# storage_path = sql:mode=odbc;name=PVPGN;prefix=pvpgn_ |
| 32 |
# |
| 33 |
# WARNING!! you MUST change "DBlayoutfile" bellow configuration directive to |
| 34 |
# sql_DB_layout2.conf to be able to use "sql2" !!! |
| 35 |
# storage_path = sql2:mode=mysql;host=127.0.0.1;name=PVPGN;user=pvpgn;pass=pvpgnrocks;default=0;prefix=pvpgn2_ |
| 36 |
# storage_path = sql2:mode=pgsql;host=127.0.0.1;name=pvpgn;user=pvpgn;pass=pvpgnrocks;default=0;prefix=pvpgn2_ |
| 37 |
-# storage_path = sql2:mode=sqlite3;name=/usr/local/var/users.db;default=0;prefix=pvpgn2_ |
| 38 |
+# storage_path = sql2:mode=sqlite3;name=%statedir%/users.db;default=0;prefix=pvpgn2_ |
| 39 |
# storage_path = sql2:mode=odbc;name=PVPGN;prefix=pvpgn2_ |
| 40 |
#----------------------------------------------------------------------------# |
| 41 |
|
| 42 |
-storage_path = file:mode=plain;dir=/usr/local/var/users;clan=/usr/local/var/clans;team=/usr/local/var/teams;default=/usr/local/etc/bnetd_default_user.plain |
| 43 |
+storage_path = file:mode=plain;dir=%statedir%/users;clan=%statedir%/clans;team=%statedir%/teams;default=%confdir%/bnetd_default_user.plain |
| 44 |
|
| 45 |
# # |
| 46 |
############################################################################## |
| 47 |
@@ -76,35 +76,35 @@ |
| 48 |
# Use absolute paths in these lines to avoid problems! # |
| 49 |
#----------------------------------------------------------------------------# |
| 50 |
|
| 51 |
-filedir = /usr/local/var/files |
| 52 |
-reportdir = /usr/local/var/reports |
| 53 |
-chanlogdir = /usr/local/var/chanlogs |
| 54 |
-motdfile = /usr/local/etc/bnmotd.txt |
| 55 |
-issuefile = /usr/local/etc/bnissue.txt |
| 56 |
-channelfile = /usr/local/etc/channel.conf |
| 57 |
-newsfile = /usr/local/etc/news.txt |
| 58 |
-adfile = /usr/local/etc/ad.conf |
| 59 |
-topicfile = /usr/local/etc/topics.conf |
| 60 |
-ipbanfile = /usr/local/etc/bnban.conf |
| 61 |
-helpfile = /usr/local/etc/bnhelp.conf |
| 62 |
-mpqfile = /usr/local/etc/autoupdate.conf |
| 63 |
-logfile = /usr/local/var/bnetd.log |
| 64 |
-realmfile = /usr/local/etc/realm.conf |
| 65 |
-maildir = /usr/local/var/bnmail |
| 66 |
-versioncheck_file = /usr/local/etc/versioncheck.conf |
| 67 |
-mapsfile = /usr/local/etc/bnmaps.conf |
| 68 |
-xplevelfile = /usr/local/etc/bnxplevel.conf |
| 69 |
-xpcalcfile = /usr/local/etc/bnxpcalc.conf |
| 70 |
-#pidfile = /usr/local/var/bnetd.pid |
| 71 |
-ladderdir = /usr/local/var/ladders |
| 72 |
-command_groups_file = /usr/local/etc/command_groups.conf |
| 73 |
-tournament_file = /usr/local/etc/tournament.conf |
| 74 |
-statusdir = /usr/local/var/status |
| 75 |
-aliasfile = /usr/local/etc/bnalias.conf |
| 76 |
-anongame_infos_file = /usr/local/etc/anongame_infos.conf |
| 77 |
-DBlayoutfile = /usr/local/etc/sql_DB_layout.conf |
| 78 |
-supportfile = /usr/local/etc/supportfile.conf |
| 79 |
-transfile = /usr/local/etc/address_translation.conf |
| 80 |
+filedir = %datadir% |
| 81 |
+reportdir = %statedir%/reports |
| 82 |
+chanlogdir = %statedir%/chanlogs |
| 83 |
+motdfile = %confdir%/bnmotd.txt |
| 84 |
+issuefile = %confdir%/bnissue.txt |
| 85 |
+channelfile = %confdir%/channel.conf |
| 86 |
+newsfile = %confdir%/news.txt |
| 87 |
+adfile = %confdir%/ad.conf |
| 88 |
+topicfile = %confdir%/topics.conf |
| 89 |
+ipbanfile = %confdir%/bnban.conf |
| 90 |
+helpfile = %confdir%/bnhelp.conf |
| 91 |
+mpqfile = %confdir%/autoupdate.conf |
| 92 |
+logfile = %logdir%/bnetd.log |
| 93 |
+realmfile = %confdir%/realm.conf |
| 94 |
+maildir = %statedir%/bnmail |
| 95 |
+versioncheck_file = %confdir%/versioncheck.conf |
| 96 |
+mapsfile = %confdir%/bnmaps.conf |
| 97 |
+xplevelfile = %confdir%/bnxplevel.conf |
| 98 |
+xpcalcfile = %confdir%/bnxpcalc.conf |
| 99 |
+#pidfile = /var/run/bnetd/bnetd.pid |
| 100 |
+ladderdir = %confdir%/ladders |
| 101 |
+command_groups_file = %confdir%/command_groups.conf |
| 102 |
+tournament_file = %confdir%/tournament.conf |
| 103 |
+statusdir = %statedir%/status |
| 104 |
+aliasfile = %confdir%/bnalias.conf |
| 105 |
+anongame_infos_file = %confdir%/anongame_infos.conf |
| 106 |
+DBlayoutfile = %confdir%/sql_DB_layout.conf |
| 107 |
+supportfile = %confdir%/supportfile.conf |
| 108 |
+transfile = %confdir%/address_translation.conf |
| 109 |
|
| 110 |
fortunecmd = /usr/games/fortune |
| 111 |
|
| 112 |
diff -ruN pvpgn-1.8.0rc2.orig/conf/d2cs.conf.in pvpgn-1.8.0rc2/conf/d2cs.conf.in |
| 113 |
--- pvpgn-1.8.0rc2.orig/conf/d2cs.conf.in 2005-09-29 01:37:33.000000000 -0400 |
| 114 |
+++ pvpgn-1.8.0rc2/conf/d2cs.conf.in 2006-08-16 23:35:43.000000000 -0400 |
| 115 |
@@ -86,16 +86,16 @@ |
| 116 |
# Use absolute paths in these lines to avoid problems! # |
| 117 |
#-------------------------------------------------------------------------------# |
| 118 |
# # |
| 119 |
-logfile = /usr/local/var/d2cs.log |
| 120 |
-charsavedir = /usr/local/var/charsave |
| 121 |
-charinfodir = /usr/local/var/charinfo |
| 122 |
-bak_charsavedir = /usr/local/var/bak/charsave |
| 123 |
-bak_charinfodir = /usr/local/var/bak/charinfo |
| 124 |
-ladderdir = /usr/local/var/ladders |
| 125 |
-newbiefile = /usr/local/var/files/newbie.save |
| 126 |
-transfile = /usr/local/etc/address_translation.conf |
| 127 |
-d2gsconffile = /usr/local/etc/d2server.ini |
| 128 |
-#pidfile = /usr/local/var/d2cs.pid |
| 129 |
+logfile = %logdir%/d2cs.log |
| 130 |
+charsavedir = %statedir%/charsave |
| 131 |
+charinfodir = %statedir%/charinfo |
| 132 |
+bak_charsavedir = %statedir%/bak/charsave |
| 133 |
+bak_charinfodir = %statedir%/bak/charinfo |
| 134 |
+ladderdir = %statedir%/ladders |
| 135 |
+newbiefile = %statedir%/files/newbie.save |
| 136 |
+transfile = %confdir%/address_translation.conf |
| 137 |
+d2gsconffile = %confdir%/d2server.ini |
| 138 |
+#pidfile = /var/run/bnetd/d2cs.pid |
| 139 |
|
| 140 |
# # |
| 141 |
################################################################################# |
| 142 |
diff -ruN pvpgn-1.8.0rc2.orig/conf/d2dbs.conf.in pvpgn-1.8.0rc2/conf/d2dbs.conf.in |
| 143 |
--- pvpgn-1.8.0rc2.orig/conf/d2dbs.conf.in 2005-08-24 23:58:18.000000000 -0400 |
| 144 |
+++ pvpgn-1.8.0rc2/conf/d2dbs.conf.in 2006-08-16 23:36:58.000000000 -0400 |
| 145 |
@@ -49,14 +49,14 @@ |
| 146 |
# File and Path section # |
| 147 |
# Use absolute paths in these lines to avoid problems! # |
| 148 |
#-------------------------------------------------------------------------------# |
| 149 |
-logfile = /usr/local/var/d2dbs.log |
| 150 |
-logfile-gs = /usr/local/var/d2dbs-gs.log |
| 151 |
-charsavedir = /usr/local/var/charsave |
| 152 |
-charinfodir = /usr/local/var/charinfo |
| 153 |
-ladderdir = /usr/local/var/ladders |
| 154 |
-bak_charsavedir = /usr/local/var/bak/charsave |
| 155 |
-bak_charinfodir = /usr/local/var/bak/charinfo |
| 156 |
-#pidfile = /usr/local/var/d2dbs.pid |
| 157 |
+logfile = %logdir%/d2dbs.log |
| 158 |
+logfile-gs = %logdir%/d2dbs-gs.log |
| 159 |
+charsavedir = %statedir%/charsave |
| 160 |
+charinfodir = %statedir%/charinfo |
| 161 |
+ladderdir = %statedir%/ladders |
| 162 |
+bak_charsavedir = %statedir%/bak/charsave |
| 163 |
+bak_charinfodir = %statedir%/bak/charinfo |
| 164 |
+#pidfile = /var/run/bnetd/d2dbs.pid |
| 165 |
|
| 166 |
# # |
| 167 |
################################################################################# |
| 168 |
|
| 169 |
diff -ruN pvpgn-1.8.0rc2.orig/src/Makefile.in pvpgn-1.8.0rc2/src/Makefile.in |
| 170 |
--- pvpgn-1.8.0rc2.orig/src/Makefile.in 2005-07-29 02:11:38.000000000 +0600 |
| 171 |
+++ pvpgn-1.8.0rc2/src/Makefile.in 2005-09-23 15:10:02.968342144 +0600 |
| 172 |
@@ -23,22 +23,23 @@ |
| 173 |
bindir = @bindir@ |
| 174 |
sbindir = @sbindir@ |
| 175 |
mandir = @mandir@ |
| 176 |
-confdir = @sysconfdir@ |
| 177 |
-sharedir = @localstatedir@ |
| 178 |
-filesdir = @localstatedir@/files |
| 179 |
-usersdir = @localstatedir@/users |
| 180 |
-userscdbdir = @localstatedir@/userscdb |
| 181 |
-clandir = @localstatedir@/clans |
| 182 |
-teamdir = @localstatedir@/teams |
| 183 |
-bnmaildir = @localstatedir@/bnmail |
| 184 |
-reportsdir = @localstatedir@/reports |
| 185 |
-chanlogsdir = @localstatedir@/chanlogs |
| 186 |
-charinfodir = @localstatedir@/charinfo |
| 187 |
-charsavedir = @localstatedir@/charsave |
| 188 |
-ladderdir = @localstatedir@/ladders |
| 189 |
-statusdir = @localstatedir@/status |
| 190 |
-bak_charsavedir = @localstatedir@/bak/charsave |
| 191 |
-bak_charinfodir = @localstatedir@/bak/charinfo |
| 192 |
+confdir = @sysconfdir@/pvpgn |
| 193 |
+statedir = @localstatedir@/pvpgn |
| 194 |
+filesdir = @datadir@/pvpgn |
| 195 |
+usersdir = @localstatedir@/pvpgn/users |
| 196 |
+userscdbdir = @localstatedir@/pvpgn/userscdb |
| 197 |
+clandir = @localstatedir@/pvpgn/clans |
| 198 |
+bnmaildir = @localstatedir@/pvpgn/bnmail |
| 199 |
+reportsdir = @localstatedir@/pvpgn/reports |
| 200 |
+chanlogsdir = @localstatedir@/pvpgn/chanlogs |
| 201 |
+charinfodir = @localstatedir@/pvpgn/charinfo |
| 202 |
+charsavedir = @localstatedir@/pvpgn/charsave |
| 203 |
+ladderdir = @localstatedir@/pvpgn/ladders |
| 204 |
+statusdir = @localstatedir@/pvpgn/status |
| 205 |
+bak_charsavedir = @localstatedir@/pvpgn/bak/charsave |
| 206 |
+bak_charinfodir = @localstatedir@/pvpgn/bak/charinfo |
| 207 |
+logdir = @localstatedir@/pvpgn/log |
| 208 |
+ |
| 209 |
|
| 210 |
SRC_SRCDIR = @srcdir@ |
| 211 |
SRC_BINDIR = @srcdir@/../bin |
| 212 |
@@ -677,7 +678,8 @@ |
| 213 |
|
| 214 |
.PHONY: install-share |
| 215 |
install-share: |
| 216 |
- ${INSTALL_DIRS} ${DESTDIR}/${sharedir} ${DESTDIR}/${filesdir} ${DESTDIR}/${usersdir} ${DESTDIR}/${userscdbdir} ${DESTDIR}/${bnmaildir} ${DESTDIR}/${reportsdir} \ |
| 217 |
+ ${INSTALL_DIRS} ${DESTDIR}/${datadir} ${DESTDIR}/${statedir} \ |
| 218 |
+ ${DESTDIR}/${filesdir} ${DESTDIR}/${usersdir} ${DESTDIR}/${userscdbdir} ${DESTDIR}/${bnmaildir} ${DESTDIR}/${reportsdir} \ |
| 219 |
${DESTDIR}/${chanlogsdir} ${DESTDIR}/${charinfodir} ${DESTDIR}/${charsavedir} ${DESTDIR}/${bak_charsavedir} \ |
| 220 |
${DESTDIR}/${bak_charinfodir} ${DESTDIR}/${ladderdir} ${DESTDIR}/${statusdir} \ |
| 221 |
${DESTDIR}/${clandir} ${DESTDIR}/${teamdir} |
| 222 |
@@ -728,21 +730,21 @@ |
| 223 |
.PHONY: uninstall-share |
| 224 |
uninstall-share: |
| 225 |
@list='${SHARES}'; for p in $$list; do \ |
| 226 |
- ${ECHO} " ${RMF} ${sharedir}/$$p"; \ |
| 227 |
- ${RMF} ${sharedir}/$$p; \ |
| 228 |
+ ${ECHO} " ${RMF} ${filesdir}/$$p"; \ |
| 229 |
+ ${RMF} ${filesdir}/$$p; \ |
| 230 |
done |
| 231 |
|
| 232 |
${SRC_CONFDIR}/bnetd.conf: ${SRC_CONFDIR}/bnetd.conf.in ${SRC_SRCDIR}/config.status |
| 233 |
@${RMF} $@ |
| 234 |
- ${SED} -e "s@/usr/local/var/@${sharedir}/@g" -e "s@/usr/local/etc/@${confdir}/@g" ${SRC_CONFDIR}/bnetd.conf.in > $@ |
| 235 |
+ ${SED} -e "s@%datadir%@${filesdir}/@g" -e "s@%confdir%@${confdir}/@g" -e "s@%statedir%@${statedir}@g" -e "s@%logdir%@${logdir}@g" ${SRC_CONFDIR}/bnetd.conf.in > $@ |
| 236 |
|
| 237 |
${SRC_CONFDIR}/d2cs.conf: ${SRC_CONFDIR}/d2cs.conf.in ${SRC_SRCDIR}/config.status |
| 238 |
@${RMF} $@ |
| 239 |
- ${SED} -e "s@/usr/local/var/@${sharedir}/@g" -e "s@/usr/local/etc/@${confdir}/@g" ${SRC_CONFDIR}/d2cs.conf.in > $@ |
| 240 |
+ ${SED} -e "s@%datadir%@${filesdir}/@g" -e "s@%confdir%@${confdir}/@g" -e "s@%statedir%@${statedir}@g" -e "s@%logdir%@${logdir}@g" ${SRC_CONFDIR}/d2cs.conf.in > $@ |
| 241 |
|
| 242 |
${SRC_CONFDIR}/d2dbs.conf: ${SRC_CONFDIR}/d2dbs.conf.in ${SRC_SRCDIR}/config.status |
| 243 |
@${RMF} $@ |
| 244 |
- ${SED} -e "s@/usr/local/var/@${sharedir}/@g" -e "s@/usr/local/etc/@${confdir}/@g" ${SRC_CONFDIR}/d2dbs.conf.in > $@ |
| 245 |
+ ${SED} -e "s@%datadir%@${filesdir}/@g" -e "s@%confdir%@${confdir}/@g" -e "s@%statedir%@${statedir}@g" -e "s@%logdir%@${logdir}@g" ${SRC_CONFDIR}/d2dbs.conf.in > $@ |
| 246 |
|
| 247 |
${SRC_ACDIR}/ansi2knr: ${SRC_ACDIR}/ansi2knr.o |
| 248 |
@${RMF} $@ |
Archives