Unbreak using bundled zipios++

5 files changed, 35 insertions, 33 deletions

diff --git a/games/enigma/Makefile b/games/enigma/Makefile
index a264bbe2255f..bfdc8f45b5eb 100644
--- a/games/enigma/Makefile
+++ b/games/enigma/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	enigma
 PORTVERSION=	1.01
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	games
 MASTER_SITES=	BERLIOS/enigma-game
 DISTNAME=	${PORTNAME}-${PORTVERSION}-64bit
@@ -15,10 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-64bit
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Enigma is a reimplementation of Oxyd, a puzzle game
 
-BROKEN=		zipios++ has gone
-
-LIB_DEPENDS=	zipios.0:${PORTSDIR}/archivers/zipios++ \
-		xerces-c.27:${PORTSDIR}/textproc/xerces-c2
+LIB_DEPENDS=	xerces-c.27:${PORTSDIR}/textproc/xerces-c2
 BUILD_DEPENDS=	${LOCALBASE}/lib/libenet.a:${PORTSDIR}/net/enet
 
 USE_GMAKE=	yes
@@ -50,7 +47,7 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-extract:
-	@${RM} -rf ${WRKSRC}/lib-src/lua ${WRKSRC}/lib-src/zipios++ \
+	@${RM} -rf ${WRKSRC}/lib-src/lua \
 		${WRKSRC}/lib-src/enet ${WRKSRC}/tools ${WRKSRC}/intl
 
 post-patch:
diff --git a/games/enigma/files/patch-Makefile.in b/games/enigma/files/patch-Makefile.in
index 70786f804a6b..f3a9798ac749 100644
--- a/games/enigma/files/patch-Makefile.in
+++ b/games/enigma/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2007-09-08 16:39:17.000000000 +0400
-+++ Makefile.in	2008-08-07 03:44:02.000000000 +0400
-@@ -246,7 +246,7 @@
+--- Makefile.in.orig	2007-09-08 14:39:17.000000000 +0200
++++ Makefile.in	2011-08-01 09:52:47.000000000 +0200
+@@ -246,7 +246,7 @@ target_vendor = @target_vendor@
  #   tools -> lib-src/lua
  #   src   -> tools, lib-src
  #
@@ -9,3 +9,12 @@
  EXTRA_DIST = enigma CHANGES ACKNOWLEDGEMENTS
  doc_DATA = README CHANGES COPYING ACKNOWLEDGEMENTS
  ACLOCAL_AMFLAGS = -I m4
+@@ -633,7 +633,7 @@ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am: install-docDATA
++install-data-am: 
+ 
+ install-exec-am:
+ 
diff --git a/games/enigma/files/patch-configure b/games/enigma/files/patch-configure
index 926776d7bf6e..f00786cbde2d 100644
--- a/games/enigma/files/patch-configure
+++ b/games/enigma/files/patch-configure
@@ -1,29 +1,29 @@
---- configure.orig	2007-09-08 16:39:18.000000000 +0400
-+++ configure	2008-08-08 00:42:40.000000000 +0400
-@@ -753,8 +753,6 @@
+--- configure.orig	2007-09-08 14:39:18.000000000 +0200
++++ configure	2011-08-01 09:59:45.000000000 +0200
+@@ -753,8 +753,7 @@ CPP
  CXX
  CXXFLAGS
  CCC'
 -ac_subdirs_all='lib-src/zipios++
 -lib-src/enet'
++ac_subdirs_all='lib-src/zipios++'
  
  # Initialize some variables set by options.
  ac_init_help=
-@@ -15277,12 +15275,10 @@
- echo "${ECHO_T}no" >&6; }
- fi
+@@ -15279,10 +15278,10 @@ fi
  
--subdirs="$subdirs lib-src/zipios++"
+ subdirs="$subdirs lib-src/zipios++"
  
 -subdirs="$subdirs lib-src/enet"
  
  
 -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/enigma_tutorial/Makefile data/levels/enigma_i/Makefile data/levels/enigma_ii/Makefile data/levels/enigma_iii/Makefile data/levels/enigma_iv/Makefile data/levels/enigma_v/Makefile data/levels/enigma_vi/Makefile data/levels/enigma_vii/Makefile data/levels/enigma_cross/Makefile data/levels/enigma_esprit/Makefile data/levels/enigma_oxyd/Makefile data/levels/enigma_peroxyd/Makefile data/levels/enigma_oxydmagnum/Makefile data/levels/enigma_oxydextra/Makefile data/levels/enigma_experimental/Makefile data/levels/enigma_stable/Makefile data/levels/enigma_sokoban/Makefile data/levels/enigma_microban/Makefile data/levels/enigma_mas_microban/Makefile data/levels/lib/Makefile data/levels/patches/Makefile data/fonts/Makefile data/sound/Makefile data/soundsets/Makefile data/soundsets/enigma/Makefile data/schemas/Makefile doc/Makefile doc/images/Makefile doc/images/flags25x15/Makefile doc/manual/Makefile doc/manual/images/Makefile doc/reference/Makefile doc/reference/images/Makefile etc/Makefile lib-src/Makefile lib-src/oxydlib/Makefile lib-src/lua/Makefile lib-src/enigma-core/Makefile src/Makefile tools/Makefile etc/enigma.spec etc/enigma.nsi etc/Info.plist po/Makefile.in"
