diff options
author | edwin <edwin@FreeBSD.org> | 2004-11-22 08:42:41 +0800 |
---|---|---|
committer | edwin <edwin@FreeBSD.org> | 2004-11-22 08:42:41 +0800 |
commit | 301cb0ae2d43ce22beaff2dc811c097124990cfb (patch) | |
tree | d53df61bb34ca51e49c2f051ab310393cc05f10e /games/enigma/files | |
parent | 64abf4678c654a330bff3e6a1d958b87a9914f08 (diff) | |
download | freebsd-ports-gnome-301cb0ae2d43ce22beaff2dc811c097124990cfb.tar.gz freebsd-ports-gnome-301cb0ae2d43ce22beaff2dc811c097124990cfb.tar.zst freebsd-ports-gnome-301cb0ae2d43ce22beaff2dc811c097124990cfb.zip |
Don't use enigma's zipios++ and lua4 but the one from the FreeBSD
ports collection.
Diffstat (limited to 'games/enigma/files')
-rw-r--r-- | games/enigma/files/patch-configure | 39 | ||||
-rw-r--r-- | games/enigma/files/patch-lib-src::Makefile.am | 5 | ||||
-rw-r--r-- | games/enigma/files/patch-lib-src::Makefile.in | 11 | ||||
-rw-r--r-- | games/enigma/files/patch-src::Makefile.am | 26 | ||||
-rw-r--r-- | games/enigma/files/patch-src::Makefile.in | 42 | ||||
-rw-r--r-- | games/enigma/files/patch-src::display-lua.cc | 20 | ||||
-rw-r--r-- | games/enigma/files/patch-src::editor-lua.cc | 29 | ||||
-rw-r--r-- | games/enigma/files/patch-tools::Makefile.in | 11 |
8 files changed, 183 insertions, 0 deletions
diff --git a/games/enigma/files/patch-configure b/games/enigma/files/patch-configure new file mode 100644 index 000000000000..4a684875a754 --- /dev/null +++ b/games/enigma/files/patch-configure @@ -0,0 +1,39 @@ +--- configure.orig Mon Nov 22 10:30:20 2004 ++++ configure Mon Nov 22 10:32:52 2004 +@@ -309,7 +309,6 @@ + # include <unistd.h> + #endif" + +-ac_subdirs_all="$ac_subdirs_all lib-src/zipios++" + ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB CPP EGREP ALLOCA GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MINGW32_TRUE MINGW32_FALSE WINDRES TEXI2HTML TOLUA SDL_CONFIG SDL_CFLAGS SDL_LIBS HAVESDLTTF_TRUE HAVESDLTTF_FALSE BUILDTOOLS_TRUE BUILDTOOLS_FALSE BUILDTTF2BMF_TRUE BUILDTTF2BMF_FALSE subdirs LIBOBJS LTLIBOBJS' + ac_subst_files='' + +@@ -11386,7 +11385,7 @@ + + + +-TOLUA="\$(top_builddir)/tools/tolua" ++TOLUA="${LOCALBASE}/bin/tolua" + + + # Check whether --with-sdl-prefix or --without-sdl-prefix was given. +@@ -12215,10 +12214,9 @@ + + + +-subdirs="$subdirs lib-src/zipios++" + + +- ac_config_files="$ac_config_files Makefile m4/Makefile intl/Makefile data/Makefile data/gfx/Makefile data/gfx32/Makefile data/gfx40/Makefile data/gfx48/Makefile data/levels/Makefile data/levels/Sokoban/Makefile data/levels/m_tutor/Makefile data/levels/patches/Makefile data/fonts/Makefile data/sound/Makefile data/thumbs/Makefile doc/Makefile doc/manual/Makefile doc/manual/images/Makefile doc/refman/Makefile etc/Makefile lib-src/Makefile lib-src/oxydlib/Makefile lib-src/lua/Makefile src/Makefile src/px/Makefile tools/Makefile etc/enigma.spec etc/mingw32-dist.sh etc/enigma.nsi po/Makefile.in" ++ ac_config_files="$ac_config_files Makefile m4/Makefile intl/Makefile data/Makefile data/gfx/Makefile data/gfx32/Makefile data/gfx40/Makefile data/gfx48/Makefile data/levels/Makefile data/levels/Sokoban/Makefile data/levels/m_tutor/Makefile data/levels/patches/Makefile data/fonts/Makefile data/sound/Makefile data/thumbs/Makefile doc/Makefile doc/manual/Makefile doc/manual/images/Makefile doc/refman/Makefile etc/Makefile lib-src/Makefile lib-src/oxydlib/Makefile src/Makefile src/px/Makefile tools/Makefile etc/enigma.spec etc/mingw32-dist.sh etc/enigma.nsi po/Makefile.in" + + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure +@@ -12840,7 +12838,6 @@ + "etc/Makefile" ) CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;; + "lib-src/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib-src/Makefile" ;; + "lib-src/oxydlib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib-src/oxydlib/Makefile" ;; +- "lib-src/lua/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib-src/lua/Makefile" ;; + "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; + "src/px/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/px/Makefile" ;; + "tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; diff --git a/games/enigma/files/patch-lib-src::Makefile.am b/games/enigma/files/patch-lib-src::Makefile.am new file mode 100644 index 000000000000..8af692b96f44 --- /dev/null +++ b/games/enigma/files/patch-lib-src::Makefile.am @@ -0,0 +1,5 @@ +--- lib-src/Makefile.am.orig Mon Nov 22 10:29:58 2004 ++++ lib-src/Makefile.am Mon Nov 22 10:30:03 2004 +@@ -1 +1 @@ +-SUBDIRS = oxydlib lua zipios++ ++SUBDIRS = oxydlib diff --git a/games/enigma/files/patch-lib-src::Makefile.in b/games/enigma/files/patch-lib-src::Makefile.in new file mode 100644 index 000000000000..dd783d64c4bf --- /dev/null +++ b/games/enigma/files/patch-lib-src::Makefile.in @@ -0,0 +1,11 @@ +--- lib-src/Makefile.in.orig Mon Nov 22 10:30:05 2004 ++++ lib-src/Makefile.in Mon Nov 22 10:30:13 2004 +@@ -166,7 +166,7 @@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ +-SUBDIRS = oxydlib lua zipios++ ++SUBDIRS = oxydlib + subdir = lib-src + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/games/enigma/files/patch-src::Makefile.am b/games/enigma/files/patch-src::Makefile.am new file mode 100644 index 000000000000..0b58cc7abca8 --- /dev/null +++ b/games/enigma/files/patch-src::Makefile.am @@ -0,0 +1,26 @@ +--- src/Makefile.am.orig Wed Nov 3 20:55:11 2004 ++++ src/Makefile.am Mon Nov 22 10:48:31 2004 +@@ -78,10 +78,7 @@ + + + enigma_CXXFLAGS = @SDL_CFLAGS@ -DLOCALEDIR=\"$(localedir)\" \ +- -I$(top_srcdir)/lib-src/zipios++ \ +- -I$(top_builddir)/lib-src/zipios++ \ +- -I$(top_srcdir)/lib-src/lua \ +- -I$(top_srcdir)/lib-src \ ++ -I$(top_builddir)/lib-src \ + -I$(top_builddir)/intl + + enigma_LIBS = @SDL_LIBS@ +@@ -89,9 +86,9 @@ + + enigma_LDADD = @LIBINTL@ \ + px/libpx.a \ +- $(top_builddir)/lib-src/lua/liblua.a \ ++ -llua -llualib -ltolua \ + $(top_builddir)/lib-src/oxydlib/liboxyd.a \ +- $(top_builddir)/lib-src/zipios++/src/libzipios.a \ ++ -lzipios \ + -lz \ + $(mingw_ldadd) + diff --git a/games/enigma/files/patch-src::Makefile.in b/games/enigma/files/patch-src::Makefile.in new file mode 100644 index 000000000000..f410188fbfef --- /dev/null +++ b/games/enigma/files/patch-src::Makefile.in @@ -0,0 +1,42 @@ +--- src/Makefile.in.orig Wed Nov 3 23:12:18 2004 ++++ src/Makefile.in Mon Nov 22 11:10:18 2004 +@@ -241,10 +241,7 @@ + @MINGW32_TRUE@mingw_ldadd = enigma_ico.o -lws2_32 + + enigma_CXXFLAGS = @SDL_CFLAGS@ -DLOCALEDIR=\"$(localedir)\" \ +- -I$(top_srcdir)/lib-src/zipios++ \ +- -I$(top_builddir)/lib-src/zipios++ \ +- -I$(top_srcdir)/lib-src/lua \ +- -I$(top_srcdir)/lib-src \ ++ -I$(top_builddir)/lib-src \ + -I$(top_builddir)/intl + + +@@ -252,9 +249,9 @@ + + enigma_LDADD = @LIBINTL@ \ + px/libpx.a \ +- $(top_builddir)/lib-src/lua/liblua.a \ ++ -llua -llualib -ltolua \ + $(top_builddir)/lib-src/oxydlib/liboxyd.a \ +- $(top_builddir)/lib-src/zipios++/src/libzipios.a \ ++ -lzipios \ + -lz \ + $(mingw_ldadd) + +@@ -294,14 +291,11 @@ + enigma-video.$(OBJEXT) enigma-world.$(OBJEXT) + enigma_OBJECTS = $(am_enigma_OBJECTS) + @MINGW32_TRUE@enigma_DEPENDENCIES = px/libpx.a \ +-@MINGW32_TRUE@ $(top_builddir)/lib-src/lua/liblua.a \ + @MINGW32_TRUE@ $(top_builddir)/lib-src/oxydlib/liboxyd.a \ +-@MINGW32_TRUE@ $(top_builddir)/lib-src/zipios++/src/libzipios.a \ + @MINGW32_TRUE@ enigma_ico.o + @MINGW32_FALSE@enigma_DEPENDENCIES = px/libpx.a \ +-@MINGW32_FALSE@ $(top_builddir)/lib-src/lua/liblua.a \ + @MINGW32_FALSE@ $(top_builddir)/lib-src/oxydlib/liboxyd.a \ +-@MINGW32_FALSE@ $(top_builddir)/lib-src/zipios++/src/libzipios.a ++ + enigma_LDFLAGS = + + DEFAULT_INCLUDES = -I. -I$(srcdir) -I. diff --git a/games/enigma/files/patch-src::display-lua.cc b/games/enigma/files/patch-src::display-lua.cc new file mode 100644 index 000000000000..5f433f37bd7a --- /dev/null +++ b/games/enigma/files/patch-src::display-lua.cc @@ -0,0 +1,20 @@ +--- src/display-lua.cc.orig Mon Nov 22 10:42:13 2004 ++++ src/display-lua.cc Mon Nov 22 10:42:49 2004 +@@ -201,7 +201,7 @@ + { + int i; + for(i=0; i<n;i++) +- tolua_pushfieldstring(tolua_S,3,i+1,(const char*) names[i]); ++ tolua_pushfieldstring(tolua_S,3,i+1,(char*) names[i]); + } + free(names); + } +@@ -267,7 +267,7 @@ + { + int i; + for(i=0; i<n;i++) +- tolua_pushfieldstring(tolua_S,3,i+1,(const char*) images[i]); ++ tolua_pushfieldstring(tolua_S,3,i+1,(char*) images[i]); + } + free(images); + } diff --git a/games/enigma/files/patch-src::editor-lua.cc b/games/enigma/files/patch-src::editor-lua.cc new file mode 100644 index 000000000000..da5096bc4863 --- /dev/null +++ b/games/enigma/files/patch-src::editor-lua.cc @@ -0,0 +1,29 @@ +--- src/editor-lua.cc.orig Mon Nov 22 10:43:09 2004 ++++ src/editor-lua.cc Mon Nov 22 10:43:21 2004 +@@ -50,7 +50,7 @@ + { + int i; + for(i=0; i<nentries;i++) +- tolua_pushfieldstring(tolua_S,4,i+1,(const char*) entries[i]); ++ tolua_pushfieldstring(tolua_S,4,i+1,(char*) entries[i]); + } + free(entries); + } +@@ -93,7 +93,7 @@ + { + int i; + for(i=0; i<nentries;i++) +- tolua_pushfieldstring(tolua_S,4,i+1,(const char*) entries[i]); ++ tolua_pushfieldstring(tolua_S,4,i+1,(char*) entries[i]); + } + free(entries); + } +@@ -136,7 +136,7 @@ + { + int i; + for(i=0; i<nentries;i++) +- tolua_pushfieldstring(tolua_S,4,i+1,(const char*) entries[i]); ++ tolua_pushfieldstring(tolua_S,4,i+1,(char*) entries[i]); + } + free(entries); + } diff --git a/games/enigma/files/patch-tools::Makefile.in b/games/enigma/files/patch-tools::Makefile.in new file mode 100644 index 000000000000..08f069e76667 --- /dev/null +++ b/games/enigma/files/patch-tools::Makefile.in @@ -0,0 +1,11 @@ +--- tools/Makefile.in.orig Mon Nov 22 10:35:56 2004 ++++ tools/Makefile.in Mon Nov 22 10:36:11 2004 +@@ -181,7 +181,7 @@ + + tolua_SOURCES = tolua.c tolualua.c tolualua.h + tolua_CFLAGS = -I$(top_srcdir)/lib-src/lua +-tolua_LDADD = -L$(top_builddir)/lib-src/lua -llua ++tolua_LDADD = -L$(top_builddir)/lib-src/lua -llua -llualib -ltolua + subdir = tools + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |