View | Details | Raw Unified | Return to bug 176040
Collapse All | Expand All

(-)Makefile (-4 / +8 lines)
Lines 2-24 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	hllib
4
PORTNAME=	hllib
5
PORTVERSION=	2.4.3
5
PORTVERSION=	2.4.4
6
CATEGORIES=	games devel
6
CATEGORIES=	games devel
7
MASTER_SITES=	http://nemesis.thewavelength.net/files/files/
7
MASTER_SITES=	http://nemesis.thewavelength.net/files/files/
8
DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
8
DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
9
9
10
MAINTAINER=	ports@FreeBSD.org
10
MAINTAINER=	danilogondolfo@gmail.com
11
COMMENT=	Library to work with various Half-Life file formats
11
COMMENT=	Library to work with various Half-Life file formats
12
12
13
LICENSE=	LGPL21
13
LICENSE=	LGPL21
14
14
15
USE_ZIP=	yes
15
USE_ZIP=	yes
16
USE_DOS2UNIX=	Makefile			# required by make(1)
16
USE_DOS2UNIX=	Makefile
17
USE_LDCONFIG=	yes
17
USE_LDCONFIG=	yes
18
WRKSRC=		${WRKDIR}/HLLib
18
WRKSRC=		${WRKDIR}/HLLib
19
CFLAGS+=	-fpic -DUSE_ZLIB
19
CFLAGS+=	-fpic -DUSE_ZLIB
20
20
21
HLLIB_VERS=	2.3.0
21
PATCH_WRKSRC=	${WRKDIR}
22
23
HLLIB_VERS=	2.4.4
22
PLIST_FILES=	include/hl.h lib/libhl.so.${HLLIB_VERS} \
24
PLIST_FILES=	include/hl.h lib/libhl.so.${HLLIB_VERS} \
23
		lib/libhl.so.2 lib/libhl.so
25
		lib/libhl.so.2 lib/libhl.so
24
26
Lines 33-37 Link Here
33
	@${REINPLACE_CMD} -e '/friend CSGADirectory/d' ${WRKSRC}/SGAFile.h
35
	@${REINPLACE_CMD} -e '/friend CSGADirectory/d' ${WRKSRC}/SGAFile.h
34
# Add missing -lz
36
# Add missing -lz
35
	@${REINPLACE_CMD} -e '/$$(LDFLAGS)/s,$$, -lz,' ${WRKSRC}/Makefile
37
	@${REINPLACE_CMD} -e '/$$(LDFLAGS)/s,$$, -lz,' ${WRKSRC}/Makefile
38
# Fix library version
39
	@${REINPLACE_CMD} -e 's/2\.3\.0/2\.4\.4/' ${WRKSRC}/Makefile
36
40
37
.include <bsd.port.mk>
41
.include <bsd.port.mk>
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (hllib243.zip) = 2eafa706ab4cccea0c9966f45e5eabf4bad27b5b4b224cc6592ba68debd54ae0
1
SHA256 (hllib244.zip) = cb94da1c32e9577dce1aa2bbb77f283212684afcd7814d42228c9ffff71d3699
2
SIZE (hllib243.zip) = 591480
2
SIZE (hllib244.zip) = 593745
(-)files/patch-.__HLLib__BSPFile.cpp (+19 lines)
Line 0 Link Here
1
--- ../orig/HLLib/BSPFile.cpp	2010-10-31 22:48:46.000000000 -0200
2
+++ ./HLLib/BSPFile.cpp	2013-02-11 17:56:51.271215107 -0200
3
@@ -203,10 +203,14 @@
4
 						hlAttributeSetUnsignedInteger(&Attribute, this->lpItemAttributeNames[eAttribute], uiPaletteSize, hlFalse);
5
 						return hlTrue;
6
 					}
7
+					default:
8
+						;
9
 				}
10
 			}
11
 			break;
12
 		}
13
+		default:
14
+			;
15
 	}
16
 
17
 	return hlFalse;