++
 +ac_config_files="$ac_config_files Makefile m4/Makefile data/Makefile data/gfx/Makefile data/gfx32/Makefile data/gfx40/Makefile data/gfx48/Makefile data/levels/Makefile data/levels/enigma_tutorial/Makefile data/levels/enigma_i/Makefile data/levels/enigma_ii/Makefile data/levels/enigma_iii/Makefile data/levels/enigma_iv/Makefile data/levels/enigma_v/Makefile data/levels/enigma_vi/Makefile data/levels/enigma_vii/Makefile data/levels/enigma_cross/Makefile data/levels/enigma_esprit/Makefile data/levels/enigma_oxyd/Makefile data/levels/enigma_peroxyd/Makefile data/levels/enigma_oxydmagnum/Makefile data/levels/enigma_oxydextra/Makefile data/levels/enigma_experimental/Makefile data/levels/enigma_stable/Makefile data/levels/enigma_sokoban/Makefile data/levels/enigma_microban/Makefile data/levels/enigma_mas_microban/Makefile data/levels/lib/Makefile data/levels/patches/Makefile data/fonts/Makefile data/sound/Makefile data/soundsets/Makefile data/soundsets/enigma/Makefile data/schemas/Makefile doc/Makefile doc/images/Makefile doc/images/flags25x15/Makefile doc/manual/Makefile doc/manual/images/Makefile doc/reference/Makefile doc/reference/images/Makefile etc/Makefile lib-src/Makefile lib-src/oxydlib/Makefile lib-src/enigma-core/Makefile src/Makefile etc/enigma.spec etc/enigma.nsi etc/Info.plist po/Makefile.in"
  
  
  ac_config_files="$ac_config_files etc/mingw32-dist.sh"
-@@ -15912,7 +15908,6 @@
+@@ -15912,7 +15911,6 @@ do
      "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
      "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
      "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
@@ -31,7 +31,7 @@
      "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
      "data/gfx/Makefile") CONFIG_FILES="$CONFIG_FILES data/gfx/Makefile" ;;
      "data/gfx32/Makefile") CONFIG_FILES="$CONFIG_FILES data/gfx32/Makefile" ;;
-@@ -15955,10 +15950,8 @@
+@@ -15955,10 +15953,8 @@ do
      "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" ;;
diff --git a/games/enigma/files/patch-lib-src::Makefile.in b/games/enigma/files/patch-lib-src::Makefile.in
index bec03ceeaf97..c543742145ad 100644
--- a/games/enigma/files/patch-lib-src::Makefile.in
+++ b/games/enigma/files/patch-lib-src::Makefile.in
@@ -1,11 +1,11 @@
---- lib-src/Makefile.in.orig	2007-09-08 16:39:16.000000000 +0400
-+++ lib-src/Makefile.in	2008-08-07 02:24:04.000000000 +0400
-@@ -214,7 +214,7 @@
+--- lib-src/Makefile.in.orig	2007-09-08 14:39:16.000000000 +0200
++++ lib-src/Makefile.in	2011-08-01 08:48:34.000000000 +0200
+@@ -214,7 +214,7 @@ target_alias = @target_alias@
  target_cpu = @target_cpu@
  target_os = @target_os@
  target_vendor = @target_vendor@
 -SUBDIRS = oxydlib lua zipios++ enet enigma-core
-+SUBDIRS = oxydlib enigma-core
++SUBDIRS = oxydlib zipios++ enigma-core
  all: all-recursive
  
  .SUFFIXES:
diff --git a/games/enigma/files/patch-src::Makefile.in b/games/enigma/files/patch-src::Makefile.in
index 2708c100a1e5..43d689cfb0c7 100644
--- a/games/enigma/files/patch-src::Makefile.in
+++ b/games/enigma/files/patch-src::Makefile.in
@@ -1,25 +1,21 @@
---- src/Makefile.in.orig	2007-09-08 16:39:17.000000000 +0400
-+++ src/Makefile.in	2008-08-07 03:46:26.000000000 +0400
-@@ -98,10 +98,7 @@
+--- src/Makefile.in.orig	2007-09-08 14:39:17.000000000 +0200
++++ src/Makefile.in	2011-08-01 08:49:09.000000000 +0200
+@@ -98,8 +98,6 @@ am_enigma_OBJECTS = actors.$(OBJEXT) cli
  enigma_OBJECTS = $(am_enigma_OBJECTS)
  @MINGW32_TRUE@am__DEPENDENCIES_1 = enigma_ico.o
  enigma_DEPENDENCIES = $(top_builddir)/lib-src/enigma-core/libecl.a \
 -	$(top_builddir)/lib-src/lua/liblua.a \
 -	$(top_builddir)/lib-src/enet/libenet.a \
  	$(top_builddir)/lib-src/oxydlib/liboxyd.a \
--	$(top_builddir)/lib-src/zipios++/src/libzipios.a \
+ 	$(top_builddir)/lib-src/zipios++/src/libzipios.a \
  	$(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
- depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -446,10 +443,8 @@
+@@ -446,8 +444,7 @@ enigma_SOURCES = \
  enigma_LDADD = \
  	@LIBINTL@ \
  	$(top_builddir)/lib-src/enigma-core/libecl.a \
 -	$(top_builddir)/lib-src/lua/liblua.a \
 -	$(top_builddir)/lib-src/enet/libenet.a \
-+	-llua -ltolua++ -lenet -lzipios \
++	-llua -ltolua++ -lenet \
  	$(top_builddir)/lib-src/oxydlib/liboxyd.a \
--	$(top_builddir)/lib-src/zipios++/src/libzipios.a \
+ 	$(top_builddir)/lib-src/zipios++/src/libzipios.a \
  	-lz \
- 	$(mingw_ldadd) \
- 	@SDL_LIBS@