Date: Sun, 6 Jun 2010 12:15:49 GMT From: Mikhail Tsatsenko <m.tsatsenko@mail.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/147559: [PATCH] upgrade games/freeciv to recent version Message-ID: <201006061215.o56CFnve015932@www.freebsd.org> Resent-Message-ID: <201006061220.o56CK8Eu077222@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 147559
>Category: ports
>Synopsis: [PATCH] upgrade games/freeciv to recent version
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Jun 06 12:20:07 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Mikhail Tsatsenko
>Release: 8-STABLE
>Organization:
>Environment:
FreeBSD fobos 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #0 r208635: Sat May 29 13:21:17 MSD 2010 root@fobos:/usr/obj/usr/src/sys/DM i386
>Description:
1. Update to latest upstream version.
2. Remove unneeded CFLAGS/CXXFLAGS in CONFIGURE_ENV
3. Add WITHOUT_NLS knob
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Files freeciv.orig/.Makefile.swp and freeciv/.Makefile.swp differ
diff -uNr freeciv.orig/Makefile freeciv/Makefile
--- freeciv.orig/Makefile 2010-06-06 14:24:55.000000000 +0400
+++ freeciv/Makefile 2010-06-06 15:54:40.000000000 +0400
@@ -6,10 +6,9 @@
#
PORTNAME= freeciv
-PORTVERSION= 2.1.11
-PORTREVISION= 3
+PORTVERSION= 2.2.1
CATEGORIES= games
-MASTER_SITES= SF/freeciv/Freeciv%202.1/${PORTVERSION}
+MASTER_SITES= SF/freeciv/Freeciv%202.2/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Free turn-based multiplayer strategy
@@ -21,16 +20,12 @@
USE_BZIP2= yes
USE_PYTHON= yes
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-CFLAGS+= -I${LOCALBASE}/include
LDFLAGS= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --with-libiconv-prefix=${PREFIX} --program-transform-name=
INSTALLS_ICONS= yes
PORT_VERBS= civ
-MAN6= civserver.6 civclient.6
-
.ifndef WITHOUT_X11
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
png.6:${PORTSDIR}/graphics/png \
@@ -64,6 +59,10 @@
CONFIGURE_ARGS+= --disable-auth
.endif
+.ifdef WITHOUT_NLS
+CONFIGURE_ARGS+=--disable-nls
+.endif
+
post-patch:
@${REINPLACE_CMD} -e '/test.*==/s|==|=|;\
/^LIBS/s|mixer|mixer $$SDL_LIBS|g' ${WRKSRC}/configure
diff -uNr freeciv.orig/distinfo freeciv/distinfo
--- freeciv.orig/distinfo 2010-06-06 14:24:55.000000000 +0400
+++ freeciv/distinfo 2010-06-06 14:30:33.000000000 +0400
@@ -1,3 +1,3 @@
-MD5 (freeciv-2.1.11.tar.bz2) = b064e5949d211a46a9d6d050f3c98959
-SHA256 (freeciv-2.1.11.tar.bz2) = f52fb8318cf121b74da04d5279c24d2045d829718c67cc21cb62439f50754707
-SIZE (freeciv-2.1.11.tar.bz2) = 29884418
+MD5 (freeciv-2.2.1.tar.bz2) = b43269e38ecd32cb09850778befc72b3
+SHA256 (freeciv-2.2.1.tar.bz2) = cecf98af004fa49e5fc8b3e4447eefbad27e237377e4c9add2e9da60da53cb31
+SIZE (freeciv-2.2.1.tar.bz2) = 33400493
diff -uNr freeciv.orig/pkg-plist freeciv/pkg-plist
--- freeciv.orig/pkg-plist 2010-06-06 14:24:55.000000000 +0400
+++ freeciv/pkg-plist 2010-06-06 16:00:28.000000000 +0400
@@ -1,8 +1,9 @@
-bin/civclient
bin/civmanual
-bin/civserver
+bin/freeciv-gtk2
+bin/freeciv-server
share/applications/freeciv-server.desktop
share/applications/freeciv.desktop
+%%DATADIR%%/gtk_menus.xml
%%DATADIR%%/amplio/ancientcities.png
%%DATADIR%%/amplio/ancientcities.spec
%%DATADIR%%/amplio/buildings.spec
@@ -21,6 +22,8 @@
%%DATADIR%%/amplio/moderncities.spec
%%DATADIR%%/amplio/nuke.png
%%DATADIR%%/amplio/nuke.spec
+%%DATADIR%%/amplio/ocean.png
+%%DATADIR%%/amplio/ocean.spec
%%DATADIR%%/amplio/select-alpha.png
%%DATADIR%%/amplio/select.png
%%DATADIR%%/amplio/select.spec
@@ -32,6 +35,8 @@
%%DATADIR%%/amplio/tiles.spec
%%DATADIR%%/amplio/units.png
%%DATADIR%%/amplio/units.spec
+%%DATADIR%%/amplio/water.png
+%%DATADIR%%/amplio/water.spec
%%DATADIR%%/amplio/wonders.spec
%%DATADIR%%/amplio.tilespec
%%DATADIR%%/buildings/airport.png
@@ -95,8 +100,10 @@
@unexec ggz-config --remove --modfile %D/%%DATADIR%%/civclient.dsc
%%DATADIR%%/civclient.dsc
@exec ggz-config --install --modfile %D/%%DATADIR%%/civclient.dsc
+%%DATADIR%%/default/ai_effects.ruleset
%%DATADIR%%/default/buildings.ruleset
%%DATADIR%%/default/cities.ruleset
+%%DATADIR%%/default/default.lua
%%DATADIR%%/default/effects.ruleset
%%DATADIR%%/default/game.ruleset
%%DATADIR%%/default/governments.ruleset
@@ -110,6 +117,10 @@
%%DATADIR%%/flags/aborigines.png
%%DATADIR%%/flags/afghanistan-shield.png
%%DATADIR%%/flags/afghanistan.png
+%%DATADIR%%/flags/ainu-shield.png
+%%DATADIR%%/flags/ainu.png
+%%DATADIR%%/flags/akwe-shield.png
+%%DATADIR%%/flags/akwe.png
%%DATADIR%%/flags/algeria-shield.png
%%DATADIR%%/flags/algeria.png
%%DATADIR%%/flags/antarctica-shield.png
@@ -128,6 +139,8 @@
%%DATADIR%%/flags/australia.png
%%DATADIR%%/flags/austria-shield.png
%%DATADIR%%/flags/austria.png
+%%DATADIR%%/flags/aymara-shield.png
+%%DATADIR%%/flags/aymara.png
%%DATADIR%%/flags/azerbaijan-shield.png
%%DATADIR%%/flags/azerbaijan.png
%%DATADIR%%/flags/aztec-shield.png
@@ -140,6 +153,8 @@
%%DATADIR%%/flags/barbarian.png
%%DATADIR%%/flags/bavarian-shield.png
%%DATADIR%%/flags/bavarian.png
+%%DATADIR%%/flags/belarus-shield.png
+%%DATADIR%%/flags/belarus.png
%%DATADIR%%/flags/belgium-shield.png
%%DATADIR%%/flags/belgium.png
%%DATADIR%%/flags/boer-shield.png
@@ -148,8 +163,14 @@
%%DATADIR%%/flags/bosnia.png
%%DATADIR%%/flags/brasil-shield.png
%%DATADIR%%/flags/brasil.png
+%%DATADIR%%/flags/brittany-shield.png
+%%DATADIR%%/flags/brittany.png
%%DATADIR%%/flags/bulgaria-shield.png
%%DATADIR%%/flags/bulgaria.png
+%%DATADIR%%/flags/burgundy-shield.png
+%%DATADIR%%/flags/burgundy.png
+%%DATADIR%%/flags/burundi-shield.png
+%%DATADIR%%/flags/burundi.png
%%DATADIR%%/flags/byzantium-shield.png
%%DATADIR%%/flags/byzantium.png
%%DATADIR%%/flags/canada-shield.png
@@ -164,6 +185,8 @@
%%DATADIR%%/flags/chile.png
%%DATADIR%%/flags/china-shield.png
%%DATADIR%%/flags/china.png
+%%DATADIR%%/flags/chola-shield.png
+%%DATADIR%%/flags/chola.png
%%DATADIR%%/flags/colombia-shield.png
%%DATADIR%%/flags/colombia.png
%%DATADIR%%/flags/constantine-shield.png
@@ -178,18 +201,24 @@
%%DATADIR%%/flags/czech.png
%%DATADIR%%/flags/denmark-shield.png
%%DATADIR%%/flags/denmark.png
+%%DATADIR%%/flags/dominica-shield.png
+%%DATADIR%%/flags/dominica.png
%%DATADIR%%/flags/egypt-shield.png
%%DATADIR%%/flags/egypt.png
%%DATADIR%%/flags/egypt_ancient-shield.png
%%DATADIR%%/flags/egypt_ancient.png
%%DATADIR%%/flags/england-shield.png
%%DATADIR%%/flags/england.png
+%%DATADIR%%/flags/esperanto-shield.png
+%%DATADIR%%/flags/esperanto.png
%%DATADIR%%/flags/estonia-shield.png
%%DATADIR%%/flags/estonia.png
%%DATADIR%%/flags/ethiopia-shield.png
%%DATADIR%%/flags/ethiopia.png
%%DATADIR%%/flags/europe-shield.png
%%DATADIR%%/flags/europe.png
+%%DATADIR%%/flags/euskadi-shield.png
+%%DATADIR%%/flags/euskadi.png
%%DATADIR%%/flags/finland-shield.png
%%DATADIR%%/flags/finland.png
%%DATADIR%%/flags/france-shield.png
@@ -210,8 +239,18 @@
%%DATADIR%%/flags/greece_ancient.png
%%DATADIR%%/flags/greenland-shield.png
%%DATADIR%%/flags/greenland.png
+%%DATADIR%%/flags/gupta-shield.png
+%%DATADIR%%/flags/gupta.png
+%%DATADIR%%/flags/hacker-shield.png
+%%DATADIR%%/flags/hacker.png
+%%DATADIR%%/flags/hawaii-shield.png
+%%DATADIR%%/flags/hawaii.png
+%%DATADIR%%/flags/himyar-shield.png
+%%DATADIR%%/flags/himyar.png
%%DATADIR%%/flags/hittite-shield.png
%%DATADIR%%/flags/hittite.png
+%%DATADIR%%/flags/hopi-shield.png
+%%DATADIR%%/flags/hopi.png
%%DATADIR%%/flags/hungary-shield.png
%%DATADIR%%/flags/hungary.png
%%DATADIR%%/flags/iceland-shield.png
@@ -224,6 +263,8 @@
%%DATADIR%%/flags/india.png
%%DATADIR%%/flags/indonesia-shield.png
%%DATADIR%%/flags/indonesia.png
+%%DATADIR%%/flags/innu-shield.png
+%%DATADIR%%/flags/innu.png
%%DATADIR%%/flags/iran-shield.png
%%DATADIR%%/flags/iran.png
%%DATADIR%%/flags/iran_ancient-shield.png
@@ -242,12 +283,32 @@
%%DATADIR%%/flags/italy.png
%%DATADIR%%/flags/japan-shield.png
%%DATADIR%%/flags/japan.png
+%%DATADIR%%/flags/jbonai-shield.png
+%%DATADIR%%/flags/jbonai.png
%%DATADIR%%/flags/kampuchea-shield.png
%%DATADIR%%/flags/kampuchea.png
+%%DATADIR%%/flags/kanem-bornu-shield.png
+%%DATADIR%%/flags/kanem-bornu.png
+%%DATADIR%%/flags/kazakhstan-shield.png
+%%DATADIR%%/flags/kazakhstan.png
+%%DATADIR%%/flags/keetoowah-shield.png
+%%DATADIR%%/flags/keetoowah.png
%%DATADIR%%/flags/kenya-shield.png
%%DATADIR%%/flags/kenya.png
+%%DATADIR%%/flags/khwarezm-shield.png
+%%DATADIR%%/flags/khwarezm.png
+%%DATADIR%%/flags/kongo-shield.png
+%%DATADIR%%/flags/kongo.png
%%DATADIR%%/flags/korea-shield.png
%%DATADIR%%/flags/korea.png
+%%DATADIR%%/flags/korea_ancient-shield.png
+%%DATADIR%%/flags/korea_ancient.png
+%%DATADIR%%/flags/kurd-shield.png
+%%DATADIR%%/flags/kurd.png
+%%DATADIR%%/flags/kyrgyzstan-shield.png
+%%DATADIR%%/flags/kyrgyzstan.png
+%%DATADIR%%/flags/laos-shield.png
+%%DATADIR%%/flags/laos.png
%%DATADIR%%/flags/latvia-shield.png
%%DATADIR%%/flags/latvia.png
%%DATADIR%%/flags/libya-shield.png
@@ -258,20 +319,28 @@
%%DATADIR%%/flags/macedonia.png
%%DATADIR%%/flags/madagascar-shield.png
%%DATADIR%%/flags/madagascar.png
+%%DATADIR%%/flags/majapahit-shield.png
+%%DATADIR%%/flags/majapahit.png
%%DATADIR%%/flags/malaysia-shield.png
%%DATADIR%%/flags/malaysia.png
%%DATADIR%%/flags/mali-shield.png
%%DATADIR%%/flags/mali.png
%%DATADIR%%/flags/maori-shield.png
%%DATADIR%%/flags/maori.png
+%%DATADIR%%/flags/mapuche-shield.png
+%%DATADIR%%/flags/mapuche.png
%%DATADIR%%/flags/mars-shield.png
%%DATADIR%%/flags/mars.png
%%DATADIR%%/flags/maya-shield.png
%%DATADIR%%/flags/maya.png
%%DATADIR%%/flags/mexico-shield.png
%%DATADIR%%/flags/mexico.png
+%%DATADIR%%/flags/moldova-shield.png
+%%DATADIR%%/flags/moldova.png
%%DATADIR%%/flags/mongolia-shield.png
%%DATADIR%%/flags/mongolia.png
+%%DATADIR%%/flags/muskogee-shield.png
+%%DATADIR%%/flags/muskogee.png
%%DATADIR%%/flags/myanmar-shield.png
%%DATADIR%%/flags/myanmar.png
%%DATADIR%%/flags/nato-shield.png
@@ -282,10 +351,18 @@
%%DATADIR%%/flags/newzealand.png
%%DATADIR%%/flags/nigeria-shield.png
%%DATADIR%%/flags/nigeria.png
+%%DATADIR%%/flags/normandy-shield.png
+%%DATADIR%%/flags/normandy.png
+%%DATADIR%%/flags/north_korea-shield.png
+%%DATADIR%%/flags/north_korea.png
%%DATADIR%%/flags/norway-shield.png
%%DATADIR%%/flags/norway.png
-%%DATADIR%%/flags/observer-shield.png
-%%DATADIR%%/flags/observer.png
+%%DATADIR%%/flags/nubia-shield.png
+%%DATADIR%%/flags/nubia.png
+%%DATADIR%%/flags/numidia-shield.png
+%%DATADIR%%/flags/numidia.png
+%%DATADIR%%/flags/nuu-chah-nulth-shield.png
+%%DATADIR%%/flags/nuu-chah-nulth.png
%%DATADIR%%/flags/ottoman-shield.png
%%DATADIR%%/flags/ottoman.png
%%DATADIR%%/flags/pakistan-shield.png
@@ -300,10 +377,18 @@
%%DATADIR%%/flags/philippines.png
%%DATADIR%%/flags/phoenicia-shield.png
%%DATADIR%%/flags/phoenicia.png
+%%DATADIR%%/flags/pirate-shield.png
+%%DATADIR%%/flags/pirate.png
%%DATADIR%%/flags/poland-shield.png
%%DATADIR%%/flags/poland.png
+%%DATADIR%%/flags/polynesian-shield.png
+%%DATADIR%%/flags/polynesian.png
%%DATADIR%%/flags/portugal-shield.png
%%DATADIR%%/flags/portugal.png
+%%DATADIR%%/flags/prussia-shield.png
+%%DATADIR%%/flags/prussia.png
+%%DATADIR%%/flags/purhepecha-shield.png
+%%DATADIR%%/flags/purhepecha.png
%%DATADIR%%/flags/qing-shield.png
%%DATADIR%%/flags/qing.png
%%DATADIR%%/flags/quebec-shield.png
@@ -318,8 +403,12 @@
%%DATADIR%%/flags/rwanda.png
%%DATADIR%%/flags/ryukyu-shield.png
%%DATADIR%%/flags/ryukyu.png
+%%DATADIR%%/flags/samogitia-shield.png
+%%DATADIR%%/flags/samogitia.png
%%DATADIR%%/flags/sapmi-shield.png
%%DATADIR%%/flags/sapmi.png
+%%DATADIR%%/flags/saxony-shield.png
+%%DATADIR%%/flags/saxony.png
%%DATADIR%%/flags/scotland-shield.png
%%DATADIR%%/flags/scotland.png
%%DATADIR%%/flags/serbia-shield.png
@@ -342,6 +431,8 @@
%%DATADIR%%/flags/spain.png
%%DATADIR%%/flags/srilanka-shield.png
%%DATADIR%%/flags/srilanka.png
+%%DATADIR%%/flags/srivijaya-shield.png
+%%DATADIR%%/flags/srivijaya.png
%%DATADIR%%/flags/stpatrick-shield.png
%%DATADIR%%/flags/stpatrick.png
%%DATADIR%%/flags/sudan-shield.png
@@ -356,18 +447,36 @@
%%DATADIR%%/flags/swiss.png
%%DATADIR%%/flags/syria-shield.png
%%DATADIR%%/flags/syria.png
+%%DATADIR%%/flags/taino-shield.png
+%%DATADIR%%/flags/taino.png
+%%DATADIR%%/flags/tairona-shield.png
+%%DATADIR%%/flags/tairona.png
%%DATADIR%%/flags/taiwan-shield.png
%%DATADIR%%/flags/taiwan.png
+%%DATADIR%%/flags/tajikistan-shield.png
+%%DATADIR%%/flags/tajikistan.png
+%%DATADIR%%/flags/templar-shield.png
+%%DATADIR%%/flags/templar.png
%%DATADIR%%/flags/texas-shield.png
%%DATADIR%%/flags/texas.png
%%DATADIR%%/flags/thailand-shield.png
%%DATADIR%%/flags/thailand.png
+%%DATADIR%%/flags/thrace-shield.png
+%%DATADIR%%/flags/thrace.png
%%DATADIR%%/flags/tibet-shield.png
%%DATADIR%%/flags/tibet.png
+%%DATADIR%%/flags/tocharian-shield.png
+%%DATADIR%%/flags/tocharian.png
%%DATADIR%%/flags/tunisia-shield.png
%%DATADIR%%/flags/tunisia.png
+%%DATADIR%%/flags/tupi-shield.png
+%%DATADIR%%/flags/tupi.png
%%DATADIR%%/flags/turkey-shield.png
%%DATADIR%%/flags/turkey.png
+%%DATADIR%%/flags/turkmenistan-shield.png
+%%DATADIR%%/flags/turkmenistan.png
+%%DATADIR%%/flags/uae-shield.png
+%%DATADIR%%/flags/uae.png
%%DATADIR%%/flags/ukraine-shield.png
%%DATADIR%%/flags/ukraine.png
%%DATADIR%%/flags/united_kingdom-shield.png
@@ -376,10 +485,14 @@
%%DATADIR%%/flags/united_nations.png
%%DATADIR%%/flags/unknown-shield.png
%%DATADIR%%/flags/unknown.png
+%%DATADIR%%/flags/uruguay-shield.png
+%%DATADIR%%/flags/uruguay.png
%%DATADIR%%/flags/usa-shield.png
%%DATADIR%%/flags/usa.png
%%DATADIR%%/flags/uyghur-shield.png
%%DATADIR%%/flags/uyghur.png
+%%DATADIR%%/flags/uzbekistan-shield.png
+%%DATADIR%%/flags/uzbekistan.png
%%DATADIR%%/flags/venezuela-shield.png
%%DATADIR%%/flags/venezuela.png
%%DATADIR%%/flags/vietnam-shield.png
@@ -418,6 +531,8 @@
%%DATADIR%%/isophex/terrain2.spec
%%DATADIR%%/isophex/tiles.png
%%DATADIR%%/isophex/tiles.spec
+%%DATADIR%%/isophex/water.png
+%%DATADIR%%/isophex/water.spec
%%DATADIR%%/isophex.tilespec
%%DATADIR%%/isotrident/cities.png
%%DATADIR%%/isotrident/cities.spec
@@ -439,6 +554,8 @@
%%DATADIR%%/isotrident/tiles.spec
%%DATADIR%%/isotrident/unitextras.png
%%DATADIR%%/isotrident/unitextras.spec
+%%DATADIR%%/isotrident/water.png
+%%DATADIR%%/isotrident/water.spec
%%DATADIR%%/isotrident.tilespec
%%DATADIR%%/misc/buildings.png
%%DATADIR%%/misc/buildings.spec
@@ -453,6 +570,8 @@
%%DATADIR%%/misc/colors.tilespec
%%DATADIR%%/misc/cursors.png
%%DATADIR%%/misc/cursors.spec
+%%DATADIR%%/misc/editor.png
+%%DATADIR%%/misc/editor.spec
%%DATADIR%%/misc/flags.spec
%%DATADIR%%/misc/icons.spec
%%DATADIR%%/misc/intro.png
@@ -470,6 +589,8 @@
%%DATADIR%%/misc/treaty.spec
%%DATADIR%%/nation/aborigines.ruleset
%%DATADIR%%/nation/afghani.ruleset
+%%DATADIR%%/nation/ainu.ruleset
+%%DATADIR%%/nation/akwe.ruleset
%%DATADIR%%/nation/algerian.ruleset
%%DATADIR%%/nation/american.ruleset
%%DATADIR%%/nation/antarctican.ruleset
@@ -480,36 +601,51 @@
%%DATADIR%%/nation/assyrian.ruleset
%%DATADIR%%/nation/australian.ruleset
%%DATADIR%%/nation/austrian.ruleset
+%%DATADIR%%/nation/aymara.ruleset
+%%DATADIR%%/nation/azeri.ruleset
%%DATADIR%%/nation/aztec.ruleset
%%DATADIR%%/nation/babylonian.ruleset
%%DATADIR%%/nation/barbarian.ruleset
+%%DATADIR%%/nation/basque.ruleset
%%DATADIR%%/nation/bavarian.ruleset
+%%DATADIR%%/nation/belarusian.ruleset
%%DATADIR%%/nation/belgian.ruleset
%%DATADIR%%/nation/bengali.ruleset
%%DATADIR%%/nation/boer.ruleset
%%DATADIR%%/nation/bosnia.ruleset
%%DATADIR%%/nation/brazilian.ruleset
+%%DATADIR%%/nation/breton.ruleset
%%DATADIR%%/nation/british.ruleset
%%DATADIR%%/nation/bulgarian.ruleset
+%%DATADIR%%/nation/burgundian.ruleset
%%DATADIR%%/nation/burmese.ruleset
+%%DATADIR%%/nation/burundi.ruleset
%%DATADIR%%/nation/byzantium.ruleset
+%%DATADIR%%/nation/cambodian.ruleset
%%DATADIR%%/nation/canadian.ruleset
%%DATADIR%%/nation/carthaginian.ruleset
%%DATADIR%%/nation/catalan.ruleset
+%%DATADIR%%/nation/cherokee.ruleset
%%DATADIR%%/nation/chilean.ruleset
%%DATADIR%%/nation/chinese.ruleset
+%%DATADIR%%/nation/chola.ruleset
%%DATADIR%%/nation/colombian.ruleset
%%DATADIR%%/nation/confederate.ruleset
%%DATADIR%%/nation/cornish.ruleset
+%%DATADIR%%/nation/cree.ruleset
%%DATADIR%%/nation/croatian.ruleset
%%DATADIR%%/nation/cuban.ruleset
%%DATADIR%%/nation/czech.ruleset
%%DATADIR%%/nation/danish.ruleset
+%%DATADIR%%/nation/dominican.ruleset
%%DATADIR%%/nation/dutch.ruleset
%%DATADIR%%/nation/egyptian.ruleset
+%%DATADIR%%/nation/emirati.ruleset
%%DATADIR%%/nation/english.ruleset
+%%DATADIR%%/nation/esperant.ruleset
%%DATADIR%%/nation/estonian.ruleset
%%DATADIR%%/nation/ethiopian.ruleset
+%%DATADIR%%/nation/european.ruleset
%%DATADIR%%/nation/filipino.ruleset
%%DATADIR%%/nation/finnish.ruleset
%%DATADIR%%/nation/french.ruleset
@@ -518,8 +654,13 @@
%%DATADIR%%/nation/georgian.ruleset
%%DATADIR%%/nation/german.ruleset
%%DATADIR%%/nation/greek.ruleset
+%%DATADIR%%/nation/gupta.ruleset
+%%DATADIR%%/nation/hacker.ruleset
+%%DATADIR%%/nation/hawaiian.ruleset
%%DATADIR%%/nation/hellenic.ruleset
+%%DATADIR%%/nation/himyarite.ruleset
%%DATADIR%%/nation/hittite.ruleset
+%%DATADIR%%/nation/hopi.ruleset
%%DATADIR%%/nation/hungarian.ruleset
%%DATADIR%%/nation/icelandic.ruleset
%%DATADIR%%/nation/illyrian.ruleset
@@ -527,43 +668,69 @@
%%DATADIR%%/nation/indian.ruleset
%%DATADIR%%/nation/indonesian.ruleset
%%DATADIR%%/nation/inuit.ruleset
+%%DATADIR%%/nation/iranian.ruleset
%%DATADIR%%/nation/iraqi.ruleset
%%DATADIR%%/nation/irish.ruleset
%%DATADIR%%/nation/iroquois.ruleset
%%DATADIR%%/nation/israeli.ruleset
%%DATADIR%%/nation/italian.ruleset
%%DATADIR%%/nation/japanese.ruleset
-%%DATADIR%%/nation/kampuchean.ruleset
+%%DATADIR%%/nation/kanem-bornu.ruleset
+%%DATADIR%%/nation/kazakh.ruleset
%%DATADIR%%/nation/kenyan.ruleset
+%%DATADIR%%/nation/khwarezmian.ruleset
+%%DATADIR%%/nation/kongo.ruleset
%%DATADIR%%/nation/korean.ruleset
+%%DATADIR%%/nation/kurd.ruleset
+%%DATADIR%%/nation/kyrgyz.ruleset
%%DATADIR%%/nation/lankese.ruleset
+%%DATADIR%%/nation/laotian.ruleset
%%DATADIR%%/nation/latvian.ruleset
%%DATADIR%%/nation/libyan.ruleset
%%DATADIR%%/nation/lithuanian.ruleset
+%%DATADIR%%/nation/lojbanistani.ruleset
+%%DATADIR%%/nation/majapahit.ruleset
%%DATADIR%%/nation/malagasy.ruleset
%%DATADIR%%/nation/malaysian.ruleset
%%DATADIR%%/nation/malian.ruleset
%%DATADIR%%/nation/manchu.ruleset
%%DATADIR%%/nation/maori.ruleset
+%%DATADIR%%/nation/mapuche.ruleset
%%DATADIR%%/nation/martian.ruleset
%%DATADIR%%/nation/mayan.ruleset
%%DATADIR%%/nation/mexican.ruleset
+%%DATADIR%%/nation/moldovan.ruleset
%%DATADIR%%/nation/mongol.ruleset
+%%DATADIR%%/nation/muskogee.ruleset
%%DATADIR%%/nation/newzealand.ruleset
%%DATADIR%%/nation/nigerian.ruleset
+%%DATADIR%%/nation/norman.ruleset
+%%DATADIR%%/nation/northkorean.ruleset
%%DATADIR%%/nation/norwegian.ruleset
+%%DATADIR%%/nation/nubian.ruleset
+%%DATADIR%%/nation/numidian.ruleset
+%%DATADIR%%/nation/nuu-chah-nulth.ruleset
%%DATADIR%%/nation/ottoman.ruleset
+%%DATADIR%%/nation/pakistani.ruleset
%%DATADIR%%/nation/papuan.ruleset
%%DATADIR%%/nation/persian.ruleset
+%%DATADIR%%/nation/peruvian.ruleset
%%DATADIR%%/nation/phoenician.ruleset
+%%DATADIR%%/nation/pirate.ruleset
%%DATADIR%%/nation/polish.ruleset
+%%DATADIR%%/nation/polynesian.ruleset
%%DATADIR%%/nation/portuguese.ruleset
+%%DATADIR%%/nation/prussian.ruleset
+%%DATADIR%%/nation/purhepecha.ruleset
%%DATADIR%%/nation/quebecois.ruleset
%%DATADIR%%/nation/roman.ruleset
%%DATADIR%%/nation/romanian.ruleset
%%DATADIR%%/nation/russian.ruleset
+%%DATADIR%%/nation/rwandan.ruleset
%%DATADIR%%/nation/ryukyuan.ruleset
%%DATADIR%%/nation/sami.ruleset
+%%DATADIR%%/nation/samogitian.ruleset
+%%DATADIR%%/nation/saxon.ruleset
%%DATADIR%%/nation/scottish.ruleset
%%DATADIR%%/nation/serbian.ruleset
%%DATADIR%%/nation/silesian.ruleset
@@ -572,21 +739,35 @@
%%DATADIR%%/nation/slovakian.ruleset
%%DATADIR%%/nation/slovenian.ruleset
%%DATADIR%%/nation/southafrican.ruleset
+%%DATADIR%%/nation/southkorean.ruleset
%%DATADIR%%/nation/soviet.ruleset
%%DATADIR%%/nation/spanish.ruleset
+%%DATADIR%%/nation/srivijaya.ruleset
%%DATADIR%%/nation/sudanese.ruleset
%%DATADIR%%/nation/sumerian.ruleset
%%DATADIR%%/nation/swazi.ruleset
%%DATADIR%%/nation/swedish.ruleset
%%DATADIR%%/nation/swiss.ruleset
+%%DATADIR%%/nation/syrian.ruleset
+%%DATADIR%%/nation/taino.ruleset
+%%DATADIR%%/nation/tairona.ruleset
%%DATADIR%%/nation/taiwanese.ruleset
+%%DATADIR%%/nation/tajik.ruleset
+%%DATADIR%%/nation/templar.ruleset
%%DATADIR%%/nation/texan.ruleset
%%DATADIR%%/nation/thai.ruleset
+%%DATADIR%%/nation/thracian.ruleset
%%DATADIR%%/nation/tibetan.ruleset
+%%DATADIR%%/nation/tocharian.ruleset
%%DATADIR%%/nation/tunisian.ruleset
+%%DATADIR%%/nation/tupi.ruleset
%%DATADIR%%/nation/turk.ruleset
+%%DATADIR%%/nation/turkmen.ruleset
%%DATADIR%%/nation/ukrainian.ruleset
+%%DATADIR%%/nation/un.ruleset
+%%DATADIR%%/nation/uruguayan.ruleset
%%DATADIR%%/nation/uyghur.ruleset
+%%DATADIR%%/nation/uzbek.ruleset
%%DATADIR%%/nation/venezuelan.ruleset
%%DATADIR%%/nation/vietnamese.ruleset
%%DATADIR%%/nation/viking.ruleset
@@ -597,8 +778,12 @@
%%DATADIR%%/scenario/earth-160x90-v2.sav.gz
%%DATADIR%%/scenario/earth-80x50-v2.sav.gz
%%DATADIR%%/scenario/europe-200x100-v2.sav.gz
+%%DATADIR%%/scenario/france-140x90-v2.sav.gz
%%DATADIR%%/scenario/hagworld-120x60-v1.2.sav.gz
%%DATADIR%%/scenario/iberian-peninsula-136x100-v1.0.sav.gz
+%%DATADIR%%/scenario/italy-100x100-v1.5.sav.gz
+%%DATADIR%%/scenario/japan-88x100-v1.3.sav.gz
+%%DATADIR%%/scenario/north_america_116x100-v1.2.sav.gz
%%DATADIR%%/scenario/tutorial.sav.gz
%%DATADIR%%/stdsounds/LrgCan.ogg
%%DATADIR%%/stdsounds/LrgExpl.ogg
@@ -731,10 +916,6 @@
%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/tab-top-active.png
%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/tab-top.png
%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/toolbar.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/toolbutton-normal.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/toolbutton-prelight.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/toolbutton-pressed.png
-%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/toolbutton-toggled.png
%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/bg.png
%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/gtkrc
%%DATADIR%%/themes/gui-gtk-2.0/Freeciv/gtk-2.0/menubar.rc
@@ -742,6 +923,8 @@
%%DATADIR%%/trident/auto_ll.spec
%%DATADIR%%/trident/cities.png
%%DATADIR%%/trident/cities.spec
+%%DATADIR%%/trident/earth.png
+%%DATADIR%%/trident/earth.spec
%%DATADIR%%/trident/explosions.png
%%DATADIR%%/trident/explosions.spec
%%DATADIR%%/trident/fog.png
diff -uNr freeciv.orig/pkg-plist.nox11 freeciv/pkg-plist.nox11
--- freeciv.orig/pkg-plist.nox11 2010-06-06 14:24:55.000000000 +0400
+++ freeciv/pkg-plist.nox11 2010-06-06 15:42:44.000000000 +0400
@@ -1,4 +1,3 @@
-bin/civserver
share/applications/freeciv-server.desktop
%%DATADIR%%/civ1/buildings.ruleset
%%DATADIR%%/civ1/effects.ruleset
@@ -18,8 +17,10 @@
%%DATADIR%%/civ2/terrain.ruleset
%%DATADIR%%/civ2/units.ruleset
%%DATADIR%%/civ2.serv
+%%DATADIR%%/default/ai_effects.ruleset
%%DATADIR%%/default/buildings.ruleset
%%DATADIR%%/default/cities.ruleset
+%%DATADIR%%/default/default.lua
%%DATADIR%%/default/effects.ruleset
%%DATADIR%%/default/game.ruleset
%%DATADIR%%/default/governments.ruleset
@@ -31,6 +32,8 @@
%%DATADIR%%/default.serv
%%DATADIR%%/nation/aborigines.ruleset
%%DATADIR%%/nation/afghani.ruleset
+%%DATADIR%%/nation/ainu.ruleset
+%%DATADIR%%/nation/akwe.ruleset
%%DATADIR%%/nation/algerian.ruleset
%%DATADIR%%/nation/american.ruleset
%%DATADIR%%/nation/antarctican.ruleset
@@ -41,36 +44,51 @@
%%DATADIR%%/nation/assyrian.ruleset
%%DATADIR%%/nation/australian.ruleset
%%DATADIR%%/nation/austrian.ruleset
+%%DATADIR%%/nation/aymara.ruleset
+%%DATADIR%%/nation/azeri.ruleset
%%DATADIR%%/nation/aztec.ruleset
%%DATADIR%%/nation/babylonian.ruleset
%%DATADIR%%/nation/barbarian.ruleset
+%%DATADIR%%/nation/basque.ruleset
%%DATADIR%%/nation/bavarian.ruleset
+%%DATADIR%%/nation/belarusian.ruleset
%%DATADIR%%/nation/belgian.ruleset
%%DATADIR%%/nation/bengali.ruleset
%%DATADIR%%/nation/boer.ruleset
%%DATADIR%%/nation/bosnia.ruleset
%%DATADIR%%/nation/brazilian.ruleset
+%%DATADIR%%/nation/breton.ruleset
%%DATADIR%%/nation/british.ruleset
%%DATADIR%%/nation/bulgarian.ruleset
+%%DATADIR%%/nation/burgundian.ruleset
%%DATADIR%%/nation/burmese.ruleset
+%%DATADIR%%/nation/burundi.ruleset
%%DATADIR%%/nation/byzantium.ruleset
+%%DATADIR%%/nation/cambodian.ruleset
%%DATADIR%%/nation/canadian.ruleset
%%DATADIR%%/nation/carthaginian.ruleset
%%DATADIR%%/nation/catalan.ruleset
+%%DATADIR%%/nation/cherokee.ruleset
%%DATADIR%%/nation/chilean.ruleset
%%DATADIR%%/nation/chinese.ruleset
+%%DATADIR%%/nation/chola.ruleset
%%DATADIR%%/nation/colombian.ruleset
%%DATADIR%%/nation/confederate.ruleset
%%DATADIR%%/nation/cornish.ruleset
+%%DATADIR%%/nation/cree.ruleset
%%DATADIR%%/nation/croatian.ruleset
%%DATADIR%%/nation/cuban.ruleset
%%DATADIR%%/nation/czech.ruleset
%%DATADIR%%/nation/danish.ruleset
+%%DATADIR%%/nation/dominican.ruleset
%%DATADIR%%/nation/dutch.ruleset
%%DATADIR%%/nation/egyptian.ruleset
+%%DATADIR%%/nation/emirati.ruleset
%%DATADIR%%/nation/english.ruleset
+%%DATADIR%%/nation/esperant.ruleset
%%DATADIR%%/nation/estonian.ruleset
%%DATADIR%%/nation/ethiopian.ruleset
+%%DATADIR%%/nation/european.ruleset
%%DATADIR%%/nation/filipino.ruleset
%%DATADIR%%/nation/finnish.ruleset
%%DATADIR%%/nation/french.ruleset
@@ -79,8 +97,13 @@
%%DATADIR%%/nation/georgian.ruleset
%%DATADIR%%/nation/german.ruleset
%%DATADIR%%/nation/greek.ruleset
+%%DATADIR%%/nation/gupta.ruleset
+%%DATADIR%%/nation/hacker.ruleset
+%%DATADIR%%/nation/hawaiian.ruleset
%%DATADIR%%/nation/hellenic.ruleset
+%%DATADIR%%/nation/himyarite.ruleset
%%DATADIR%%/nation/hittite.ruleset
+%%DATADIR%%/nation/hopi.ruleset
%%DATADIR%%/nation/hungarian.ruleset
%%DATADIR%%/nation/icelandic.ruleset
%%DATADIR%%/nation/illyrian.ruleset
@@ -88,43 +111,69 @@
%%DATADIR%%/nation/indian.ruleset
%%DATADIR%%/nation/indonesian.ruleset
%%DATADIR%%/nation/inuit.ruleset
+%%DATADIR%%/nation/iranian.ruleset
%%DATADIR%%/nation/iraqi.ruleset
%%DATADIR%%/nation/irish.ruleset
%%DATADIR%%/nation/iroquois.ruleset
%%DATADIR%%/nation/israeli.ruleset
%%DATADIR%%/nation/italian.ruleset
%%DATADIR%%/nation/japanese.ruleset
-%%DATADIR%%/nation/kampuchean.ruleset
+%%DATADIR%%/nation/kanem-bornu.ruleset
+%%DATADIR%%/nation/kazakh.ruleset
%%DATADIR%%/nation/kenyan.ruleset
+%%DATADIR%%/nation/khwarezmian.ruleset
+%%DATADIR%%/nation/kongo.ruleset
%%DATADIR%%/nation/korean.ruleset
+%%DATADIR%%/nation/kurd.ruleset
+%%DATADIR%%/nation/kyrgyz.ruleset
%%DATADIR%%/nation/lankese.ruleset
+%%DATADIR%%/nation/laotian.ruleset
%%DATADIR%%/nation/latvian.ruleset
%%DATADIR%%/nation/libyan.ruleset
%%DATADIR%%/nation/lithuanian.ruleset
+%%DATADIR%%/nation/lojbanistani.ruleset
+%%DATADIR%%/nation/majapahit.ruleset
%%DATADIR%%/nation/malagasy.ruleset
%%DATADIR%%/nation/malaysian.ruleset
%%DATADIR%%/nation/malian.ruleset
%%DATADIR%%/nation/manchu.ruleset
%%DATADIR%%/nation/maori.ruleset
+%%DATADIR%%/nation/mapuche.ruleset
%%DATADIR%%/nation/martian.ruleset
%%DATADIR%%/nation/mayan.ruleset
%%DATADIR%%/nation/mexican.ruleset
+%%DATADIR%%/nation/moldovan.ruleset
%%DATADIR%%/nation/mongol.ruleset
+%%DATADIR%%/nation/muskogee.ruleset
%%DATADIR%%/nation/newzealand.ruleset
%%DATADIR%%/nation/nigerian.ruleset
+%%DATADIR%%/nation/norman.ruleset
+%%DATADIR%%/nation/northkorean.ruleset
%%DATADIR%%/nation/norwegian.ruleset
+%%DATADIR%%/nation/nubian.ruleset
+%%DATADIR%%/nation/numidian.ruleset
+%%DATADIR%%/nation/nuu-chah-nulth.ruleset
%%DATADIR%%/nation/ottoman.ruleset
+%%DATADIR%%/nation/pakistani.ruleset
%%DATADIR%%/nation/papuan.ruleset
%%DATADIR%%/nation/persian.ruleset
+%%DATADIR%%/nation/peruvian.ruleset
%%DATADIR%%/nation/phoenician.ruleset
+%%DATADIR%%/nation/pirate.ruleset
%%DATADIR%%/nation/polish.ruleset
+%%DATADIR%%/nation/polynesian.ruleset
%%DATADIR%%/nation/portuguese.ruleset
+%%DATADIR%%/nation/prussian.ruleset
+%%DATADIR%%/nation/purhepecha.ruleset
%%DATADIR%%/nation/quebecois.ruleset
%%DATADIR%%/nation/roman.ruleset
%%DATADIR%%/nation/romanian.ruleset
%%DATADIR%%/nation/russian.ruleset
+%%DATADIR%%/nation/rwandan.ruleset
%%DATADIR%%/nation/ryukyuan.ruleset
%%DATADIR%%/nation/sami.ruleset
+%%DATADIR%%/nation/samogitian.ruleset
+%%DATADIR%%/nation/saxon.ruleset
%%DATADIR%%/nation/scottish.ruleset
%%DATADIR%%/nation/serbian.ruleset
%%DATADIR%%/nation/silesian.ruleset
@@ -133,21 +182,35 @@
%%DATADIR%%/nation/slovakian.ruleset
%%DATADIR%%/nation/slovenian.ruleset
%%DATADIR%%/nation/southafrican.ruleset
+%%DATADIR%%/nation/southkorean.ruleset
%%DATADIR%%/nation/soviet.ruleset
%%DATADIR%%/nation/spanish.ruleset
+%%DATADIR%%/nation/srivijaya.ruleset
%%DATADIR%%/nation/sudanese.ruleset
%%DATADIR%%/nation/sumerian.ruleset
%%DATADIR%%/nation/swazi.ruleset
%%DATADIR%%/nation/swedish.ruleset
%%DATADIR%%/nation/swiss.ruleset
+%%DATADIR%%/nation/syrian.ruleset
+%%DATADIR%%/nation/taino.ruleset
+%%DATADIR%%/nation/tairona.ruleset
%%DATADIR%%/nation/taiwanese.ruleset
+%%DATADIR%%/nation/tajik.ruleset
+%%DATADIR%%/nation/templar.ruleset
%%DATADIR%%/nation/texan.ruleset
%%DATADIR%%/nation/thai.ruleset
+%%DATADIR%%/nation/thracian.ruleset
%%DATADIR%%/nation/tibetan.ruleset
+%%DATADIR%%/nation/tocharian.ruleset
%%DATADIR%%/nation/tunisian.ruleset
+%%DATADIR%%/nation/tupi.ruleset
%%DATADIR%%/nation/turk.ruleset
+%%DATADIR%%/nation/turkmen.ruleset
%%DATADIR%%/nation/ukrainian.ruleset
+%%DATADIR%%/nation/un.ruleset
+%%DATADIR%%/nation/uruguayan.ruleset
%%DATADIR%%/nation/uyghur.ruleset
+%%DATADIR%%/nation/uzbek.ruleset
%%DATADIR%%/nation/venezuelan.ruleset
%%DATADIR%%/nation/vietnamese.ruleset
%%DATADIR%%/nation/viking.ruleset
@@ -158,8 +221,12 @@
%%DATADIR%%/scenario/earth-160x90-v2.sav.gz
%%DATADIR%%/scenario/earth-80x50-v2.sav.gz
%%DATADIR%%/scenario/europe-200x100-v2.sav.gz
+%%DATADIR%%/scenario/france-140x90-v2.sav.gz
%%DATADIR%%/scenario/hagworld-120x60-v1.2.sav.gz
%%DATADIR%%/scenario/iberian-peninsula-136x100-v1.0.sav.gz
+%%DATADIR%%/scenario/italy-100x100-v1.5.sav.gz
+%%DATADIR%%/scenario/japan-88x100-v1.3.sav.gz
+%%DATADIR%%/scenario/north_america_116x100-v1.2.sav.gz
%%DATADIR%%/scenario/tutorial.sav.gz
share/icons/hicolor/128x128/apps/freeciv-server.png
share/icons/hicolor/16x16/apps/freeciv-server.png
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006061215.o56CFnve015932>