diff options
-rw-r--r-- | games/freeciv-client/Makefile | 9 | ||||
-rw-r--r-- | games/freeciv-client/PLIST | 4 | ||||
-rw-r--r-- | games/freeciv-server/Makefile | 9 | ||||
-rw-r--r-- | games/freeciv-server/PLIST | 5 | ||||
-rw-r--r-- | games/freeciv-share/Makefile | 3 | ||||
-rw-r--r-- | games/freeciv-share/Makefile.common | 11 | ||||
-rw-r--r-- | games/freeciv-share/PLIST | 212 | ||||
-rw-r--r-- | games/freeciv-share/distinfo | 13 | ||||
-rw-r--r-- | games/freeciv-share/patches/patch-aa | 60 | ||||
-rw-r--r-- | games/freeciv-share/patches/patch-ab | 16 | ||||
-rw-r--r-- | games/freeciv-share/patches/patch-ac | 31 |
11 files changed, 289 insertions, 84 deletions
diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile index 838d6e70706..48e0bbe8b6d 100644 --- a/games/freeciv-client/Makefile +++ b/games/freeciv-client/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.42 2010/06/13 22:44:19 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2010/06/21 07:53:14 spz Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} -PKGREVISION= 3 COMMENT= Freeciv client PKG_DESTDIR_SUPPORT= user-destdir @@ -14,6 +13,12 @@ USE_TOOLS+= pkg-config CONFIGURE_ARGS+= --disable-make-data CONFIGURE_ARGS+= --disable-server +SUBST_CLASSES+= installfix +SUBST_STAGE.installfix= post-patch +SUBST_FILES.installfix= common/Makefile.in +SUBST_SED.installfix+= -e 's|^install-exec-am: install-libLTLIBRARIES|install-exec-am: \# install-libLTLIBRARIES|' +SUBST_MESSAGE.installfix= Suppressing installation of libs already in freeciv-share. + .include "../../games/freeciv-share/Makefile.common" .include "options.mk" diff --git a/games/freeciv-client/PLIST b/games/freeciv-client/PLIST index 200ec31358c..bf2582efae6 100644 --- a/games/freeciv-client/PLIST +++ b/games/freeciv-client/PLIST @@ -1,3 +1,3 @@ -@comment $NetBSD: PLIST,v 1.2 2005/08/24 10:45:32 adam Exp $ -bin/civclient +@comment $NetBSD: PLIST,v 1.3 2010/06/21 07:53:14 spz Exp $ +bin/freeciv-gtk2 share/applications/freeciv.desktop diff --git a/games/freeciv-server/Makefile b/games/freeciv-server/Makefile index 85a1580c6a2..1ada547b623 100644 --- a/games/freeciv-server/Makefile +++ b/games/freeciv-server/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.31 2010/02/10 19:17:38 joerg Exp $ +# $NetBSD: Makefile,v 1.32 2010/06/21 07:53:14 spz Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} -PKGREVISION= 1 COMMENT= Freeciv game server DEPENDS+= freeciv-share>=${FC_VERS}:../../games/freeciv-share @@ -18,6 +17,12 @@ CONFIGURE_ARGS+= --with-readline # Uses rl_filename_completion_function() which was introduced in readline-4.2 BUILDLINK_API_DEPENDS.readline+= readline>=4.2 +SUBST_CLASSES+= installfix +SUBST_STAGE.installfix= post-patch +SUBST_FILES.installfix= common/Makefile.in +SUBST_SED.installfix+= -e 's|^install-exec-am: install-libLTLIBRARIES|install-exec-am: \# install-libLTLIBRARIES|' +SUBST_MESSAGE.installfix= Suppressing installation of libs already in freeciv-share. + .include "../../games/freeciv-share/Makefile.common" .include "../../devel/readline/buildlink3.mk" diff --git a/games/freeciv-server/PLIST b/games/freeciv-server/PLIST index 1908a1b7f9d..0a820f5a627 100644 --- a/games/freeciv-server/PLIST +++ b/games/freeciv-server/PLIST @@ -1,3 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2008/01/06 16:39:14 adam Exp $ -bin/civserver +@comment $NetBSD: PLIST,v 1.3 2010/06/21 07:53:14 spz Exp $ +bin/freeciv-server +lib/libfreeciv-srv.la share/applications/freeciv-server.desktop diff --git a/games/freeciv-share/Makefile b/games/freeciv-share/Makefile index 413669c0097..f81419d1cea 100644 --- a/games/freeciv-share/Makefile +++ b/games/freeciv-share/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.17 2010/02/10 19:17:38 joerg Exp $ +# $NetBSD: Makefile,v 1.18 2010/06/21 07:53:14 spz Exp $ PKGNAME= ${DISTNAME:S/-/-share-/} -PKGREVISION= 1 COMMENT= Machine independent files for Freeciv PKG_DESTDIR_SUPPORT= user-destdir diff --git a/games/freeciv-share/Makefile.common b/games/freeciv-share/Makefile.common index 65a666d494e..afa781be11a 100644 --- a/games/freeciv-share/Makefile.common +++ b/games/freeciv-share/Makefile.common @@ -1,7 +1,11 @@ -# $NetBSD: Makefile.common,v 1.36 2009/06/08 09:24:39 ahoka Exp $ +# $NetBSD: Makefile.common,v 1.37 2010/06/21 07:53:14 spz Exp $ + +# used by games/freeciv-share/Makefile +# used by games/freeciv-client/Makefile +# used by games/freeciv-server/Makefile DISTNAME= freeciv-${FC_VERS} -FC_VERS= 2.1.9 +FC_VERS= 2.2.1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=freeciv/} EXTRACT_SUFX= .tar.bz2 @@ -11,6 +15,7 @@ HOMEPAGE= http://www.freeciv.org/ USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake msgfmt pkg-config +USE_LANGUAGES+= c c++ GNU_CONFIGURE= yes DISTINFO_FILE= ${.CURDIR}/../../games/freeciv-share/distinfo @@ -25,6 +30,8 @@ SUBST_SED.data+= -e "s|@CLIENT_FALSE@|@MAKE_DATA_FALSE@|g" SUBST_SED.data+= -e "s|@CLIENT_TRUE@|@MAKE_DATA_TRUE@|g" SUBST_SED.data+= -e "s|@SERVER_FALSE@|@MAKE_DATA_FALSE@|g" SUBST_SED.data+= -e "s|@SERVER_TRUE@|@MAKE_DATA_TRUE@|g" +SUBST_SED.data+= -e "s|@CLIENT_GUI_XAW_TRUE@||g" +SUBST_SED.data+= -e "s|@CLIENT_GUI_GTK_2_0_TRUE@||g" SUBST_MESSAGE.data= Fixing installation of data files. .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/games/freeciv-share/PLIST b/games/freeciv-share/PLIST index 2d8245c78e3..dea62d808b8 100644 --- a/games/freeciv-share/PLIST +++ b/games/freeciv-share/PLIST @@ -1,6 +1,13 @@ -@comment $NetBSD: PLIST,v 1.10 2009/06/14 17:56:45 joerg Exp $ -man/man6/civclient.6 -man/man6/civserver.6 +@comment $NetBSD: PLIST,v 1.11 2010/06/21 07:53:14 spz Exp $ +lib/libfreeciv.la +man/man6/freeciv-client.6 +man/man6/freeciv-ftwl.6 +man/man6/freeciv-gtk2.6 +man/man6/freeciv-sdl.6 +man/man6/freeciv-server.6 +man/man6/freeciv-win32.6 +man/man6/freeciv-xaw.6 +share/freeciv/Freeciv share/freeciv/amplio.tilespec share/freeciv/amplio/ancientcities.png share/freeciv/amplio/ancientcities.spec @@ -20,6 +27,8 @@ share/freeciv/amplio/moderncities.png share/freeciv/amplio/moderncities.spec share/freeciv/amplio/nuke.png share/freeciv/amplio/nuke.spec +share/freeciv/amplio/ocean.png +share/freeciv/amplio/ocean.spec share/freeciv/amplio/select-alpha.png share/freeciv/amplio/select.png share/freeciv/amplio/select.spec @@ -31,6 +40,8 @@ share/freeciv/amplio/tiles.png share/freeciv/amplio/tiles.spec share/freeciv/amplio/units.png share/freeciv/amplio/units.spec +share/freeciv/amplio/water.png +share/freeciv/amplio/water.spec share/freeciv/amplio/wonders.spec share/freeciv/buildings/airport.png share/freeciv/buildings/aqueduct.png @@ -91,8 +102,10 @@ share/freeciv/civ2/techs.ruleset share/freeciv/civ2/terrain.ruleset share/freeciv/civ2/units.ruleset share/freeciv/default.serv +share/freeciv/default/ai_effects.ruleset share/freeciv/default/buildings.ruleset share/freeciv/default/cities.ruleset +share/freeciv/default/default.lua share/freeciv/default/effects.ruleset share/freeciv/default/game.ruleset share/freeciv/default/governments.ruleset @@ -105,6 +118,10 @@ share/freeciv/flags/aborigines-shield.png share/freeciv/flags/aborigines.png share/freeciv/flags/afghanistan-shield.png share/freeciv/flags/afghanistan.png +share/freeciv/flags/ainu-shield.png +share/freeciv/flags/ainu.png +share/freeciv/flags/akwe-shield.png +share/freeciv/flags/akwe.png share/freeciv/flags/algeria-shield.png share/freeciv/flags/algeria.png share/freeciv/flags/antarctica-shield.png @@ -123,6 +140,8 @@ share/freeciv/flags/australia-shield.png share/freeciv/flags/australia.png share/freeciv/flags/austria-shield.png share/freeciv/flags/austria.png +share/freeciv/flags/aymara-shield.png +share/freeciv/flags/aymara.png share/freeciv/flags/azerbaijan-shield.png share/freeciv/flags/azerbaijan.png share/freeciv/flags/aztec-shield.png @@ -135,6 +154,8 @@ share/freeciv/flags/barbarian-shield.png share/freeciv/flags/barbarian.png share/freeciv/flags/bavarian-shield.png share/freeciv/flags/bavarian.png +share/freeciv/flags/belarus-shield.png +share/freeciv/flags/belarus.png share/freeciv/flags/belgium-shield.png share/freeciv/flags/belgium.png share/freeciv/flags/boer-shield.png @@ -143,8 +164,14 @@ share/freeciv/flags/bosnia-shield.png share/freeciv/flags/bosnia.png share/freeciv/flags/brasil-shield.png share/freeciv/flags/brasil.png +share/freeciv/flags/brittany-shield.png +share/freeciv/flags/brittany.png share/freeciv/flags/bulgaria-shield.png share/freeciv/flags/bulgaria.png +share/freeciv/flags/burgundy-shield.png +share/freeciv/flags/burgundy.png +share/freeciv/flags/burundi-shield.png +share/freeciv/flags/burundi.png share/freeciv/flags/byzantium-shield.png share/freeciv/flags/byzantium.png share/freeciv/flags/canada-shield.png @@ -159,6 +186,8 @@ share/freeciv/flags/chile-shield.png share/freeciv/flags/chile.png share/freeciv/flags/china-shield.png share/freeciv/flags/china.png +share/freeciv/flags/chola-shield.png +share/freeciv/flags/chola.png share/freeciv/flags/colombia-shield.png share/freeciv/flags/colombia.png share/freeciv/flags/constantine-shield.png @@ -173,18 +202,24 @@ share/freeciv/flags/czech-shield.png share/freeciv/flags/czech.png share/freeciv/flags/denmark-shield.png share/freeciv/flags/denmark.png +share/freeciv/flags/dominica-shield.png +share/freeciv/flags/dominica.png share/freeciv/flags/egypt-shield.png share/freeciv/flags/egypt.png share/freeciv/flags/egypt_ancient-shield.png share/freeciv/flags/egypt_ancient.png share/freeciv/flags/england-shield.png share/freeciv/flags/england.png +share/freeciv/flags/esperanto-shield.png +share/freeciv/flags/esperanto.png share/freeciv/flags/estonia-shield.png share/freeciv/flags/estonia.png share/freeciv/flags/ethiopia-shield.png share/freeciv/flags/ethiopia.png share/freeciv/flags/europe-shield.png share/freeciv/flags/europe.png +share/freeciv/flags/euskadi-shield.png +share/freeciv/flags/euskadi.png share/freeciv/flags/finland-shield.png share/freeciv/flags/finland.png share/freeciv/flags/france-shield.png @@ -205,8 +240,18 @@ share/freeciv/flags/greece_ancient-shield.png share/freeciv/flags/greece_ancient.png share/freeciv/flags/greenland-shield.png share/freeciv/flags/greenland.png +share/freeciv/flags/gupta-shield.png +share/freeciv/flags/gupta.png +share/freeciv/flags/hacker-shield.png +share/freeciv/flags/hacker.png +share/freeciv/flags/hawaii-shield.png +share/freeciv/flags/hawaii.png +share/freeciv/flags/himyar-shield.png +share/freeciv/flags/himyar.png share/freeciv/flags/hittite-shield.png share/freeciv/flags/hittite.png +share/freeciv/flags/hopi-shield.png +share/freeciv/flags/hopi.png share/freeciv/flags/hungary-shield.png share/freeciv/flags/hungary.png share/freeciv/flags/iceland-shield.png @@ -219,6 +264,8 @@ share/freeciv/flags/india-shield.png share/freeciv/flags/india.png share/freeciv/flags/indonesia-shield.png share/freeciv/flags/indonesia.png +share/freeciv/flags/innu-shield.png +share/freeciv/flags/innu.png share/freeciv/flags/iran-shield.png share/freeciv/flags/iran.png share/freeciv/flags/iran_ancient-shield.png @@ -237,12 +284,32 @@ share/freeciv/flags/italy-shield.png share/freeciv/flags/italy.png share/freeciv/flags/japan-shield.png share/freeciv/flags/japan.png +share/freeciv/flags/jbonai-shield.png +share/freeciv/flags/jbonai.png share/freeciv/flags/kampuchea-shield.png share/freeciv/flags/kampuchea.png +share/freeciv/flags/kanem-bornu-shield.png +share/freeciv/flags/kanem-bornu.png +share/freeciv/flags/kazakhstan-shield.png +share/freeciv/flags/kazakhstan.png +share/freeciv/flags/keetoowah-shield.png +share/freeciv/flags/keetoowah.png share/freeciv/flags/kenya-shield.png share/freeciv/flags/kenya.png +share/freeciv/flags/khwarezm-shield.png +share/freeciv/flags/khwarezm.png +share/freeciv/flags/kongo-shield.png +share/freeciv/flags/kongo.png share/freeciv/flags/korea-shield.png share/freeciv/flags/korea.png +share/freeciv/flags/korea_ancient-shield.png +share/freeciv/flags/korea_ancient.png +share/freeciv/flags/kurd-shield.png +share/freeciv/flags/kurd.png +share/freeciv/flags/kyrgyzstan-shield.png +share/freeciv/flags/kyrgyzstan.png +share/freeciv/flags/laos-shield.png +share/freeciv/flags/laos.png share/freeciv/flags/latvia-shield.png share/freeciv/flags/latvia.png share/freeciv/flags/libya-shield.png @@ -253,20 +320,28 @@ share/freeciv/flags/macedonia-shield.png share/freeciv/flags/macedonia.png share/freeciv/flags/madagascar-shield.png share/freeciv/flags/madagascar.png +share/freeciv/flags/majapahit-shield.png +share/freeciv/flags/majapahit.png share/freeciv/flags/malaysia-shield.png share/freeciv/flags/malaysia.png share/freeciv/flags/mali-shield.png share/freeciv/flags/mali.png share/freeciv/flags/maori-shield.png share/freeciv/flags/maori.png +share/freeciv/flags/mapuche-shield.png +share/freeciv/flags/mapuche.png share/freeciv/flags/mars-shield.png share/freeciv/flags/mars.png share/freeciv/flags/maya-shield.png share/freeciv/flags/maya.png share/freeciv/flags/mexico-shield.png share/freeciv/flags/mexico.png +share/freeciv/flags/moldova-shield.png +share/freeciv/flags/moldova.png share/freeciv/flags/mongolia-shield.png share/freeciv/flags/mongolia.png +share/freeciv/flags/muskogee-shield.png +share/freeciv/flags/muskogee.png share/freeciv/flags/myanmar-shield.png share/freeciv/flags/myanmar.png share/freeciv/flags/nato-shield.png @@ -277,10 +352,18 @@ share/freeciv/flags/newzealand-shield.png share/freeciv/flags/newzealand.png share/freeciv/flags/nigeria-shield.png share/freeciv/flags/nigeria.png +share/freeciv/flags/normandy-shield.png +share/freeciv/flags/normandy.png +share/freeciv/flags/north_korea-shield.png +share/freeciv/flags/north_korea.png share/freeciv/flags/norway-shield.png share/freeciv/flags/norway.png -share/freeciv/flags/observer-shield.png -share/freeciv/flags/observer.png +share/freeciv/flags/nubia-shield.png +share/freeciv/flags/nubia.png +share/freeciv/flags/numidia-shield.png +share/freeciv/flags/numidia.png +share/freeciv/flags/nuu-chah-nulth-shield.png +share/freeciv/flags/nuu-chah-nulth.png share/freeciv/flags/ottoman-shield.png share/freeciv/flags/ottoman.png share/freeciv/flags/pakistan-shield.png @@ -295,10 +378,18 @@ share/freeciv/flags/philippines-shield.png share/freeciv/flags/philippines.png share/freeciv/flags/phoenicia-shield.png share/freeciv/flags/phoenicia.png +share/freeciv/flags/pirate-shield.png +share/freeciv/flags/pirate.png share/freeciv/flags/poland-shield.png share/freeciv/flags/poland.png +share/freeciv/flags/polynesian-shield.png +share/freeciv/flags/polynesian.png share/freeciv/flags/portugal-shield.png share/freeciv/flags/portugal.png +share/freeciv/flags/prussia-shield.png +share/freeciv/flags/prussia.png +share/freeciv/flags/purhepecha-shield.png +share/freeciv/flags/purhepecha.png share/freeciv/flags/qing-shield.png share/freeciv/flags/qing.png share/freeciv/flags/quebec-shield.png @@ -313,8 +404,12 @@ share/freeciv/flags/rwanda-shield.png share/freeciv/flags/rwanda.png share/freeciv/flags/ryukyu-shield.png share/freeciv/flags/ryukyu.png +share/freeciv/flags/samogitia-shield.png +share/freeciv/flags/samogitia.png share/freeciv/flags/sapmi-shield.png share/freeciv/flags/sapmi.png +share/freeciv/flags/saxony-shield.png +share/freeciv/flags/saxony.png share/freeciv/flags/scotland-shield.png share/freeciv/flags/scotland.png share/freeciv/flags/serbia-shield.png @@ -337,6 +432,8 @@ share/freeciv/flags/spain-shield.png share/freeciv/flags/spain.png share/freeciv/flags/srilanka-shield.png share/freeciv/flags/srilanka.png +share/freeciv/flags/srivijaya-shield.png +share/freeciv/flags/srivijaya.png share/freeciv/flags/stpatrick-shield.png share/freeciv/flags/stpatrick.png share/freeciv/flags/sudan-shield.png @@ -351,18 +448,36 @@ share/freeciv/flags/swiss-shield.png share/freeciv/flags/swiss.png share/freeciv/flags/syria-shield.png share/freeciv/flags/syria.png +share/freeciv/flags/taino-shield.png +share/freeciv/flags/taino.png +share/freeciv/flags/tairona-shield.png +share/freeciv/flags/tairona.png share/freeciv/flags/taiwan-shield.png share/freeciv/flags/taiwan.png +share/freeciv/flags/tajikistan-shield.png +share/freeciv/flags/tajikistan.png +share/freeciv/flags/templar-shield.png +share/freeciv/flags/templar.png share/freeciv/flags/texas-shield.png share/freeciv/flags/texas.png share/freeciv/flags/thailand-shield.png share/freeciv/flags/thailand.png +share/freeciv/flags/thrace-shield.png +share/freeciv/flags/thrace.png share/freeciv/flags/tibet-shield.png share/freeciv/flags/tibet.png +share/freeciv/flags/tocharian-shield.png +share/freeciv/flags/tocharian.png share/freeciv/flags/tunisia-shield.png share/freeciv/flags/tunisia.png +share/freeciv/flags/tupi-shield.png +share/freeciv/flags/tupi.png share/freeciv/flags/turkey-shield.png share/freeciv/flags/turkey.png +share/freeciv/flags/turkmenistan-shield.png +share/freeciv/flags/turkmenistan.png +share/freeciv/flags/uae-shield.png +share/freeciv/flags/uae.png share/freeciv/flags/ukraine-shield.png share/freeciv/flags/ukraine.png share/freeciv/flags/united_kingdom-shield.png @@ -371,10 +486,14 @@ share/freeciv/flags/united_nations-shield.png share/freeciv/flags/united_nations.png share/freeciv/flags/unknown-shield.png share/freeciv/flags/unknown.png +share/freeciv/flags/uruguay-shield.png +share/freeciv/flags/uruguay.png share/freeciv/flags/usa-shield.png share/freeciv/flags/usa.png share/freeciv/flags/uyghur-shield.png share/freeciv/flags/uyghur.png +share/freeciv/flags/uzbekistan-shield.png +share/freeciv/flags/uzbekistan.png share/freeciv/flags/venezuela-shield.png share/freeciv/flags/venezuela.png share/freeciv/flags/vietnam-shield.png @@ -387,6 +506,8 @@ share/freeciv/flags/westphalia-shield.png share/freeciv/flags/westphalia.png share/freeciv/flags/zulu-shield.png share/freeciv/flags/zulu.png +share/freeciv/freeciv.rc-2.0 +share/freeciv/gtk_menus.xml share/freeciv/helpdata.txt share/freeciv/hex2t.tilespec share/freeciv/hex2t/grid.png @@ -413,6 +534,8 @@ share/freeciv/isophex/terrain2.png share/freeciv/isophex/terrain2.spec share/freeciv/isophex/tiles.png share/freeciv/isophex/tiles.spec +share/freeciv/isophex/water.png +share/freeciv/isophex/water.spec share/freeciv/isotrident.tilespec share/freeciv/isotrident/cities.png share/freeciv/isotrident/cities.spec @@ -434,6 +557,8 @@ share/freeciv/isotrident/tiles.png share/freeciv/isotrident/tiles.spec share/freeciv/isotrident/unitextras.png share/freeciv/isotrident/unitextras.spec +share/freeciv/isotrident/water.png +share/freeciv/isotrident/water.spec share/freeciv/misc/buildings.png share/freeciv/misc/buildings.spec share/freeciv/misc/chiefs.png @@ -447,6 +572,8 @@ share/freeciv/misc/colors.spec share/freeciv/misc/colors.tilespec share/freeciv/misc/cursors.png share/freeciv/misc/cursors.spec +share/freeciv/misc/editor.png +share/freeciv/misc/editor.spec share/freeciv/misc/flags.spec share/freeciv/misc/icons.spec share/freeciv/misc/intro.png @@ -464,6 +591,8 @@ share/freeciv/misc/treaty.png share/freeciv/misc/treaty.spec share/freeciv/nation/aborigines.ruleset share/freeciv/nation/afghani.ruleset +share/freeciv/nation/ainu.ruleset +share/freeciv/nation/akwe.ruleset share/freeciv/nation/algerian.ruleset share/freeciv/nation/american.ruleset share/freeciv/nation/antarctican.ruleset @@ -474,36 +603,51 @@ share/freeciv/nation/armenian.ruleset share/freeciv/nation/assyrian.ruleset share/freeciv/nation/australian.ruleset share/freeciv/nation/austrian.ruleset +share/freeciv/nation/aymara.ruleset +share/freeciv/nation/azeri.ruleset share/freeciv/nation/aztec.ruleset share/freeciv/nation/babylonian.ruleset share/freeciv/nation/barbarian.ruleset +share/freeciv/nation/basque.ruleset share/freeciv/nation/bavarian.ruleset +share/freeciv/nation/belarusian.ruleset share/freeciv/nation/belgian.ruleset share/freeciv/nation/bengali.ruleset share/freeciv/nation/boer.ruleset share/freeciv/nation/bosnia.ruleset share/freeciv/nation/brazilian.ruleset +share/freeciv/nation/breton.ruleset share/freeciv/nation/british.ruleset share/freeciv/nation/bulgarian.ruleset +share/freeciv/nation/burgundian.ruleset share/freeciv/nation/burmese.ruleset +share/freeciv/nation/burundi.ruleset share/freeciv/nation/byzantium.ruleset +share/freeciv/nation/cambodian.ruleset share/freeciv/nation/canadian.ruleset share/freeciv/nation/carthaginian.ruleset share/freeciv/nation/catalan.ruleset +share/freeciv/nation/cherokee.ruleset share/freeciv/nation/chilean.ruleset share/freeciv/nation/chinese.ruleset +share/freeciv/nation/chola.ruleset share/freeciv/nation/colombian.ruleset share/freeciv/nation/confederate.ruleset share/freeciv/nation/cornish.ruleset +share/freeciv/nation/cree.ruleset share/freeciv/nation/croatian.ruleset share/freeciv/nation/cuban.ruleset share/freeciv/nation/czech.ruleset share/freeciv/nation/danish.ruleset +share/freeciv/nation/dominican.ruleset share/freeciv/nation/dutch.ruleset share/freeciv/nation/egyptian.ruleset +share/freeciv/nation/emirati.ruleset share/freeciv/nation/english.ruleset +share/freeciv/nation/esperant.ruleset share/freeciv/nation/estonian.ruleset share/freeciv/nation/ethiopian.ruleset +share/freeciv/nation/european.ruleset share/freeciv/nation/filipino.ruleset share/freeciv/nation/finnish.ruleset share/freeciv/nation/french.ruleset @@ -512,8 +656,13 @@ share/freeciv/nation/gallic.ruleset share/freeciv/nation/georgian.ruleset share/freeciv/nation/german.ruleset share/freeciv/nation/greek.ruleset +share/freeciv/nation/gupta.ruleset +share/freeciv/nation/hacker.ruleset +share/freeciv/nation/hawaiian.ruleset share/freeciv/nation/hellenic.ruleset +share/freeciv/nation/himyarite.ruleset share/freeciv/nation/hittite.ruleset +share/freeciv/nation/hopi.ruleset share/freeciv/nation/hungarian.ruleset share/freeciv/nation/icelandic.ruleset share/freeciv/nation/illyrian.ruleset @@ -521,43 +670,69 @@ share/freeciv/nation/inca.ruleset share/freeciv/nation/indian.ruleset share/freeciv/nation/indonesian.ruleset share/freeciv/nation/inuit.ruleset +share/freeciv/nation/iranian.ruleset share/freeciv/nation/iraqi.ruleset share/freeciv/nation/irish.ruleset share/freeciv/nation/iroquois.ruleset share/freeciv/nation/israeli.ruleset share/freeciv/nation/italian.ruleset share/freeciv/nation/japanese.ruleset -share/freeciv/nation/kampuchean.ruleset +share/freeciv/nation/kanem-bornu.ruleset +share/freeciv/nation/kazakh.ruleset share/freeciv/nation/kenyan.ruleset +share/freeciv/nation/khwarezmian.ruleset +share/freeciv/nation/kongo.ruleset share/freeciv/nation/korean.ruleset +share/freeciv/nation/kurd.ruleset +share/freeciv/nation/kyrgyz.ruleset share/freeciv/nation/lankese.ruleset +share/freeciv/nation/laotian.ruleset share/freeciv/nation/latvian.ruleset share/freeciv/nation/libyan.ruleset share/freeciv/nation/lithuanian.ruleset +share/freeciv/nation/lojbanistani.ruleset +share/freeciv/nation/majapahit.ruleset share/freeciv/nation/malagasy.ruleset share/freeciv/nation/malaysian.ruleset share/freeciv/nation/malian.ruleset share/freeciv/nation/manchu.ruleset share/freeciv/nation/maori.ruleset +share/freeciv/nation/mapuche.ruleset share/freeciv/nation/martian.ruleset share/freeciv/nation/mayan.ruleset share/freeciv/nation/mexican.ruleset +share/freeciv/nation/moldovan.ruleset share/freeciv/nation/mongol.ruleset +share/freeciv/nation/muskogee.ruleset share/freeciv/nation/newzealand.ruleset share/freeciv/nation/nigerian.ruleset +share/freeciv/nation/norman.ruleset +share/freeciv/nation/northkorean.ruleset share/freeciv/nation/norwegian.ruleset +share/freeciv/nation/nubian.ruleset +share/freeciv/nation/numidian.ruleset +share/freeciv/nation/nuu-chah-nulth.ruleset share/freeciv/nation/ottoman.ruleset +share/freeciv/nation/pakistani.ruleset share/freeciv/nation/papuan.ruleset share/freeciv/nation/persian.ruleset +share/freeciv/nation/peruvian.ruleset share/freeciv/nation/phoenician.ruleset +share/freeciv/nation/pirate.ruleset share/freeciv/nation/polish.ruleset +share/freeciv/nation/polynesian.ruleset share/freeciv/nation/portuguese.ruleset +share/freeciv/nation/prussian.ruleset +share/freeciv/nation/purhepecha.ruleset share/freeciv/nation/quebecois.ruleset share/freeciv/nation/roman.ruleset share/freeciv/nation/romanian.ruleset share/freeciv/nation/russian.ruleset +share/freeciv/nation/rwandan.ruleset share/freeciv/nation/ryukyuan.ruleset share/freeciv/nation/sami.ruleset +share/freeciv/nation/samogitian.ruleset +share/freeciv/nation/saxon.ruleset share/freeciv/nation/scottish.ruleset share/freeciv/nation/serbian.ruleset share/freeciv/nation/silesian.ruleset @@ -566,21 +741,35 @@ share/freeciv/nation/sioux.ruleset share/freeciv/nation/slovakian.ruleset share/freeciv/nation/slovenian.ruleset share/freeciv/nation/southafrican.ruleset +share/freeciv/nation/southkorean.ruleset share/freeciv/nation/soviet.ruleset share/freeciv/nation/spanish.ruleset +share/freeciv/nation/srivijaya.ruleset share/freeciv/nation/sudanese.ruleset share/freeciv/nation/sumerian.ruleset share/freeciv/nation/swazi.ruleset share/freeciv/nation/swedish.ruleset share/freeciv/nation/swiss.ruleset +share/freeciv/nation/syrian.ruleset +share/freeciv/nation/taino.ruleset +share/freeciv/nation/tairona.ruleset share/freeciv/nation/taiwanese.ruleset +share/freeciv/nation/tajik.ruleset +share/freeciv/nation/templar.ruleset share/freeciv/nation/texan.ruleset share/freeciv/nation/thai.ruleset +share/freeciv/nation/thracian.ruleset share/freeciv/nation/tibetan.ruleset +share/freeciv/nation/tocharian.ruleset share/freeciv/nation/tunisian.ruleset +share/freeciv/nation/tupi.ruleset share/freeciv/nation/turk.ruleset +share/freeciv/nation/turkmen.ruleset share/freeciv/nation/ukrainian.ruleset +share/freeciv/nation/un.ruleset +share/freeciv/nation/uruguayan.ruleset share/freeciv/nation/uyghur.ruleset +share/freeciv/nation/uzbek.ruleset share/freeciv/nation/venezuelan.ruleset share/freeciv/nation/vietnamese.ruleset share/freeciv/nation/viking.ruleset @@ -591,8 +780,12 @@ share/freeciv/scenario/british-isles-85x80-v2.80.sav.gz share/freeciv/scenario/earth-160x90-v2.sav.gz share/freeciv/scenario/earth-80x50-v2.sav.gz share/freeciv/scenario/europe-200x100-v2.sav.gz +share/freeciv/scenario/france-140x90-v2.sav.gz share/freeciv/scenario/hagworld-120x60-v1.2.sav.gz share/freeciv/scenario/iberian-peninsula-136x100-v1.0.sav.gz +share/freeciv/scenario/italy-100x100-v1.5.sav.gz +share/freeciv/scenario/japan-88x100-v1.3.sav.gz +share/freeciv/scenario/north_america_116x100-v1.2.sav.gz share/freeciv/scenario/tutorial.sav.gz share/freeciv/stdsounds.soundspec share/freeciv/stdsounds/LrgCan.ogg @@ -615,6 +808,8 @@ share/freeciv/trident.tilespec share/freeciv/trident/auto_ll.spec share/freeciv/trident/cities.png share/freeciv/trident/cities.spec +share/freeciv/trident/earth.png +share/freeciv/trident/earth.spec share/freeciv/trident/explosions.png share/freeciv/trident/explosions.spec share/freeciv/trident/fog.png @@ -689,3 +884,8 @@ share/locale/tr/LC_MESSAGES/freeciv.mo share/locale/uk/LC_MESSAGES/freeciv.mo share/locale/zh_CN/LC_MESSAGES/freeciv.mo share/pixmaps/freeciv-client.png +@pkgdir share/icons/hicolor/64x64/apps +@pkgdir share/icons/hicolor/48x48/apps +@pkgdir share/icons/hicolor/32x32/apps +@pkgdir share/icons/hicolor/16x16/apps +@pkgdir share/icons/hicolor/128x128/apps diff --git a/games/freeciv-share/distinfo b/games/freeciv-share/distinfo index b850d8a3425..4b49c3b4dc4 100644 --- a/games/freeciv-share/distinfo +++ b/games/freeciv-share/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.22 2009/06/08 09:24:40 ahoka Exp $ +$NetBSD: distinfo,v 1.23 2010/06/21 07:53:14 spz Exp $ -SHA1 (freeciv-2.1.9.tar.bz2) = 01a3500a9d0f9d9c9b95b7c4b57f2446f671a900 -RMD160 (freeciv-2.1.9.tar.bz2) = cbe12facbbf00a85410e1324eb6ba3f2351ea1f1 -Size (freeciv-2.1.9.tar.bz2) = 29732845 bytes -SHA1 (patch-aa) = 62805543fce84e197414b5b9f55b8b41c2b02c02 -SHA1 (patch-ab) = 5f28acdb25cfb3d6b2021bc7e4737d9e47e760a8 +SHA1 (freeciv-2.2.1.tar.bz2) = f9d141a04e447a57f4fc001dbd789d92717735e4 +RMD160 (freeciv-2.2.1.tar.bz2) = d6d3fd99946e339b63b6e2cfc0e365e8228dc142 +Size (freeciv-2.2.1.tar.bz2) = 33400493 bytes +SHA1 (patch-aa) = 3bba77ca58321390945cba22a7b2d82e59cf00f7 +SHA1 (patch-ab) = ed68854ebea91f1b289a328e86f323cefe3faff8 +SHA1 (patch-ac) = 4748562b4db37ec7d9b855a8531efb01875825d9 diff --git a/games/freeciv-share/patches/patch-aa b/games/freeciv-share/patches/patch-aa index d0b91aa0667..45888082071 100644 --- a/games/freeciv-share/patches/patch-aa +++ b/games/freeciv-share/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.10 2008/12/14 19:20:55 adam Exp $ +$NetBSD: patch-aa,v 1.11 2010/06/21 07:53:14 spz Exp $ ---- configure.orig 2008-11-30 14:18:36.000000000 +0100 +--- configure.orig 2010-05-23 21:45:26.000000000 +0000 +++ configure -@@ -15172,13 +15172,13 @@ echo "${ECHO_T}yes" >&6 +@@ -22562,13 +22562,13 @@ $as_echo "yes" >&6; } @@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.10 2008/12/14 19:20:55 adam Exp $ cat >>confdefs.h <<_ACEOF #define $ac_tr_lib 1 _ACEOF -@@ -15276,13 +15276,13 @@ echo "${ECHO_T}yes" >&6 +@@ -22639,13 +22639,13 @@ $as_echo "yes" >&6; } @@ -44,7 +44,7 @@ $NetBSD: patch-aa,v 1.10 2008/12/14 19:20:55 adam Exp $ cat >>confdefs.h <<_ACEOF #define $ac_tr_lib 1 _ACEOF -@@ -15376,13 +15376,13 @@ echo "${ECHO_T}yes" >&6 +@@ -22712,13 +22712,13 @@ $as_echo "yes" >&6; } @@ -65,7 +65,7 @@ $NetBSD: patch-aa,v 1.10 2008/12/14 19:20:55 adam Exp $ cat >>confdefs.h <<_ACEOF #define $ac_tr_lib 1 _ACEOF -@@ -15472,13 +15472,13 @@ echo "${ECHO_T}yes" >&6 +@@ -22781,13 +22781,13 @@ $as_echo "yes" >&6; } @@ -86,7 +86,7 @@ $NetBSD: patch-aa,v 1.10 2008/12/14 19:20:55 adam Exp $ cat >>confdefs.h <<_ACEOF #define $ac_tr_lib 1 _ACEOF -@@ -15574,13 +15574,13 @@ echo "${ECHO_T}yes" >&6 +@@ -22856,13 +22856,13 @@ $as_echo "yes" >&6; } @@ -107,7 +107,7 @@ $NetBSD: patch-aa,v 1.10 2008/12/14 19:20:55 adam Exp $ cat >>confdefs.h <<_ACEOF #define $ac_tr_lib 1 _ACEOF -@@ -15673,13 +15673,13 @@ echo "${ECHO_T}yes" >&6 +@@ -22928,13 +22928,13 @@ $as_echo "yes" >&6; } @@ -128,49 +128,7 @@ $NetBSD: patch-aa,v 1.10 2008/12/14 19:20:55 adam Exp $ cat >>confdefs.h <<_ACEOF #define $ac_tr_lib 1 _ACEOF -@@ -15773,13 +15773,13 @@ echo "${ECHO_T}yes" >&6 - - - -- if (test $ac_tr_lib == HAVE_LIBX11 \ -- || test $ac_tr_lib == HAVE_LIBXEXT \ -- || test $ac_tr_lib == HAVE_LIBXT \ -- || test $ac_tr_lib == HAVE_LIBXMU \ -- || test $ac_tr_lib == HAVE_LIBXPM \ -- || test $ac_tr_lib == HAVE_LIBXAW \ -- || test $ac_tr_lib == HAVE_LIBXAW3D); then -+ if (test $ac_tr_lib = HAVE_LIBX11 \ -+ || test $ac_tr_lib = HAVE_LIBXEXT \ -+ || test $ac_tr_lib = HAVE_LIBXT \ -+ || test $ac_tr_lib = HAVE_LIBXMU \ -+ || test $ac_tr_lib = HAVE_LIBXPM \ -+ || test $ac_tr_lib = HAVE_LIBXAW \ -+ || test $ac_tr_lib = HAVE_LIBXAW3D); then - cat >>confdefs.h <<_ACEOF - #define $ac_tr_lib 1 - _ACEOF -@@ -15873,13 +15873,13 @@ echo "${ECHO_T}yes" >&6 - - - -- if (test $ac_tr_lib == HAVE_LIBX11 \ -- || test $ac_tr_lib == HAVE_LIBXEXT \ -- || test $ac_tr_lib == HAVE_LIBXT \ -- || test $ac_tr_lib == HAVE_LIBXMU \ -- || test $ac_tr_lib == HAVE_LIBXPM \ -- || test $ac_tr_lib == HAVE_LIBXAW \ -- || test $ac_tr_lib == HAVE_LIBXAW3D); then -+ if (test $ac_tr_lib = HAVE_LIBX11 \ -+ || test $ac_tr_lib = HAVE_LIBXEXT \ -+ || test $ac_tr_lib = HAVE_LIBXT \ -+ || test $ac_tr_lib = HAVE_LIBXMU \ -+ || test $ac_tr_lib = HAVE_LIBXPM \ -+ || test $ac_tr_lib = HAVE_LIBXAW \ -+ || test $ac_tr_lib = HAVE_LIBXAW3D); then - cat >>confdefs.h <<_ACEOF - #define $ac_tr_lib 1 - _ACEOF -@@ -15971,13 +15971,13 @@ echo "${ECHO_T}yes" >&6 +@@ -22999,13 +22999,13 @@ $as_echo "yes" >&6; } diff --git a/games/freeciv-share/patches/patch-ab b/games/freeciv-share/patches/patch-ab index 43c71cab044..e87448f8fa6 100644 --- a/games/freeciv-share/patches/patch-ab +++ b/games/freeciv-share/patches/patch-ab @@ -1,17 +1,15 @@ -$NetBSD: patch-ab,v 1.8 2008/12/14 19:20:55 adam Exp $ +$NetBSD: patch-ab,v 1.9 2010/06/21 07:53:14 spz Exp $ ---- Makefile.in.orig 2008-11-30 14:19:36.000000000 +0100 +--- Makefile.in.orig 2010-05-23 21:45:39.000000000 +0000 +++ Makefile.in -@@ -191,10 +191,10 @@ ACLOCAL_AMFLAGS = -I m4 +@@ -397,8 +397,8 @@ ACLOCAL_AMFLAGS = -I m4 -I dependencies/ @CLIENT_TRUE@@SERVER_TRUE@MSUBDIRS = manual @SERVER_FALSE@MSUBDIRS = - + @MAKE_DATA_FALSE@DSUBDIRS = -@MAKE_DATA_TRUE@DSUBDIRS = data +-SUBDIRS = $(DSUBDIRS) utility common tests win32 $(SSUBDIRS) $(CSUBDIRS) po doc $(MSUBDIRS) +@MAKE_DATA_TRUE@DSUBDIRS = data po doc - @MAKE_DATA_FALSE@DSUBDIRS = - --SUBDIRS = $(DSUBDIRS) intl utility common tests win32 $(SSUBDIRS) $(CSUBDIRS) po doc $(MSUBDIRS) -+SUBDIRS = $(DSUBDIRS) intl utility common tests win32 $(SSUBDIRS) $(CSUBDIRS) $(MSUBDIRS) - ++SUBDIRS = $(DSUBDIRS) utility common tests win32 $(SSUBDIRS) $(CSUBDIRS) $(MSUBDIRS) EXTRA_DIST = autogen.sh \ config.mac.h \ + configure.ac \ diff --git a/games/freeciv-share/patches/patch-ac b/games/freeciv-share/patches/patch-ac new file mode 100644 index 00000000000..2d28ed822df --- /dev/null +++ b/games/freeciv-share/patches/patch-ac @@ -0,0 +1,31 @@ +$NetBSD: patch-ac,v 1.3 2010/06/21 07:53:14 spz Exp $ + +--- bootstrap/freeciv.spec.in.orig 2010-05-23 21:43:00.000000000 +0000 ++++ bootstrap/freeciv.spec.in +@@ -229,7 +229,7 @@ rm -fr %buildroot + + %files server + %defattr(755, root, games, 0755) +-%{_gamesbindir}/civserver ++%{_gamesbindir}/freeciv-server + %defattr(644, root, root, 0755) + %doc COPYING NEWS + %doc doc/BUGS doc/HACKING doc/README +@@ -244,7 +244,7 @@ rm -fr %buildroot + %{_gamesdatadir}/%{name}/scenario + %{_gamesdatadir}/%{name}/civ1.serv + %{_gamesdatadir}/%{name}/civ2.serv +-%{_mandir}/man6/civserver.6 ++%{_mandir}/man6/freeciv-server.6 + + %files client + %defattr(644,root,root,0755) +@@ -263,7 +263,7 @@ rm -fr %buildroot + %{_gamesdatadir}/%{name}/*.tilespec + %{_gamesdatadir}/%{name}/stdsounds + %{_gamesdatadir}/%{name}/*.soundspec +-%{_mandir}/man6/civclient.6 ++%{_mandir}/man6/freeciv-client.6 + /usr/share/applications/freeciv.desktop + %defattr(755, root, games, 0755) + |