- Update to 0.8.3 - Disable tools, they won't compile in 0.8.3 - Use own install target, as the shipped target will overflow the argument list of the shell (more then 64k chars) - Remove pkg-plist and automagically generate it on the fly - USE_GCC 3.3 NOTE: Please test with KDE, as I'm not sure the two entries for the KDE Menu are correct (I don't have a KDE machine handy...) Removed files: pkg-plist, files/patch-src::scoped_resource.hpp Added files: files/patch-Makefile.in files/patch-configure files/patch-src::server::Makefile.in Port maintainer (mezz@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.63
Responsible Changed From-To: freebsd-ports-bugs->mezz Over to maintainer, but it looks very ugly anyway. We tried hard to avoid USE_GCC=3.3 here in the past, the new plist way looks very obfuscated too, +USE_GETTEXT= yes +USE_ICONV= yes superfluous USE_ICONV, USE_GETTEXT grant that, ...
Ahh crap... I should include the new patches... --- /dev/null Sun Aug 29 21:33:00 2004 +++ files/patch-Makefile.in Sun Aug 29 14:44:38 2004 @@ -0,0 +1,11 @@ +--- Makefile.in.orig Sun Aug 29 14:43:03 2004 ++++ Makefile.in Sun Aug 29 14:44:12 2004 +@@ -717,7 +717,7 @@ + + info-am: + +-install-data-am: install-man install-nobase_dist_pkgdataDATA ++install-data-am: install-man + + install-exec-am: + --- /dev/null Sun Aug 29 21:33:00 2004 +++ files/patch-configure Sun Aug 29 20:45:59 2004 @@ -0,0 +1,85 @@ +--- configure.orig Sun Aug 29 20:38:48 2004 ++++ configure Sun Aug 29 20:44:59 2004 +@@ -9973,36 +9973,6 @@ + + + +-if test x$kde = xyes && test x$kdefound = xyes; then +- KDE_TRUE= +- KDE_FALSE='#' +-else +- KDE_TRUE='#' +- KDE_FALSE= +-fi +- +- +- +-if test x$gnome = xyes && test x$gnome1found = xyes; then +- GNOME1_TRUE= +- GNOME1_FALSE='#' +-else +- GNOME1_TRUE='#' +- GNOME1_FALSE= +-fi +- +- +- +-if test x$gnome = xyes && test x$gnome1found = xno; then +- GNOME2_TRUE= +- GNOME2_FALSE='#' +-else +- GNOME2_TRUE='#' +- GNOME2_FALSE= +-fi +- +- +- + if test x$GXX = xyes; then + GCC_TRUE= + GCC_FALSE='#' +@@ -13125,7 +13095,7 @@ + if test "x$GNOME_CONFIG" = "xnone"; then + gnome1found=no + else +- GNOME1_DESKTOP=`$GNOME_CONFIG --datadir`/gnome/apps/Games ++ GNOME1_DESKTOP=`$GNOME_CONFIG --datadir`/apps/Games + gnome1found=yes + fi + +@@ -13188,6 +13158,36 @@ + kdefound=yes + fi + ++ ++ ++ ++if test x$kde = xyes && test x$kdefound = xyes; then ++ KDE_TRUE= ++ KDE_FALSE='#' ++else ++ KDE_TRUE='#' ++ KDE_FALSE= ++fi ++ ++ ++ ++if test x$gnome = xyes && test x$gnome1found = xyes; then ++ GNOME1_TRUE= ++ GNOME1_FALSE='#' ++else ++ GNOME1_TRUE='#' ++ GNOME1_FALSE= ++fi ++ ++ ++ ++if test x$gnome = xyes && test x$gnome1found = xno; then ++ GNOME2_TRUE= ++ GNOME2_FALSE='#' ++else ++ GNOME2_TRUE='#' ++ GNOME2_FALSE= ++fi + + + --- /dev/null Sun Aug 29 21:33:00 2004 +++ files/patch-src::server::Makefile.in Sun Aug 29 16:51:40 2004 @@ -0,0 +1,19 @@ +--- src/server/Makefile.in.orig Sun Aug 29 16:27:55 2004 ++++ src/server/Makefile.in Sun Aug 29 16:51:09 2004 +@@ -263,6 +263,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++localedir = $(datadir)/locale + + ############################################################################# + # Wesnothd Server # +@@ -351,7 +352,7 @@ + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + wesnothd$(EXEEXT): $(wesnothd_OBJECTS) $(wesnothd_DEPENDENCIES) + @rm -f wesnothd$(EXEEXT) +- $(CXXLINK) $(wesnothd_LDFLAGS) $(wesnothd_OBJECTS) $(wesnothd_LDADD) $(LIBS) ++ $(CXXLINK) $(wesnothd_LDFLAGS) $(wesnothd_OBJECTS) $(wesnothd_LDADD) $(LIBS) $(INTLLIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) Ulrich Spoerlein -- PGP Key ID: F0DB9F44 Get it while it's hot! PGP Fingerprint: F1CE D062 0CA9 ADE3 349B 2FE8 980A C6B5 F0DB 9F44 "They that can give up essential liberty to obtain a little temporary safety deserve neither liberty nor safety." -- Benjamin Franklin
State Changed From-To: open->closed patch-configure is the only thing that I took. Thanks for create patch and submitted to PR. I have committed 0,8.5 update.