18
Only in ./HLLib: BSPFile.cpp.orig
19
diff -ru ../orig/HLLib/DirectoryFolder.cpp ./HLLib/DirectoryFolder.cpp
(-)files/patch-.__HLLib__DirectoryFolder.cpp (+58 lines)
Line 0 Link Here
1
--- ../orig/HLLib/DirectoryFolder.cpp	2012-09-17 20:16:52.000000000 -0300
2
+++ ./HLLib/DirectoryFolder.cpp	2013-02-11 17:56:51.275211034 -0200
3
@@ -517,6 +517,8 @@
4
 		case HL_ITEM_FILE:
5
 			uiSize += static_cast<const CDirectoryFile *>(pItem)->GetSize();
6
 			break;
7
+		default:
8
+			;
9
 		}
10
 	}
11
 
12
@@ -541,6 +543,8 @@
13
 		case HL_ITEM_FILE:
14
 			uiSize += static_cast<hlULongLong>(static_cast<const CDirectoryFile *>(pItem)->GetSize());
15
 			break;
16
+		default:
17
+			;
18
 		}
19
 	}
20
 
21
@@ -565,6 +569,8 @@
22
 		case HL_ITEM_FILE:
23
 			uiSize += static_cast<const CDirectoryFile *>(pItem)->GetSizeOnDisk();
24
 			break;
25
+		default:
26
+			;
27
 		}
28
 	}
29
 
30
@@ -589,6 +595,8 @@
31
 		case HL_ITEM_FILE:
32
 			uiSize += static_cast<hlULongLong>(static_cast<const CDirectoryFile *>(pItem)->GetSizeOnDisk());
33
 			break;
34
+		default:
35
+			;
36
 		}
37
 	}
38
 
39
@@ -611,6 +619,8 @@
40
 				uiCount += static_cast<const CDirectoryFolder *>(pItem)->GetFolderCount(bRecurse);
41
 			}
42
 			break;
43
+		default:
44
+			;
45
 		}
46
 	}
47
 
48
@@ -635,6 +645,8 @@
49
 		case HL_ITEM_FILE:
50
 			uiCount++;
51
 			break;
52
+		default:
53
+			;
54
 		}
55
 	}
56
 
57
Only in ./HLLib: DirectoryFolder.cpp.orig
58
diff -ru ../orig/HLLib/Error.cpp ./HLLib/Error.cpp
(-)files/patch-.__HLLib__Error.cpp (+12 lines)
Line 0 Link Here
1
--- ../orig/HLLib/Error.cpp	2010-04-17 13:48:52.000000000 -0300
2
+++ ./HLLib/Error.cpp	2013-02-11 18:00:09.931600402 -0200
3
@@ -139,7 +139,7 @@
4
 
5
 		hlUInt uiLength = (hlUInt)strlen(this->lpSystemError);
6
 
7
-		while(uiLength >= 0 && isspace(this->lpSystemError[uiLength - 1]))
8
+		while(isspace(this->lpSystemError[uiLength - 1]))
9
 		{
10
 			uiLength--;
11
 		}
12
diff -ru ../orig/HLLib/FileStream.cpp ./HLLib/FileStream.cpp
(-)files/patch-.__HLLib__FileStream.cpp (+13 lines)
Line 0 Link Here
1
--- ../orig/HLLib/FileStream.cpp	2010-10-28 20:41:26.000000000 -0200
2
+++ ./HLLib/FileStream.cpp	2013-02-11 17:56:51.278212203 -0200
3
@@ -216,6 +216,8 @@
4
 	case HL_SEEK_END:
5
 		iMode = SEEK_END;
6
 		break;
7
+	default:
8
+		;
9
 	}
10
 
11
 	return (hlUInt)lseek(this->iFile, iOffset, iMode);
