diff options
9 files changed, 141 insertions, 4 deletions
diff --git a/games/freeciv-server/Makefile b/games/freeciv-server/Makefile index 07b4beb0760..453f5cb863d 100644 --- a/games/freeciv-server/Makefile +++ b/games/freeciv-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2012/10/06 11:54:38 asau Exp $ +# $NetBSD: Makefile,v 1.40 2013/05/23 15:02:53 joerg Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} PKGREVISION= 1 @@ -6,7 +6,10 @@ COMMENT= Freeciv game server DEPENDS+= freeciv-share>=${FC_VERS}:../../games/freeciv-share -#MAKE_JOBS_SAFE= no +USE_TOOLS+= automake autoconf + +pre-configure: + cd ${WRKSRC} && autoreconf USE_GNU_READLINE= yes CONFIGURE_ARGS+= --disable-make-data diff --git a/games/freeciv-share/distinfo b/games/freeciv-share/distinfo index 04b0be7ad1b..6fe852c6dd4 100644 --- a/games/freeciv-share/distinfo +++ b/games/freeciv-share/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.27 2012/08/17 18:42:43 prlw1 Exp $ +$NetBSD: distinfo,v 1.28 2013/05/23 15:02:53 joerg Exp $ SHA1 (freeciv-2.3.2.tar.bz2) = e6267b5e0483cf9c29d01793d2f9433e73d62191 RMD160 (freeciv-2.3.2.tar.bz2) = 63bea690cfd6953bfb30d320a3e3f7a69353b64c @@ -8,3 +8,9 @@ SHA1 (patch-common_dataio.c) = 6fd08d7185f953fbfdc2c554ad67c4e5c8f2be87 SHA1 (patch-common_dataio.h) = 4a513230ee814269466959fcb977b1360a78ee53 SHA1 (patch-common_generate__packets.py) = 0fb74f024d1ada9ad85f62b12099c385d1e972c7 SHA1 (patch-common_packets.c) = 7ea66b3d0068a1255d818a9808bf7e581c95fb71 +SHA1 (patch-configure.ac) = 3c9ce11318a497df6c06f2e272183b1dd1eaf483 +SHA1 (patch-dependencies_lua-5.1_src_Makefile.am) = 2d240eb7488bfd0071867b68e5a78a6927c85089 +SHA1 (patch-dependencies_tolua-5.1_src_bin_Makefile.am) = 933dd8a213a3b2fecc290d59d3d12437e9c5ce2c +SHA1 (patch-dependencies_tolua-5.1_src_lib_Makefile.am) = 8810cd3865433a52783f8ae274ebb0d8b50deee8 +SHA1 (patch-m4_x.m4) = 53e685c02ab97fcef9c39be1fee5dc5e73775588 +SHA1 (patch-server_Makefile.am) = 6f4cac8fccd8a289d944db6593bbbabb3650d4b9 diff --git a/games/freeciv-share/patches/patch-configure.ac b/games/freeciv-share/patches/patch-configure.ac new file mode 100644 index 00000000000..63d222a58cb --- /dev/null +++ b/games/freeciv-share/patches/patch-configure.ac @@ -0,0 +1,22 @@ +$NetBSD: patch-configure.ac,v 1.1 2013/05/23 15:02:53 joerg Exp $ + +--- configure.ac.orig 2012-03-31 12:35:57.000000000 +0000 ++++ configure.ac +@@ -883,7 +883,7 @@ dnl In the future we probably get rid of + dnl lua from system. + dnl LUA_AS_DEPENDENCY should be empty when using lua outside own our tree. + LUA_CFLAGS="-I\$(top_srcdir)/dependencies/lua-5.1/src" +-LUA_LIBS="\$(top_builddir)/dependencies/lua-5.1/src/liblua.a" ++LUA_LIBS="\$(top_builddir)/dependencies/lua-5.1/src/liblua.la" + LUA_AS_DEPENDENCY="$LUA_LIBS" + AC_SUBST([LUA_CFLAGS]) + AC_SUBST([LUA_LIBS]) +@@ -891,7 +891,7 @@ AC_SUBST([LUA_AS_DEPENDENCY]) + + + TOLUA_CFLAGS="-I\$(top_srcdir)/dependencies/tolua-5.1/include" +-TOLUA_LIBS="\$(top_builddir)/dependencies/tolua-5.1/src/lib/libtolua.a" ++TOLUA_LIBS="\$(top_builddir)/dependencies/tolua-5.1/src/lib/libtolua.la" + TOLUA_AS_DEPENDENCY="$TOLUA_LIBS" + AC_SUBST([TOLUA_CFLAGS]) + AC_SUBST([TOLUA_LIBS]) diff --git a/games/freeciv-share/patches/patch-dependencies_lua-5.1_src_Makefile.am b/games/freeciv-share/patches/patch-dependencies_lua-5.1_src_Makefile.am new file mode 100644 index 00000000000..6bdc3e0b0be --- /dev/null +++ b/games/freeciv-share/patches/patch-dependencies_lua-5.1_src_Makefile.am @@ -0,0 +1,17 @@ +$NetBSD: patch-dependencies_lua-5.1_src_Makefile.am,v 1.1 2013/05/23 15:02:53 joerg Exp $ + +--- dependencies/lua-5.1/src/Makefile.am.orig 2012-03-31 12:32:31.000000000 +0000 ++++ dependencies/lua-5.1/src/Makefile.am +@@ -1,10 +1,10 @@ + ## Process this file with automake to produce Makefile.in + +-noinst_LIBRARIES = liblua.a ++noinst_LTLIBRARIES = liblua.la + + AM_CPPFLAGS = + +-liblua_a_SOURCES = \ ++liblua_la_SOURCES = \ + localluaconf.h \ + lapi.c \ + lapi.h \ diff --git a/games/freeciv-share/patches/patch-dependencies_tolua-5.1_src_bin_Makefile.am b/games/freeciv-share/patches/patch-dependencies_tolua-5.1_src_bin_Makefile.am new file mode 100644 index 00000000000..818c78e503f --- /dev/null +++ b/games/freeciv-share/patches/patch-dependencies_tolua-5.1_src_bin_Makefile.am @@ -0,0 +1,15 @@ +$NetBSD: patch-dependencies_tolua-5.1_src_bin_Makefile.am,v 1.1 2013/05/23 15:02:53 joerg Exp $ + +--- dependencies/tolua-5.1/src/bin/Makefile.am.orig 2013-05-22 20:21:27.000000000 +0000 ++++ dependencies/tolua-5.1/src/bin/Makefile.am +@@ -36,8 +36,8 @@ EXTRA_tolua_SOURCES = \ + + tolua_DEPENDENCIES = \ + $(LUA_AS_DEPENDENCY) \ +- ../lib/libtolua.a ++ ../lib/libtolua.la + + tolua_LDFLAGS = \ + $(LUA_LIBS) \ +- ../lib/libtolua.a -lm ++ ../lib/libtolua.la -lm diff --git a/games/freeciv-share/patches/patch-dependencies_tolua-5.1_src_lib_Makefile.am b/games/freeciv-share/patches/patch-dependencies_tolua-5.1_src_lib_Makefile.am new file mode 100644 index 00000000000..7a1b90d2b9c --- /dev/null +++ b/games/freeciv-share/patches/patch-dependencies_tolua-5.1_src_lib_Makefile.am @@ -0,0 +1,17 @@ +$NetBSD: patch-dependencies_tolua-5.1_src_lib_Makefile.am,v 1.1 2013/05/23 15:02:53 joerg Exp $ + +--- dependencies/tolua-5.1/src/lib/Makefile.am.orig 2012-03-31 12:32:31.000000000 +0000 ++++ dependencies/tolua-5.1/src/lib/Makefile.am +@@ -1,10 +1,10 @@ +-noinst_LIBRARIES = libtolua.a ++noinst_LTLIBRARIES = libtolua.la + + AM_CPPFLAGS = \ + -I$(top_srcdir)/dependencies/tolua-5.1/include \ + $(LUA_CFLAGS) + +-libtolua_a_SOURCES = \ ++libtolua_la_SOURCES = \ + tolua_event.c \ + tolua_event.h \ + tolua_is.c \ diff --git a/games/freeciv-share/patches/patch-m4_x.m4 b/games/freeciv-share/patches/patch-m4_x.m4 new file mode 100644 index 00000000000..35be785359e --- /dev/null +++ b/games/freeciv-share/patches/patch-m4_x.m4 @@ -0,0 +1,25 @@ +$NetBSD: patch-m4_x.m4,v 1.1 2013/05/23 15:02:53 joerg Exp $ + +--- m4/x.m4.orig 2013-05-22 20:15:33.000000000 +0000 ++++ m4/x.m4 +@@ -64,13 +64,13 @@ AC_DEFUN([FC_CHECK_X_LIB], [ + AH_TEMPLATE([HAVE_LIBXPM], [Define if the Xpm lib is available]) + AH_TEMPLATE([HAVE_LIBXAW], [Define if the Xaw lib is to be used]) + AH_TEMPLATE([HAVE_LIBXAW3D], [Define if the Xaw3d lib is to be used]) +- 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 + AC_DEFINE_UNQUOTED($ac_tr_lib) + X_EXTRA_LIBS="-l$1 $X_EXTRA_LIBS" + else diff --git a/games/freeciv-share/patches/patch-server_Makefile.am b/games/freeciv-share/patches/patch-server_Makefile.am new file mode 100644 index 00000000000..e3a765c8d7b --- /dev/null +++ b/games/freeciv-share/patches/patch-server_Makefile.am @@ -0,0 +1,20 @@ +$NetBSD: patch-server_Makefile.am,v 1.1 2013/05/23 15:02:53 joerg Exp $ + +--- server/Makefile.am.orig 2013-05-22 20:25:54.000000000 +0000 ++++ server/Makefile.am +@@ -112,6 +112,7 @@ libfreeciv_srv_la_DEPENDENCIES = \ + $(srvlibs) + + libfreeciv_srv_la_LIBADD = \ ++ $(LUA_LIBS) $(TOLUA_LIBS) \ + $(srvlibs) + + freeciv_server_DEPENDENCIES = \ +@@ -128,7 +129,6 @@ freeciv_server_LDADD = \ + ./libfreeciv-srv.la \ + $(top_builddir)/common/libfreeciv.la \ + $(INTLLIBS) \ +- $(LUA_LIBS) $(TOLUA_LIBS) \ + $(AUTH_LIBS) $(SERVER_LIBS) $(LIB_GGZDMOD) $(SERVERICON) + + desktopfiledir = $(prefix)/share/applications diff --git a/games/freeciv-share/suppress_installation.mk b/games/freeciv-share/suppress_installation.mk index b1910ff8c91..df798074e5f 100644 --- a/games/freeciv-share/suppress_installation.mk +++ b/games/freeciv-share/suppress_installation.mk @@ -1,4 +1,4 @@ -# $NetBSD: suppress_installation.mk,v 1.1 2012/07/31 15:49:37 prlw1 Exp $ +# $NetBSD: suppress_installation.mk,v 1.2 2013/05/23 15:02:53 joerg Exp $ # Makefile snippet to be included by freeciv-client and freeciv-server to # prevent files installed by freeciv-share from being installed again. @@ -14,3 +14,15 @@ SUBST_STAGE.installfix= pre-configure 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. + +SUBST_CLASSES+= installmanfix2 +SUBST_STAGE.installmanfix2= post-configure +SUBST_FILES.installmanfix2= Makefile +SUBST_SED.installmanfix2+= -e 's|po doc||g' +SUBST_MESSAGE.installmanfix2= Suppressing installation of man pages and localization files already in freeciv-share. + +SUBST_CLASSES+= installfix2 +SUBST_STAGE.installfix2= post-configure +SUBST_FILES.installfix2= common/Makefile +SUBST_SED.installfix2+= -e 's|^install-exec-am: install-libLTLIBRARIES|install-exec-am: \# install-libLTLIBRARIES|' +SUBST_MESSAGE.installfix2= Suppressing installation of libs already in freeciv-share. |