Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 23 Oct 2012 17:09:04 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r306319 - in head: archivers/hlextract games/hllib
Message-ID:  <201210231709.q9NH94uJ016259@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Tue Oct 23 17:09:04 2012
New Revision: 306319
URL: http://svn.freebsd.org/changeset/ports/306319

Log:
  Update HLLib and HLExtract ports to version 2.4.3, which had added support
  for new VPK file format (v2), SGA format (v4.0/5.0), and ZIP deflate mode.
  
  Feature safe:	yes

Modified:
  head/archivers/hlextract/Makefile
  head/archivers/hlextract/distinfo
  head/archivers/hlextract/pkg-descr
  head/games/hllib/Makefile
  head/games/hllib/distinfo
  head/games/hllib/pkg-descr

Modified: head/archivers/hlextract/Makefile
==============================================================================
--- head/archivers/hlextract/Makefile	Tue Oct 23 17:05:07 2012	(r306318)
+++ head/archivers/hlextract/Makefile	Tue Oct 23 17:09:04 2012	(r306319)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	HLExtract
-# Date created:				22 Oct 2007
-# Whom:					Alexey Dokuchaev <danfe@FreeBSD.org>
-#
+# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	hlextract
-PORTVERSION=	2.4.2
+PORTVERSION=	2.4.3
 CATEGORIES=	archivers games
 MASTER_SITES=	http://nemesis.thewavelength.net/files/files/
 DISTNAME=	hllib${PORTVERSION:S/.//g}
@@ -19,7 +15,6 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	hl:${PORTSDIR}/games/hllib
 
 USE_ZIP=	yes
-USE_DOS2UNIX=	Main.c
 WRKSRC=		${WRKDIR}/HLExtract
 
 PLIST_FILES=	bin/${PORTNAME}

Modified: head/archivers/hlextract/distinfo
==============================================================================
--- head/archivers/hlextract/distinfo	Tue Oct 23 17:05:07 2012	(r306318)
+++ head/archivers/hlextract/distinfo	Tue Oct 23 17:09:04 2012	(r306319)
@@ -1,2 +1,2 @@
-SHA256 (hllib242.zip) = b307992c22ae67d00fbecf96e5213ac56737301ff3e7cd259214adbd132c83d9
-SIZE (hllib242.zip) = 536704
+SHA256 (hllib243.zip) = 2eafa706ab4cccea0c9966f45e5eabf4bad27b5b4b224cc6592ba68debd54ae0
+SIZE (hllib243.zip) = 591480

Modified: head/archivers/hlextract/pkg-descr
==============================================================================
--- head/archivers/hlextract/pkg-descr	Tue Oct 23 17:05:07 2012	(r306318)
+++ head/archivers/hlextract/pkg-descr	Tue Oct 23 17:09:04 2012	(r306319)
@@ -1,6 +1,6 @@
 HLExtract is a command line utility written in C that can load all HLLib
 supported packages and extract multiple items from them while maintaining
-their directory structure.  Currently, BSP, GCF, NCF, PAK, VPK, WAD, XZP,
-and uncompressed ZIP package formats are supported.
+their directory structure.  Currently, BSP, GCF, NCF, PAK, SGA, VPK, WAD,
+XZP, and ZIP (store/deflate) package formats are supported.
 
 WWW: http://nemesis.thewavelength.net/index.php?p=35

Modified: head/games/hllib/Makefile
==============================================================================
--- head/games/hllib/Makefile	Tue Oct 23 17:05:07 2012	(r306318)
+++ head/games/hllib/Makefile	Tue Oct 23 17:09:04 2012	(r306319)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	HLLib
-# Date created:				22 Oct 2007
-# Whom:					Alexey Dokuchaev <danfe@FreeBSD.org>
-#
+# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	hllib
-PORTVERSION=	2.4.2
+PORTVERSION=	2.4.3
 CATEGORIES=	games devel
 MASTER_SITES=	http://nemesis.thewavelength.net/files/files/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
@@ -17,10 +13,10 @@ COMMENT=	Library to work with various Ha
 LICENSE=	LGPL21
 
 USE_ZIP=	yes
-USE_DOS2UNIX=	Makefile
+USE_DOS2UNIX=	Makefile			# required by make(1)
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/HLLib
-CFLAGS+=	-fpic
+CFLAGS+=	-fpic -DUSE_ZLIB
 
 HLLIB_VERS=	2.3.0
 PLIST_FILES=	include/hl.h lib/libhl.so.${HLLIB_VERS} \
@@ -30,5 +26,12 @@ post-patch:
 # Allow propagating of CXX, CXXFLAGS, and PREFIX; fix Linuxism and symlinks
 	@${REINPLACE_CMD} -E 's,^([CP][^=]*)=,\1?=, ; s,g root,g wheel, ; \
 		s,s \$$\(PREFIX\)/lib/,s ,' ${WRKSRC}/Makefile
+# Add forgotten file to the source list so it would be picked up by linker
+	@${REINPLACE_CMD} -e 's,ProcStream\.cpp,& SGAFile.cpp,' \
+		${WRKSRC}/Makefile
+# Remove two lines of code that offend C++ compiler
+	@${REINPLACE_CMD} -e '/friend CSGADirectory/d' ${WRKSRC}/SGAFile.h
+# Add missing -lz
+	@${REINPLACE_CMD} -e '/$$(LDFLAGS)/s,$$, -lz,' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>

Modified: head/games/hllib/distinfo
==============================================================================
--- head/games/hllib/distinfo	Tue Oct 23 17:05:07 2012	(r306318)
+++ head/games/hllib/distinfo	Tue Oct 23 17:09:04 2012	(r306319)
@@ -1,2 +1,2 @@
-SHA256 (hllib242.zip) = b307992c22ae67d00fbecf96e5213ac56737301ff3e7cd259214adbd132c83d9
-SIZE (hllib242.zip) = 536704
+SHA256 (hllib243.zip) = 2eafa706ab4cccea0c9966f45e5eabf4bad27b5b4b224cc6592ba68debd54ae0
+SIZE (hllib243.zip) = 591480

Modified: head/games/hllib/pkg-descr
==============================================================================
--- head/games/hllib/pkg-descr	Tue Oct 23 17:05:07 2012	(r306318)
+++ head/games/hllib/pkg-descr	Tue Oct 23 17:09:04 2012	(r306319)
@@ -3,7 +3,7 @@ formats and provides a simple interface 
 in native C++ but exposes both a C and C++ interfaces which can be used in
 any C or C++ application (additional languages may also use the library with
 standard C imports).  HLLib works natively in both Windows and *nix.  BSP,
-GCF, NCF, PAK, VPK, WAD, XZP, and uncompressed ZIP package formats are
-supported.
+GCF, NCF, PAK, SGA, VPK, WAD, XZP, and ZIP (store/deflate) package formats
+are supported.
 
 WWW: http://nemesis.thewavelength.net/index.php?p=35



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210231709.q9NH94uJ016259>