12
Only in ./HLLib: FileStream.cpp.orig
13
diff -ru ../orig/HLLib/GCFFile.cpp ./HLLib/GCFFile.cpp
(-)files/patch-.__HLLib__GCFFile.cpp (+27 lines)
Line 0 Link Here
1
--- ../orig/HLLib/GCFFile.cpp	2010-11-01 20:56:16.000000000 -0200
2
+++ ./HLLib/GCFFile.cpp	2013-02-11 17:56:51.281214140 -0200
3
@@ -789,6 +789,8 @@
4
 					}
5
 					return hlTrue;
6
 				}
7
+				default:
8
+					;
9
 			}
10
 			break;
11
 		}
12
@@ -819,9 +821,13 @@
13
 					}
14
 					return hlTrue;
15
 				}
16
+				default:
17
+					;
18
 			}
19
 			break;
20
 		}
21
+		default:
22
+			;
23
 	}
24
 
25
 	return hlFalse;
26
Only in ./HLLib: GCFFile.cpp.orig
27
diff -ru ../orig/HLLib/HLLib.cpp ./HLLib/HLLib.cpp
(-)files/patch-.__HLLib__HLLib.cpp (+31 lines)
Line 0 Link Here
1
--- ../orig/HLLib/HLLib.cpp	2010-11-01 19:45:14.000000000 -0200
2
+++ ./HLLib/HLLib.cpp	2013-02-11 17:56:51.284213443 -0200
3
@@ -153,6 +153,8 @@
4
 	case HL_PACKAGE_BOUND:
5
 		*pValue = pPackage != 0;
6
 		return hlTrue;
7
+	default:
8
+		;
9
 	}
10
 
11
 	return hlFalse;
12
@@ -171,6 +173,8 @@
13
 	case HL_FORCE_DEFRAGMENT:
14
 		bForceDefragment = bValue;
15
 		break;
16
+	default:
17
+		;
18
 	}
19
 }
20
 
21
@@ -533,6 +537,8 @@
22
 	case HL_PROC_DEFRAGMENT_PROGRESS_EX:
23
 		pDefragmentProgressExProc = (PDefragmentProgressExProc)pValue;
24
 		break;
25
+	default:
26
+		;
27
 	}
28
 }
29
 
30
Only in ./HLLib: HLLib.cpp.orig
31
diff -ru ../orig/HLLib/Makefile ./HLLib/Makefile
(-)files/patch-.__HLLib__NCFFile.cpp (+27 lines)
Line 0 Link Here
1
--- ../orig/HLLib/NCFFile.cpp	2010-10-31 22:48:26.000000000 -0200
2
+++ ./HLLib/NCFFile.cpp	2013-02-11 17:56:51.287210992 -0200
3
@@ -347,6 +347,8 @@
4
 					hlAttributeSetUnsignedInteger(&Attribute, this->lpItemAttributeNames[eAttribute], this->lpDirectoryEntries[pFile->GetID()].uiDirectoryFlags, hlTrue);
5
 					return hlTrue;
6
 				}
7
+				default:
8
+					;
9
 			}
10
 			break;
11
 		}
12
@@ -360,9 +362,13 @@
13
 					hlAttributeSetUnsignedInteger(&Attribute, this->lpItemAttributeNames[eAttribute], this->lpDirectoryEntries[pFolder->GetID()].uiDirectoryFlags, hlTrue);
14
 					return hlTrue;
15
 				}
16
+				default:
17
+					;
18
 			}
19
 			break;
20
 		}
21
+		default:
22
+			;
23
 	}
24
 
25
 	return hlFalse;
26
Only in ./HLLib: NCFFile.cpp.orig
27
diff -ru ../orig/HLLib/SGAFile.cpp ./HLLib/SGAFile.cpp
(-)files/patch-.__HLLib__SGAFile.cpp (+34 lines)
Line 0 Link Here
1
--- ../orig/HLLib/SGAFile.cpp	2012-11-20 20:17:10.000000000 -0200
2
+++ ./HLLib/SGAFile.cpp	2013-02-11 17:56:51.289212795 -0200
3
@@ -387,6 +387,8 @@
4
 						}
