summaryrefslogtreecommitdiff
path: root/archivers/xmill
diff options
context:
space:
mode:
authorrtr <rtr@pkgsrc.org>2003-10-07 03:45:13 +0000
committerrtr <rtr@pkgsrc.org>2003-10-07 03:45:13 +0000
commit98550fbc4dd4fecada5e7020c6e48a514b47f63c (patch)
treec406f5f12f6a43a44a6592255318293d62575ebc /archivers/xmill
parent6ee3f5d93ab4460847196d326adc157c68c4da41 (diff)
downloadpkgsrc-98550fbc4dd4fecada5e7020c6e48a514b47f63c.tar.gz
patch-a{d,e,f,g,h,i,j,k,l}: add class-key to friend declarations.
patch-a{m,n}: whitespace fix to avoid cpp warnings. Finally, make it use gmake nbmake isn't compatible anymore. Should resolve pr pkg/23075. Patches approved by Johnny C. Lam.
Diffstat (limited to 'archivers/xmill')
-rw-r--r--archivers/xmill/Makefile3
-rw-r--r--archivers/xmill/distinfo13
-rw-r--r--archivers/xmill/patches/patch-ad11
-rw-r--r--archivers/xmill/patches/patch-ae29
-rw-r--r--archivers/xmill/patches/patch-af11
-rw-r--r--archivers/xmill/patches/patch-ag24
-rw-r--r--archivers/xmill/patches/patch-ah11
-rw-r--r--archivers/xmill/patches/patch-ai20
-rw-r--r--archivers/xmill/patches/patch-aj11
-rw-r--r--archivers/xmill/patches/patch-ak20
-rw-r--r--archivers/xmill/patches/patch-al38
-rw-r--r--archivers/xmill/patches/patch-am8
-rw-r--r--archivers/xmill/patches/patch-an8
13 files changed, 205 insertions, 2 deletions
diff --git a/archivers/xmill/Makefile b/archivers/xmill/Makefile
index 8929b0449de..c4dde59201d 100644
--- a/archivers/xmill/Makefile
+++ b/archivers/xmill/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/19 08:54:24 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/10/07 03:45:13 rtr Exp $
DISTNAME= xmill-0-7
PKGNAME= xmill-0.7
@@ -15,6 +15,7 @@ BUILD_DEPENDS= unzip-[0-9]*:../../archivers/unzip
EXTRACT_CMD= ${LOCALBASE}/bin/unzip -aq ${DOWNLOADED_DISTFILE}
+USE_GMAKE= #defined
MAKEFILE= makefile
RESTRICTED= "Redistribution not permitted"
diff --git a/archivers/xmill/distinfo b/archivers/xmill/distinfo
index bc9f7540d23..0f9481c5663 100644
--- a/archivers/xmill/distinfo
+++ b/archivers/xmill/distinfo
@@ -1,7 +1,18 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/02/17 09:20:25 grant Exp $
+$NetBSD: distinfo,v 1.2 2003/10/07 03:45:13 rtr Exp $
SHA1 (xmill-0-7.zip) = d4771e8fc860936e0d7360e5df4fce01152469c7
Size (xmill-0-7.zip) = 1315864 bytes
SHA1 (patch-aa) = 0c93f9dc66b283f9de7b12ad159023d94675126a
SHA1 (patch-ab) = 1103d1d987fa070b80490e7a891a6869d32e7f0d
SHA1 (patch-ac) = 33d8a8e1950de7e55bcdf579a2fbb3dc24709cc4
+SHA1 (patch-ad) = 13651a968e31e5aba1187e2cbb861812b8c288bc
+SHA1 (patch-ae) = 03dfca559d992b75d423bda40b8574d46c285c03
+SHA1 (patch-af) = 9e842cc608b9c111fc3235da1a6a3268ccf6f330
+SHA1 (patch-ag) = f9bbb4eb7970970dd88e7a13ba71798f1860da8a
+SHA1 (patch-ah) = 7428812657158714b6da2ff0fba34503fc1a477c
+SHA1 (patch-ai) = 6fedcc072a0b19dd98bd78126dda40b789cd889d
+SHA1 (patch-aj) = eda74f61fb265dfa33eba820aefa7c5b10259fd5
+SHA1 (patch-ak) = 5035bbf3f43886ae40b362658c5ce77cb413c613
+SHA1 (patch-al) = 47c9ab58135dacfe9a581ddd300363d907935189
+SHA1 (patch-am) = f1fdd4b0c06cc31526337d6c09e5fcc0d5166564
+SHA1 (patch-an) = c0dc3b3d58ebe018ca88611bd65198cb01bda1d9
diff --git a/archivers/xmill/patches/patch-ad b/archivers/xmill/patches/patch-ad
new file mode 100644
index 00000000000..4c83993d765
--- /dev/null
+++ b/archivers/xmill/patches/patch-ad
@@ -0,0 +1,11 @@
+--- src/ContMan.hpp.orig 2003-10-07 01:43:26.000000000 +1000
++++ src/ContMan.hpp 2003-10-07 01:44:19.000000000 +1000
+@@ -64,7 +64,7 @@
+ // The sequence of CompressContainers follow *directly* the container block object
+ // in memory.
+ {
+- friend CompressContainerMan;
++ friend class CompressContainerMan;
+ CompressContainerBlock *nextblock; // The next container block in the list
+ unsigned short contnum; // Number of containers
+ unsigned short userdatasize; // The compressor associated with the container
diff --git a/archivers/xmill/patches/patch-ae b/archivers/xmill/patches/patch-ae
new file mode 100644
index 00000000000..a6a43f9f143
--- /dev/null
+++ b/archivers/xmill/patches/patch-ae
@@ -0,0 +1,29 @@
+--- src/UserCompress.hpp.orig 1999-11-24 16:32:52.000000000 +1100
++++ src/UserCompress.hpp 2003-10-07 02:11:37.000000000 +1000
+@@ -61,7 +61,7 @@
+ // This object is then registered and provides basic capabilities
+ // such as returning its name, instantiating compressor or decompressor
+ {
+- friend CompressMan;
++ friend class CompressMan;
+
+ UserCompressorFactory *next; // The next factory in the list of compressor factories
+
+@@ -115,7 +115,7 @@
+
+ class UserCompressor
+ {
+- friend CompressMan;
++ friend class CompressMan;
+
+ protected:
+ unsigned short datasize; // The memory space needed for representing the state
+@@ -182,7 +182,7 @@
+
+ class UserUncompressor
+ {
+- friend CompressMan;
++ friend class CompressMan;
+
+ protected:
+ unsigned short datasize; // The size of the user compressor state space
diff --git a/archivers/xmill/patches/patch-af b/archivers/xmill/patches/patch-af
new file mode 100644
index 00000000000..67fc61a0627
--- /dev/null
+++ b/archivers/xmill/patches/patch-af
@@ -0,0 +1,11 @@
+--- src/PathDict.hpp.orig 2003-10-07 01:47:15.000000000 +1000
++++ src/PathDict.hpp 2003-10-07 01:47:28.000000000 +1000
+@@ -66,7 +66,7 @@
+ class PathDictNode
+ // Each node is represented by this structure
+ {
+- friend PathDict;
++ friend class PathDict;
+
+ PathDictNode *parent; // The parent node.
+ // Is NULL for the super root node
diff --git a/archivers/xmill/patches/patch-ag b/archivers/xmill/patches/patch-ag
new file mode 100644
index 00000000000..54616824bfd
--- /dev/null
+++ b/archivers/xmill/patches/patch-ag
@@ -0,0 +1,24 @@
+--- src/FSM.hpp.orig 2003-10-07 01:48:36.000000000 +1000
++++ src/FSM.hpp 2003-10-07 01:49:08.000000000 +1000
+@@ -88,8 +88,8 @@
+ class FSMState
+ // Represents a state in the FSM
+ {
+- friend FSM;
+- friend FSMEdge;
++ friend class FSM;
++ friend class FSMEdge;
+ unsigned isfinal:1; // Final state?
+ unsigned isaccepting:1; // Determines whether the FSM in that (final) state
+ // will definitely accept
+@@ -177,8 +177,8 @@
+ class FSMEdge
+ // Represents an edge in the FSM
+ {
+- friend FSMState;
+- friend FSM;
++ friend class FSMState;
++ friend class FSM;
+
+ unsigned type; // Type of the edge (EDGETYPE_...)
+ FSMState *nextstate; // The state that is reached by this edge
diff --git a/archivers/xmill/patches/patch-ah b/archivers/xmill/patches/patch-ah
new file mode 100644
index 00000000000..05bd71bc1e3
--- /dev/null
+++ b/archivers/xmill/patches/patch-ah
@@ -0,0 +1,11 @@
+--- src/VPathExprMan.hpp.orig 2003-10-07 01:49:53.000000000 +1000
++++ src/VPathExprMan.hpp 2003-10-07 01:50:07.000000000 +1000
+@@ -44,7 +44,7 @@
+ class VPathExpr
+ // Represents a single container path expression
+ {
+- friend VPathExprMan;
++ friend class VPathExprMan;
+
+ VPathExpr *next; // The next container path expression in the path manager
+
diff --git a/archivers/xmill/patches/patch-ai b/archivers/xmill/patches/patch-ai
new file mode 100644
index 00000000000..cc9e61951da
--- /dev/null
+++ b/archivers/xmill/patches/patch-ai
@@ -0,0 +1,20 @@
+--- src/RepeatCompress.cpp.orig 1999-11-24 16:32:42.000000000 +1100
++++ src/RepeatCompress.cpp 2003-10-07 02:18:08.000000000 +1000
+@@ -174,7 +174,7 @@
+
+ class RepeatSepCompressor : public UserCompressor
+ {
+- friend RepeatSepCompressorFactory;
++ friend class RepeatSepCompressorFactory;
+ protected:
+
+ RepeatSepCompressorInfo info;
+@@ -342,7 +342,7 @@
+
+ class RepeatSepUncompressor : public UserUncompressor
+ {
+- friend RepeatSepCompressorFactory;
++ friend class RepeatSepCompressorFactory;
+
+ RepeatSepCompressorInfo info;
+ public:
diff --git a/archivers/xmill/patches/patch-aj b/archivers/xmill/patches/patch-aj
new file mode 100644
index 00000000000..784cd7ce686
--- /dev/null
+++ b/archivers/xmill/patches/patch-aj
@@ -0,0 +1,11 @@
+--- src/CurPath.hpp.orig 2003-10-07 01:52:10.000000000 +1000
++++ src/CurPath.hpp 2003-10-07 01:52:23.000000000 +1000
+@@ -49,7 +49,7 @@
+ // The iterator is used to iterate forward and backward within the
+ // the current path
+ {
+- friend CurPath;
++ friend class CurPath;
+ CurPathLabelBlock *curblock; // The current block
+ TLabelID *curlabel; // The current label (points into the current block)
+
diff --git a/archivers/xmill/patches/patch-ak b/archivers/xmill/patches/patch-ak
new file mode 100644
index 00000000000..fc19913c389
--- /dev/null
+++ b/archivers/xmill/patches/patch-ak
@@ -0,0 +1,20 @@
+--- src/OrCompress.cpp.orig 1999-11-24 16:32:42.000000000 +1100
++++ src/OrCompress.cpp 2003-10-07 02:20:02.000000000 +1000
+@@ -111,7 +111,7 @@
+ class OrSepCompressor : public UserCompressor
+ // The compressor part of the Or-compressor,
+ {
+- friend OrSepCompressorFactory;
++ friend class OrSepCompressorFactory;
+ protected:
+
+ OrSepCompressorInfo info; // The parameters
+@@ -271,7 +271,7 @@
+
+ class OrSepUncompressor : public UserUncompressor
+ {
+- friend OrSepCompressorFactory;
++ friend class OrSepCompressorFactory;
+ OrSepCompressorInfo info;
+
+ void ComputeProperties()
diff --git a/archivers/xmill/patches/patch-al b/archivers/xmill/patches/patch-al
new file mode 100644
index 00000000000..2ff75af0d0f
--- /dev/null
+++ b/archivers/xmill/patches/patch-al
@@ -0,0 +1,38 @@
+--- src/DivCompress.cpp.orig 1999-11-24 16:32:42.000000000 +1100
++++ src/DivCompress.cpp 2003-10-07 02:21:00.000000000 +1000
+@@ -159,7 +159,7 @@
+
+ class DivSepCompressor : public UserCompressor
+ {
+- friend DivSepCompressorFactory;
++ friend class DivSepCompressorFactory;
+ protected:
+
+ DivSepComprInfo info; // The information about the subcompressors
+@@ -393,7 +393,7 @@
+
+ class DivSepUncompressor : public UserUncompressor
+ {
+- friend DivSepCompressorFactory;
++ friend class DivSepCompressorFactory;
+ protected:
+
+ DivSepComprInfo info;
+@@ -545,7 +545,7 @@
+ // The compressor class is inherited from DivSepCompressor so that
+ // we can use 'ParseString'
+ {
+- friend DivSepCompressorFactory;
++ friend class DivSepCompressorFactory;
+
+ public:
+ void ComputeProperties()
+@@ -657,7 +657,7 @@
+ // Note that the class is denoted from 'DivSepUncompressor' so that
+ // we can use the 'info' attribute
+ {
+- friend DivSepCompressorFactory;
++ friend class DivSepCompressorFactory;
+
+ public:
+ void ComputeProperties()
diff --git a/archivers/xmill/patches/patch-am b/archivers/xmill/patches/patch-am
new file mode 100644
index 00000000000..07befab550d
--- /dev/null
+++ b/archivers/xmill/patches/patch-am
@@ -0,0 +1,8 @@
+--- src/FSM.cpp.orig 2003-10-07 01:55:11.000000000 +1000
++++ src/FSM.cpp 2003-10-07 01:55:25.000000000 +1000
+@@ -2044,3 +2044,4 @@
+ }
+
+ */
+\ No newline at end of file
++
diff --git a/archivers/xmill/patches/patch-an b/archivers/xmill/patches/patch-an
new file mode 100644
index 00000000000..86b3cede308
--- /dev/null
+++ b/archivers/xmill/patches/patch-an
@@ -0,0 +1,8 @@
+--- src/Decode.cpp.orig 2003-10-07 02:21:58.000000000 +1000
++++ src/Decode.cpp 2003-10-07 02:22:05.000000000 +1000
+@@ -84,3 +84,4 @@
+ }
+
+ #endif
+\ No newline at end of file
++