From 9856ececea1184da705daba1abac778958b81306 Mon Sep 17 00:00:00 2001 From: jasper Date: Tue, 28 Oct 2008 01:23:34 +0000 Subject: [PATCH] - update libmspack to 20060920a - homepage moved --- archivers/libmspack/Makefile | 19 +- archivers/libmspack/distinfo | 10 +- archivers/libmspack/patches/patch-Makefile_in | 48 +-- .../libmspack/patches/patch-mspack_mspack_h | 378 ------------------ 4 files changed, 37 insertions(+), 418 deletions(-) delete mode 100644 archivers/libmspack/patches/patch-mspack_mspack_h diff --git a/archivers/libmspack/Makefile b/archivers/libmspack/Makefile index 65650d4d8fb..247b02c96ca 100644 --- a/archivers/libmspack/Makefile +++ b/archivers/libmspack/Makefile @@ -1,19 +1,22 @@ -# $OpenBSD: Makefile,v 1.3 2007/09/15 10:14:33 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2008/10/28 01:23:34 jasper Exp $ COMMENT= library for handling microsoft compression formats -DISTNAME= libmspack-0.0.20040308alpha -SHARED_LIBS += mspack 1.0 # .1.0 -PKGNAME= libmspack-20040308a -CATEGORIES= archivers -MASTER_SITES= http://www.kyz.uklinux.net/downloads/ -HOMEPAGE= http://www.kyz.uklinux.net/libmspack/ -# LGPL +DISTNAME= libmspack-0.0.20060920alpha +SHARED_LIBS += mspack 2.0 # .1.0 +PKGNAME= libmspack-20060920a +CATEGORIES= archivers + +HOMEPAGE= http://www.cabextract.org.uk/libmspack/ + +# LGPLv2.1 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes +MASTER_SITES= ${HOMEPAGE} + USE_LIBTOOL= Yes CONFIGURE_STYLE=gnu diff --git a/archivers/libmspack/distinfo b/archivers/libmspack/distinfo index 4e563e7a304..8623125d06e 100644 --- a/archivers/libmspack/distinfo +++ b/archivers/libmspack/distinfo @@ -1,5 +1,5 @@ -MD5 (libmspack-0.0.20040308alpha.tar.gz) = TY6WdknfD2reg999pLdRHA== -RMD160 (libmspack-0.0.20040308alpha.tar.gz) = 5QGKevbkQbbX958hdMAPJcF0CXg= -SHA1 (libmspack-0.0.20040308alpha.tar.gz) = 4X4UmhRqUAUuSRNJv+Oj1i5yJVo= -SHA256 (libmspack-0.0.20040308alpha.tar.gz) = EJjQqcXrMQrza0SjBdyjmXOUyPWPuJ7BbdkDoo/OEiw= -SIZE (libmspack-0.0.20040308alpha.tar.gz) = 435811 +MD5 (libmspack-0.0.20060920alpha.tar.gz) = cgA9+l2i6EPj1a4MGPfJaQ== +RMD160 (libmspack-0.0.20060920alpha.tar.gz) = P6Pacllkr4ldYWz5u6reTPPQNHg= +SHA1 (libmspack-0.0.20060920alpha.tar.gz) = ghOa4OgclgYsMSQLWSSfuCP6/UY= +SHA256 (libmspack-0.0.20060920alpha.tar.gz) = 4qU5f82AiNp2tyqLv6wVbNPQ3JFnCe1bA0vadHJv4K8= +SIZE (libmspack-0.0.20060920alpha.tar.gz) = 498217 diff --git a/archivers/libmspack/patches/patch-Makefile_in b/archivers/libmspack/patches/patch-Makefile_in index d06d22687aa..6b8ff9c7401 100644 --- a/archivers/libmspack/patches/patch-Makefile_in +++ b/archivers/libmspack/patches/patch-Makefile_in @@ -1,31 +1,25 @@ -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2006/06/01 08:12:41 jolan Exp $ ---- Makefile.in.orig Wed Mar 10 07:12:21 2004 -+++ Makefile.in Thu Jun 1 01:27:54 2006 -@@ -16,7 +16,7 @@ - - - --SOURCES = $(libmscabd_la_SOURCES) $(libmschmd_la_SOURCES) $(libmspack_la_SOURCES) $(test_cabd_md5_SOURCES) $(test_cabd_test_SOURCES) $(test_cabextract_md5_SOURCES) $(test_cabrip_SOURCES) $(test_chmd_md5_SOURCES) $(test_chminfo_SOURCES) $(test_chmx_SOURCES) -+SOURCES = $(libmscabd_la_SOURCES) $(libmschmd_la_SOURCES) $(libmspack_la_SOURCES) - - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ -@@ -72,7 +72,7 @@ am_libmspack_la_OBJECTS = system.lo cabc - hlpc.lo hlpd.lo litc.lo litd.lo kwajc.lo kwajd.lo szddc.lo \ - szddd.lo lzxc.lo lzxd.lo mszipc.lo mszipd.lo qtmd.lo - libmspack_la_OBJECTS = $(am_libmspack_la_OBJECTS) --PROGRAMS = $(noinst_PROGRAMS) -+PROGRAMS = - am_test_cabd_md5_OBJECTS = cabd_md5.$(OBJEXT) md5.$(OBJEXT) - test_cabd_md5_OBJECTS = $(am_test_cabd_md5_OBJECTS) - test_cabd_md5_DEPENDENCIES = libmscabd.la -@@ -246,8 +246,7 @@ target_alias = @target_alias@ - MSPACK_FLAGS = +$OpenBSD: patch-Makefile_in,v 1.2 2008/10/28 01:23:34 jasper Exp $ +--- Makefile.in.orig Tue Oct 28 01:43:36 2008 ++++ Makefile.in Tue Oct 28 01:45:43 2008 +@@ -119,11 +119,7 @@ CCLD = $(CC) + LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + SOURCES = $(libmscabd_la_SOURCES) $(libmschmd_la_SOURCES) \ +- $(libmspack_la_SOURCES) $(test_cabd_md5_SOURCES) \ +- $(test_cabd_memory_SOURCES) $(test_cabd_test_SOURCES) \ +- $(test_cabextract_md5_SOURCES) $(test_cabrip_SOURCES) \ +- $(test_chmd_md5_SOURCES) $(test_chminfo_SOURCES) \ +- $(test_chmx_SOURCES) $(test_multifh_SOURCES) ++ $(libmspack_la_SOURCES) + DIST_SOURCES = $(libmscabd_la_SOURCES) $(libmschmd_la_SOURCES) \ + $(libmspack_la_SOURCES) $(test_cabd_md5_SOURCES) \ + $(test_cabd_memory_SOURCES) $(test_cabd_test_SOURCES) \ +@@ -247,7 +243,7 @@ target_alias = @target_alias@ + # add "-DMSPACK_NO_DEFAULT_SYSTEM" to remove default mspack_system + @DEBUG_TRUE@MSPACK_FLAGS = -DDEBUG EXTRA_DIST = debian doc test/test_files - AM_CPPFLAGS = -I$(srcdir)/mspack -AM_CFLAGS = -std=c99 -Wall -Wsign-compare -Wconversion -pedantic \ -- $(MSPACK_FLAGS) -+AM_CFLAGS = -Wall -Wsign-compare -Wconversion -pedantic $(MSPACK_FLAGS) ++AM_CFLAGS = -Wall -Wsign-compare -Wconversion -pedantic \ + -I$(srcdir)/mspack $(MSPACK_FLAGS) lib_LTLIBRARIES = libmspack.la - include_HEADERS = mspack/mspack.h diff --git a/archivers/libmspack/patches/patch-mspack_mspack_h b/archivers/libmspack/patches/patch-mspack_mspack_h deleted file mode 100644 index a403c3f0046..00000000000 --- a/archivers/libmspack/patches/patch-mspack_mspack_h +++ /dev/null @@ -1,378 +0,0 @@ -$OpenBSD: patch-mspack_mspack_h,v 1.1.1.1 2006/06/01 08:12:41 jolan Exp $ ---- mspack/mspack.h.orig Tue Mar 9 07:01:18 2004 -+++ mspack/mspack.h Thu Jun 1 02:27:30 2006 -@@ -240,7 +240,7 @@ struct mspack_system { - /** - * Opens a file for reading, writing, appending or updating. - * -- * @param this a self-referential pointer to the mspack_system -+ * @param self a self-referential pointer to the mspack_system - * structure whose open() method is being called. If - * this pointer is required by close(), read(), write(), - * seek() or tell(), it should be stored in the result -@@ -260,7 +260,7 @@ struct mspack_system { - * for other mspack_system methods to operate. - * @see close(), read(), write(), seek(), tell(), message() - */ -- struct mspack_file * (*open)(struct mspack_system *this, -+ struct mspack_file * (*open)(struct mspack_system *self, - char *filename, - int mode); - -@@ -362,14 +362,14 @@ struct mspack_system { - /** - * Allocates memory. - * -- * @param this a self-referential pointer to the mspack_system -+ * @param self a self-referential pointer to the mspack_system - * structure whose alloc() method is being called. - * @param bytes the number of bytes to allocate - * @result a pointer to the requested number of bytes, or NULL if - * not enough memory is available - * @see free() - */ -- void * (*alloc)(struct mspack_system *this, -+ void * (*alloc)(struct mspack_system *self, - size_t bytes); - - /** -@@ -474,14 +474,14 @@ extern struct mscab_decompressor * - mspack_create_cab_decompressor(struct mspack_system *sys); - - /** Destroys an existing CAB compressor. -- * @param this the #mscab_compressor to destroy -+ * @param self the #mscab_compressor to destroy - */ --extern void mspack_destroy_cab_compressor(struct mscab_compressor *this); -+extern void mspack_destroy_cab_compressor(struct mscab_compressor *self); - - /** Destroys an existing CAB decompressor. -- * @param this the #mscab_decompressor to destroy -+ * @param self the #mscab_decompressor to destroy - */ --extern void mspack_destroy_cab_decompressor(struct mscab_decompressor *this); -+extern void mspack_destroy_cab_decompressor(struct mscab_decompressor *self); - - - /** Creates a new CHM compressor. -@@ -499,14 +499,14 @@ extern struct mschm_decompressor * - mspack_create_chm_decompressor(struct mspack_system *sys); - - /** Destroys an existing CHM compressor. -- * @param this the #mschm_compressor to destroy -+ * @param self the #mschm_compressor to destroy - */ --extern void mspack_destroy_chm_compressor(struct mschm_compressor *this); -+extern void mspack_destroy_chm_compressor(struct mschm_compressor *self); - - /** Destroys an existing CHM decompressor. -- * @param this the #mschm_decompressor to destroy -+ * @param self the #mschm_decompressor to destroy - */ --extern void mspack_destroy_chm_decompressor(struct mschm_decompressor *this); -+extern void mspack_destroy_chm_decompressor(struct mschm_decompressor *self); - - - /** Creates a new LIT compressor. -@@ -524,14 +524,14 @@ extern struct mslit_decompressor * - mspack_create_lit_decompressor(struct mspack_system *sys); - - /** Destroys an existing LIT compressor. -- * @param this the #mslit_compressor to destroy -+ * @param self the #mslit_compressor to destroy - */ --extern void mspack_destroy_lit_compressor(struct mslit_compressor *this); -+extern void mspack_destroy_lit_compressor(struct mslit_compressor *self); - - /** Destroys an existing LIT decompressor. -- * @param this the #mslit_decompressor to destroy -+ * @param self the #mslit_decompressor to destroy - */ --extern void mspack_destroy_lit_decompressor(struct mslit_decompressor *this); -+extern void mspack_destroy_lit_decompressor(struct mslit_decompressor *self); - - - /** Creates a new HLP compressor. -@@ -549,14 +549,14 @@ extern struct mshlp_decompressor * - mspack_create_hlp_decompressor(struct mspack_system *sys); - - /** Destroys an existing hlp compressor. -- * @param this the #mshlp_compressor to destroy -+ * @param self the #mshlp_compressor to destroy - */ --extern void mspack_destroy_hlp_compressor(struct mshlp_compressor *this); -+extern void mspack_destroy_hlp_compressor(struct mshlp_compressor *self); - - /** Destroys an existing hlp decompressor. -- * @param this the #mshlp_decompressor to destroy -+ * @param self the #mshlp_decompressor to destroy - */ --extern void mspack_destroy_hlp_decompressor(struct mshlp_decompressor *this); -+extern void mspack_destroy_hlp_decompressor(struct mshlp_decompressor *self); - - - /** Creates a new SZDD compressor. -@@ -574,14 +574,14 @@ extern struct msszdd_decompressor * - mspack_create_szdd_decompressor(struct mspack_system *sys); - - /** Destroys an existing SZDD compressor. -- * @param this the #msszdd_compressor to destroy -+ * @param self the #msszdd_compressor to destroy - */ --extern void mspack_destroy_szdd_compressor(struct msszdd_compressor *this); -+extern void mspack_destroy_szdd_compressor(struct msszdd_compressor *self); - - /** Destroys an existing SZDD decompressor. -- * @param this the #msszdd_decompressor to destroy -+ * @param self the #msszdd_decompressor to destroy - */ --extern void mspack_destroy_szdd_decompressor(struct msszdd_decompressor *this); -+extern void mspack_destroy_szdd_decompressor(struct msszdd_decompressor *self); - - - /** Creates a new KWAJ compressor. -@@ -599,14 +599,14 @@ extern struct mskwaj_decompressor * - mspack_create_kwaj_decompressor(struct mspack_system *sys); - - /** Destroys an existing KWAJ compressor. -- * @param this the #mskwaj_compressor to destroy -+ * @param self the #mskwaj_compressor to destroy - */ --extern void mspack_destroy_kwaj_compressor(struct mskwaj_compressor *this); -+extern void mspack_destroy_kwaj_compressor(struct mskwaj_compressor *self); - - /** Destroys an existing KWAJ decompressor. -- * @param this the #mskwaj_decompressor to destroy -+ * @param self the #mskwaj_decompressor to destroy - */ --extern void mspack_destroy_kwaj_decompressor(struct mskwaj_decompressor *this); -+extern void mspack_destroy_kwaj_decompressor(struct mskwaj_decompressor *self); - - - /* --- support for .CAB (MS Cabinet) file format --------------------------- */ -@@ -887,14 +887,14 @@ struct mscab_decompressor { - * The filename pointer should be considered "in use" until close() is - * called on the cabinet. - * -- * @param this a self-referential pointer to the mscab_decompressor -+ * @param self a self-referential pointer to the mscab_decompressor - * instance being called - * @param filename the filename of the cabinet file. This is passed - * directly to mspack_system::open(). - * @return a pointer to a mscabd_cabinet structure, or NULL on failure - * @see close(), search(), last_error() - */ -- struct mscabd_cabinet * (*open) (struct mscab_decompressor *this, -+ struct mscabd_cabinet * (*open) (struct mscab_decompressor *self, - char *filename); - - /** -@@ -921,12 +921,12 @@ struct mscab_decompressor { - * not allocated by the library. The caller should free this itself if - * necessary, before it is lost forever. - * -- * @param this a self-referential pointer to the mscab_decompressor -+ * @param self a self-referential pointer to the mscab_decompressor - * instance being called - * @param cab the cabinet to close - * @see open(), search(), append(), prepend() - */ -- void (*close)(struct mscab_decompressor *this, -+ void (*close)(struct mscab_decompressor *self, - struct mscabd_cabinet *cab); - - /** -@@ -956,14 +956,14 @@ struct mscab_decompressor { - * close() should only be called on the result of search(), not on any - * subsequent cabinets in the mscabd_cabinet::next chain. - * -- * @param this a self-referential pointer to the mscab_decompressor -+ * @param self a self-referential pointer to the mscab_decompressor - * instance being called - * @param filename the filename of the file to search for cabinets. This - * is passed directly to mspack_system::open(). - * @return a pointer to a mscabd_cabinet structure, or NULL - * @see close(), open(), last_error() - */ -- struct mscabd_cabinet * (*search) (struct mscab_decompressor *this, -+ struct mscabd_cabinet * (*search) (struct mscab_decompressor *self, - char *filename); - - /** -@@ -997,7 +997,7 @@ struct mscab_decompressor { - * structures in either cabinet must be discarded and re-obtained after - * merging. - * -- * @param this a self-referential pointer to the mscab_decompressor -+ * @param self a self-referential pointer to the mscab_decompressor - * instance being called - * @param cab the cabinet which will be appended to, - * predecessor of nextcab -@@ -1006,7 +1006,7 @@ struct mscab_decompressor { - * @return an error code, or MSPACK_ERR_OK if successful - * @see prepend(), open(), close() - */ -- int (*append) (struct mscab_decompressor *this, -+ int (*append) (struct mscab_decompressor *self, - struct mscabd_cabinet *cab, - struct mscabd_cabinet *nextcab); - -@@ -1019,7 +1019,7 @@ struct mscab_decompressor { - * all other respects, it is identical to append(). See append() for the - * full documentation. - * -- * @param this a self-referential pointer to the mscab_decompressor -+ * @param self a self-referential pointer to the mscab_decompressor - * instance being called - * @param cab the cabinet which will be prepended to, - * successor of prevcab -@@ -1028,7 +1028,7 @@ struct mscab_decompressor { - * @return an error code, or MSPACK_ERR_OK if successful - * @see append(), open(), close() - */ -- int (*prepend) (struct mscab_decompressor *this, -+ int (*prepend) (struct mscab_decompressor *self, - struct mscabd_cabinet *cab, - struct mscabd_cabinet *prevcab); - -@@ -1048,13 +1048,13 @@ struct mscab_decompressor { - * and not enough parts of the cabinet set have been loaded and appended - * or prepended, an error will be returned immediately. - * -- * @param this a self-referential pointer to the mscab_decompressor -+ * @param self a self-referential pointer to the mscab_decompressor - * instance being called - * @param file the file to be decompressed - * @param filename the filename of the file being written to - * @return an error code, or MSPACK_ERR_OK if successful - */ -- int (*extract)(struct mscab_decompressor *this, -+ int (*extract)(struct mscab_decompressor *self, - struct mscabd_file *file, - char *filename); - -@@ -1072,7 +1072,7 @@ struct mscab_decompressor { - * bit buffer by decompressors? The minimum value is 4. The default - * value is 4096. - * -- * @param this a self-referential pointer to the mscab_decompressor -+ * @param self a self-referential pointer to the mscab_decompressor - * instance being called - * @param param the parameter to set - * @param value the value to set the parameter to -@@ -1080,7 +1080,7 @@ struct mscab_decompressor { - * is a problem with either parameter or value. - * @see search(), extract() - */ -- int (*set_param)(struct mscab_decompressor *this, -+ int (*set_param)(struct mscab_decompressor *self, - int param, - int value); - -@@ -1090,7 +1090,7 @@ struct mscab_decompressor { - * This is useful for open() and search(), which do not return an error - * code directly. - * -- * @param this a self-referential pointer to the mscab_decompressor -+ * @param self a self-referential pointer to the mscab_decompressor - * instance being called - * @return the most recent error code - * @see open(), search() -@@ -1287,14 +1287,14 @@ struct mschm_decompressor { - * The filename pointer should be considered "in use" until close() is - * called on the CHM helpfile. - * -- * @param this a self-referential pointer to the mschm_decompressor -+ * @param self a self-referential pointer to the mschm_decompressor - * instance being called - * @param filename the filename of the CHM helpfile. This is passed - * directly to mspack_system::open(). - * @return a pointer to a mschmd_header structure, or NULL on failure - * @see close() - */ -- struct mschmd_header *(*open)(struct mschm_decompressor *this, -+ struct mschmd_header *(*open)(struct mschm_decompressor *self, - char *filename); - - /** -@@ -1309,12 +1309,12 @@ struct mschm_decompressor { - * mschmd_file pointers referencing that CHM are also now invalid, and - * cannot be used again. - * -- * @param this a self-referential pointer to the mschm_decompressor -+ * @param self a self-referential pointer to the mschm_decompressor - * instance being called - * @param chm the CHM helpfile to close - * @see open(), fast_open() - */ -- void (*close)(struct mschm_decompressor *this, -+ void (*close)(struct mschm_decompressor *self, - struct mschmd_header *chm); - - /** -@@ -1329,13 +1329,13 @@ struct mschm_decompressor { - * and mschmd_header::sysfiles list and mschmd_file structures generated - * on the fly by fast_find(). - * -- * @param this a self-referential pointer to the mscab_decompressor -+ * @param self a self-referential pointer to the mscab_decompressor - * instance being called - * @param file the file to be decompressed - * @param filename the filename of the file being written to - * @return an error code, or MSPACK_ERR_OK if successful - */ -- int (*extract)(struct mschm_decompressor *this, -+ int (*extract)(struct mschm_decompressor *self, - struct mschmd_file *file, - char *filename); - -@@ -1345,12 +1345,12 @@ struct mschm_decompressor { - * This is useful for open() and fast_open(), which do not return an - * error code directly. - * -- * @param this a self-referential pointer to the mschm_decompressor -+ * @param self a self-referential pointer to the mschm_decompressor - * instance being called - * @return the most recent error code - * @see open(), search() - */ -- int (*last_error)(struct mschm_decompressor *this); -+ int (*last_error)(struct mschm_decompressor *self); - - /** - * Opens a CHM helpfile quickly. -@@ -1367,14 +1367,14 @@ struct mschm_decompressor { - * The filename pointer should be considered "in use" until close() is - * called on the CHM helpfile. - * -- * @param this a self-referential pointer to the mschm_decompressor -+ * @param self a self-referential pointer to the mschm_decompressor - * instance being called - * @param filename the filename of the CHM helpfile. This is passed - * directly to mspack_system::open(). - * @return a pointer to a mschmd_header structure, or NULL on failure - * @see open(), close(), fast_find(), extract() - */ -- struct mschmd_header *(*fast_open)(struct mschm_decompressor *this, -+ struct mschmd_header *(*fast_open)(struct mschm_decompressor *self, - char *filename); - - /** -@@ -1406,7 +1406,7 @@ struct mschm_decompressor { - * opened with fast_open(), but it also works with helpfiles opened - * using the regular open(). - * -- * @param this a self-referential pointer to the mschm_decompressor -+ * @param self a self-referential pointer to the mschm_decompressor - * instance being called - * @param chm the CHM helpfile to search for the file - * @param filename the filename of the file to search for -@@ -1415,7 +1415,7 @@ struct mschm_decompressor { - * @return MSPACK_ERR_OK, or an error code - * @see open(), close(), fast_find(), extract() - */ -- int (*fast_find)(struct mschm_decompressor *this, -+ int (*fast_find)(struct mschm_decompressor *self, - struct mschmd_header *chm, - char *filename, - struct mschmd_file *f_ptr,