5
 						return hlFalse;
6
 					}
7
+					default:
8
+						;
9
 				}
10
 				break;
11
 			}
12
@@ -448,9 +450,13 @@
13
 						}
14
 						return hlFalse;
15
 					}
16
+					default:
17
+						;
18
 				}
19
 				break;
20
 			}
21
+			default:
22
+				;
23
 		}
24
 	}
25
 	return hlFalse;
26
@@ -624,4 +630,4 @@
27
 	{
28
 		delete []static_cast<const hlByte *>(static_cast<Streams::CMemoryStream &>(Stream).GetBuffer());
29
 	}
30
-}
31
\ No newline at end of file
32
+}
33
Only in ./HLLib: SGAFile.cpp.orig
34
diff -ru ../orig/HLLib/SGAFile.h ./HLLib/SGAFile.h
(-)files/patch-.__HLLib__SGAFile.h (+14 lines)
Line 0 Link Here
1
--- ../orig/HLLib/SGAFile.h	2012-09-17 20:16:38.000000000 -0300
2
+++ ./HLLib/SGAFile.h	2013-02-11 17:56:51.311213431 -0200
3
@@ -160,8 +160,6 @@
4
 		typedef CSGADirectory<SGADirectoryHeader4, SGASection4, SGAFolder4, SGAFile, SGAFileHeader> CSGADirectory4;
5
 		typedef CSGADirectory<SGADirectoryHeader5, SGASection5, SGAFolder5, SGAFile, SGAFileHeader> CSGADirectory5;
6
 
7
-		friend CSGADirectory4;
8
-		friend CSGADirectory5;
9
 
10
 	private:
11
 		static const char *lpAttributeNames[];
12
Only in ./HLLib: SGAFile.h.bak
13
Only in ./HLLib: SGAFile.h.orig
14
diff -ru ../orig/HLLib/VBSPFile.cpp ./HLLib/VBSPFile.cpp
(-)files/patch-.__HLLib__VBSPFile.cpp (+38 lines)
Line 0 Link Here
1
--- ../orig/HLLib/VBSPFile.cpp	2011-05-22 07:53:42.000000000 -0300
2
+++ ./HLLib/VBSPFile.cpp	2013-02-11 17:56:51.294217852 -0200
3
@@ -422,6 +422,8 @@
4
 						delete []lpComment;
5
 						return hlTrue;
6
 					}
7
+					default:
8
+						;
9
 				}
10
 			}
11
 			else
12
@@ -444,6 +446,8 @@
13
 						hlAttributeSetUnsignedInteger(&Attribute, this->lpItemAttributeNames[eAttribute], *(hlUInt *)this->pHeader->lpLumps[uiID].lpFourCC, hlTrue);
14
 						return hlTrue;
15
 					}
16
+					default:
17
+						;
18
 				}
19
 
20
 				if(this->pEndOfCentralDirectoryRecord != 0 && pItem->GetID() == HL_VBSP_LUMP_PAKFILE)
21
@@ -466,11 +470,15 @@
22
 							delete []lpComment;
23
 							return hlTrue;
24
 						}
25
+						default:
26
+							;
27
 					}
28
 				}
29
 			}
30
 			break;
31
 		}
32
+		default:
33
+			;
34
 	}
35
 
36
 	return hlFalse;
37
Only in ./HLLib: VBSPFile.cpp.orig
38
diff -ru ../orig/HLLib/VPKFile.cpp ./HLLib/VPKFile.cpp
(-)files/patch-.__HLLib__VPKFile.cpp (+18 lines)
Line 0 Link Here
1
--- ../orig/HLLib/VPKFile.cpp	2013-01-27 14:13:28.000000000 -0200
2
+++ ./HLLib/VPKFile.cpp	2013-02-11 17:56:51.297217265 -0200
3
@@ -415,9 +415,13 @@
4
 					hlAttributeSetUnsignedInteger(&Attribute, this->lpItemAttributeNames[eAttribute], pDirectoryItem->pDirectoryEntry->uiCRC, hlTrue);
5
 					return hlTrue;
6
 				}
7
+				default:
8
+					;
9
 			}
10
 			break;
11
 		}
12
+		default:
13
+			;
14
 	}
15
 
16
 	return hlFalse;
17
Only in ./HLLib: VPKFile.cpp.orig
18
diff -ru ../orig/HLLib/WADFile.cpp ./HLLib/WADFile.cpp
(-)files/patch-.__HLLib__WADFile.cpp (+18 lines)
Line 0 Link Here
1
--- ../orig/HLLib/WADFile.cpp	2010-10-31 22:56:14.000000000 -0200
2
+++ ./HLLib/WADFile.cpp	2013-02-11 17:56:51.300216459 -0200
3
@@ -200,9 +200,13 @@
4
 					hlAttributeSetUnsignedInteger(&Attribute, this->lpItemAttributeNames[eAttribute], (hlUInt)pLump->iType, hlTrue);
5
 					return hlTrue;
6
 				}
7
+				default:
8
+					;
9
 			}
10
 			break;
11
 		}
12
+		default:
13
+			;
14
 	}
15
 
16
 	return hlFalse;
17
Only in ./HLLib: WADFile.cpp.orig
18
diff -ru ../orig/HLLib/XZPFile.cpp ./HLLib/XZPFile.cpp
(-)files/patch-.__HLLib__XZPFile.cpp (+27 lines)
Line 0 Link Here
1
--- ../orig/HLLib/XZPFile.cpp	2010-10-31 22:49:18.000000000 -0200
2
+++ ./HLLib/XZPFile.cpp	2013-02-11 17:56:51.302217604 -0200
3
@@ -197,7 +197,7 @@
4
 		for(hlUInt i = 0; i < this->pHeader->uiDirectoryEntryCount; i++)
5
 		{
6
 			hlChar lpTemp[16] = "";
7
-			hlChar *lpLookup[] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f" };
8
+			const hlChar *lpLookup[] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f" };
9
 			for(hlByte *lpCRC = (hlByte *)&this->lpDirectoryEntries[i].uiFileNameCRC; lpCRC < (hlByte *)&this->lpDirectoryEntries[i].uiFileNameCRC + sizeof(hlUInt); lpCRC++)
10
 			{
11
 				strcat(lpTemp, lpLookup[(hlByte)(*lpCRC >> 4)]);
12
@@ -299,9 +299,13 @@
13
 					hlAttributeSetUnsignedInteger(&Attribute, this->lpItemAttributeNames[eAttribute], uiSize, hlFalse);
14
 					return hlTrue;
15
 				}
16
+				default:
17
+					;
18
 			}
19
 			break;
20
 		}
21
+		default:
22
+			;
23
 	}
24
 
25
 	return hlFalse;
26
Only in ./HLLib: XZPFile.cpp.orig
27
diff -ru ../orig/HLLib/ZIPFile.cpp ./HLLib/ZIPFile.cpp
(-)files/patch-.__HLLib__ZIPFile.cpp (+24 lines)
Line 0 Link Here
1
--- ../orig/HLLib/ZIPFile.cpp	2012-09-18 19:51:30.000000000 -0300
2
+++ ./HLLib/ZIPFile.cpp	2013-02-11 17:56:51.305211203 -0200
3
@@ -393,9 +393,13 @@
4
 					delete []lpComment;
5
 					return hlTrue;
6
 				}
7
+				default:
8
+					;
9
 			}
10
 			break;
11
 		}
12
+		default:
13
+			;
14
 	}
15
 
16
 	return hlFalse;
17
@@ -598,4 +602,4 @@
18
 	{
19
 		delete []static_cast<const hlByte *>(static_cast<Streams::CMemoryStream &>(Stream).GetBuffer());
20
 	}
21
-}
22
\ No newline at end of file
23
+}
24
Only in ./HLLib: ZIPFile.cpp.orig

Return to bug 176040