From adbee3e0261d5712c04b8ec306255f1794bd0005 Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 8 Aug 2005 09:00:00 +0000 Subject: Changes 0.3.3: * Added basic archive writing support. * Added a cpio archive module. * Added a zip archive module. * Added the beginnings of a cab archive module. * Added new API functions, which include: cxMkDir(), cxGets(), cxExtractFile(), cxExtractArchive(), cxMakePhysDirs(), cxApplyFsNodeInfo(), cxMakeFile(), cxGetArchiveFileCount() * Added functions for extracting individual files and full archives. * Added extraction notification callbacks. * Added pkg-config support. * Added gettext v0.11.3+ support. * Added an Italian translation. Thanks Domenico Andreoli! * Added a Dutch translation. Thanks Bert De Meyer! * Added support for some non-ustar tar formats. * Added a test program to display the file/directory tree inside of an archive. * Removed comprex.h. Applications should now include libcomprex/comprex.h. * Fixed the extraction code so permissions, timestamps, and ownerships are set on files and directories. * Fixed cxEof(). * Fixed the file and directory iterator. It should provide the correct results now. * Fixed a bug in the ar module where filenames weren't always read in correctly. * Fixed a bug in the tar module where filenames that start with '.' weren't processed correctly. * Fixed library linking problems with libbz2 and libz. * Fixed compiling errors when --prefix wasn't specified, and linking errors with libltdl. --- archivers/libcomprex/Makefile | 15 ++++++------- archivers/libcomprex/PLIST | 42 +++++++++++++++++++++++++++++------ archivers/libcomprex/distinfo | 10 ++++----- archivers/libcomprex/patches/patch-ab | 28 +++++++++++++++-------- 4 files changed, 66 insertions(+), 29 deletions(-) (limited to 'archivers') diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile index 821f8914b49..816d2316e73 100644 --- a/archivers/libcomprex/Makefile +++ b/archivers/libcomprex/Makefile @@ -1,8 +1,6 @@ -# $NetBSD: Makefile,v 1.14 2005/04/11 21:44:49 tv Exp $ -# +# $NetBSD: Makefile,v 1.15 2005/08/08 09:00:00 adam Exp $ -DISTNAME= libcomprex-0.3.2 -PKGREVISION= 4 +DISTNAME= libcomprex-0.3.3 CATEGORIES= archivers MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnupdate/} @@ -12,13 +10,14 @@ COMMENT= Library to handle (de)compression of files PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_PKGLOCALEDIR= YES -GNU_CONFIGURE= YES -USE_LIBTOOL= YES - +USE_LIBTOOL= yes +USE_PKGLOCALEDIR= yes +PKGCONFIG_OVERRIDE= libcomprex.pc.in +GNU_CONFIGURE= yes CONFIGURE_ENV+= ac_cv_lib_curl_curl_formparse=yes .include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/pkg-config/buildlink3.mk" .include "../../www/curl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/archivers/libcomprex/PLIST b/archivers/libcomprex/PLIST index 652e4e4ad4b..57f0478b725 100644 --- a/archivers/libcomprex/PLIST +++ b/archivers/libcomprex/PLIST @@ -1,6 +1,5 @@ -@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:14 jlam Exp $ +@comment $NetBSD: PLIST,v 1.3 2005/08/08 09:00:00 adam Exp $ bin/comprex-config -include/comprex.h include/libcomprex/archive.h include/libcomprex/archive_io.h include/libcomprex/comprex.h @@ -15,20 +14,25 @@ include/libcomprex/types.h include/libcomprex/utils.h lib/comprex/archive/libar.la lib/comprex/archive/libbzip2.la +lib/comprex/archive/libcab.la +lib/comprex/archive/libcpio.la lib/comprex/archive/libtar.la +lib/comprex/archive/libzip.la lib/comprex/archive/libzlib.la lib/comprex/scheme/libcurlscm.la lib/libcomprex.la +lib/pkgconfig/libcomprex.pc man/man1/comprex-config.1 +man/man3/cxApplyFsNodeInfo.3 man/man3/cxCleanup.3 man/man3/cxCleanupModules.3 man/man3/cxClearErr.3 man/man3/cxClose.3 man/man3/cxCloseArchive.3 -man/man3/cxCloseFile.3 man/man3/cxDestroyArchive.3 man/man3/cxDestroyDirectory.3 man/man3/cxDestroyFile.3 +man/man3/cxDestroyFsIterator.3 man/man3/cxDestroyFsNode.3 man/man3/cxDirAddFile.3 man/man3/cxDirAddSubDir.3 @@ -36,8 +40,11 @@ man/man3/cxDirRemoveFile.3 man/man3/cxDirRemoveSubDir.3 man/man3/cxEof.3 man/man3/cxError.3 +man/man3/cxExtractArchive.3 +man/man3/cxExtractFile.3 man/man3/cxFixPath.3 man/man3/cxGetArchiveAccessMode.3 +man/man3/cxGetArchiveFileCount.3 man/man3/cxGetArchiveFileName.3 man/man3/cxGetArchiveFileSize.3 man/man3/cxGetArchiveModule.3 @@ -49,8 +56,14 @@ man/man3/cxGetArchiveType.3 man/man3/cxGetBaseName.3 man/man3/cxGetBasePath.3 man/man3/cxGetDirArchive.3 +man/man3/cxGetDirDate.3 +man/man3/cxGetDirGid.3 +man/man3/cxGetDirMode.3 man/man3/cxGetDirName.3 man/man3/cxGetDirParent.3 +man/man3/cxGetDirPath.3 +man/man3/cxGetDirPhysicalPath.3 +man/man3/cxGetDirUid.3 man/man3/cxGetDirectory.3 man/man3/cxGetFile.3 man/man3/cxGetFileArchive.3 @@ -64,12 +77,14 @@ man/man3/cxGetFileParent.3 man/man3/cxGetFilePath.3 man/man3/cxGetFilePhysicalPath.3 man/man3/cxGetFileSize.3 -man/man3/cxGetFileType.3 man/man3/cxGetFileUid.3 man/man3/cxGetFirstFile.3 man/man3/cxGetFirstModule.3 man/man3/cxGetFirstSubDir.3 man/man3/cxGetFpAccessMode.3 +man/man3/cxGetFsIterFirst.3 +man/man3/cxGetFsIterNext.3 +man/man3/cxGetFsIterPrev.3 man/man3/cxGetFsNodeArchive.3 man/man3/cxGetFsNodeDate.3 man/man3/cxGetFsNodeGid.3 @@ -83,18 +98,26 @@ man/man3/cxGetFullFilePath.3 man/man3/cxGetModule.3 man/man3/cxGetNextDir.3 man/man3/cxGetNextFile.3 +man/man3/cxGetNextFsNode.3 man/man3/cxGetPreviousDir.3 man/man3/cxGetPreviousFile.3 +man/man3/cxGetPreviousFsNode.3 man/man3/cxGetSubDirCount.3 +man/man3/cxGets.3 man/man3/cxIsArchiveLocal.3 +man/man3/cxIsDirLocal.3 man/man3/cxIsFileLocal.3 man/man3/cxIsFsNodeLocal.3 man/man3/cxLinkModule.3 man/man3/cxLoadModule.3 +man/man3/cxMakeFile.3 +man/man3/cxMakePhysDirs.3 +man/man3/cxMkDir.3 man/man3/cxNewArchive.3 man/man3/cxNewDirectory.3 man/man3/cxNewFile.3 man/man3/cxNewFp.3 +man/man3/cxNewFsIterator.3 man/man3/cxNewFsNode.3 man/man3/cxOpenArchive.3 man/man3/cxOpenArchiveBuffer.3 @@ -110,6 +133,7 @@ man/man3/cxRewind.3 man/man3/cxSaveArchive.3 man/man3/cxSeek.3 man/man3/cxSetArchiveAccessMode.3 +man/man3/cxSetArchiveExtractCallback.3 man/man3/cxSetArchiveFileName.3 man/man3/cxSetArchiveFileSize.3 man/man3/cxSetArchiveLocal.3 @@ -120,8 +144,14 @@ man/man3/cxSetArchiveSize.3 man/man3/cxSetArchiveType.3 man/man3/cxSetCloseFunc.3 man/man3/cxSetDirArchive.3 +man/man3/cxSetDirDate.3 +man/man3/cxSetDirGid.3 +man/man3/cxSetDirLocal.3 +man/man3/cxSetDirMode.3 man/man3/cxSetDirName.3 man/man3/cxSetDirParent.3 +man/man3/cxSetDirPhysicalPath.3 +man/man3/cxSetDirUid.3 man/man3/cxSetError.3 man/man3/cxSetFileArchive.3 man/man3/cxSetFileCompressedSize.3 @@ -131,10 +161,8 @@ man/man3/cxSetFileLocal.3 man/man3/cxSetFileMode.3 man/man3/cxSetFileName.3 man/man3/cxSetFileParent.3 -man/man3/cxSetFilePath.3 man/man3/cxSetFilePhysicalPath.3 man/man3/cxSetFileSize.3 -man/man3/cxSetFileType.3 man/man3/cxSetFileUid.3 man/man3/cxSetFpAccessMode.3 man/man3/cxSetFsNodeArchive.3 @@ -144,7 +172,6 @@ man/man3/cxSetFsNodeLocal.3 man/man3/cxSetFsNodeMode.3 man/man3/cxSetFsNodeName.3 man/man3/cxSetFsNodeParent.3 -man/man3/cxSetFsNodePath.3 man/man3/cxSetFsNodeType.3 man/man3/cxSetFsNodeUid.3 man/man3/cxSetReadFunc.3 @@ -157,6 +184,7 @@ man/man3/cxUnlinkModule.3 man/man3/cxUnloadModule.3 man/man3/cxWrite.3 share/aclocal/libcomprex.m4 +${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libcomprex.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libcomprex.mo @dirrm lib/comprex/scheme @dirrm lib/comprex/archive diff --git a/archivers/libcomprex/distinfo b/archivers/libcomprex/distinfo index a5d9f126550..1dc1476c791 100644 --- a/archivers/libcomprex/distinfo +++ b/archivers/libcomprex/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.4 2005/02/23 14:45:24 agc Exp $ +$NetBSD: distinfo,v 1.5 2005/08/08 09:00:00 adam Exp $ -SHA1 (libcomprex-0.3.2.tar.gz) = d98667dbff85147ef0ccf923c8b168f7d6083fe5 -RMD160 (libcomprex-0.3.2.tar.gz) = e4963e6040c285f74dec191cda36c17a7acf97f5 -Size (libcomprex-0.3.2.tar.gz) = 558088 bytes +SHA1 (libcomprex-0.3.3.tar.gz) = a1ccd214a67aea3863dda866391921b94f162dea +RMD160 (libcomprex-0.3.3.tar.gz) = 1a4420ce23d88108e6678f6b3bfddad522dd159b +Size (libcomprex-0.3.3.tar.gz) = 685822 bytes SHA1 (patch-aa) = 967fdbf14cf06ff1f483df16bfe45226a8b64e5c -SHA1 (patch-ab) = 851286dfb8a930d839f509cf3ee1dd09945b22c3 +SHA1 (patch-ab) = f529232ae7bb809fda655735c15803a0913304c8 diff --git a/archivers/libcomprex/patches/patch-ab b/archivers/libcomprex/patches/patch-ab index e54138affdf..961e988be2f 100644 --- a/archivers/libcomprex/patches/patch-ab +++ b/archivers/libcomprex/patches/patch-ab @@ -1,18 +1,28 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/11/18 16:22:13 cjep Exp $ +$NetBSD: patch-ab,v 1.2 2005/08/08 09:00:00 adam Exp $ ---- tests/Makefile.in.orig Tue Jul 2 10:04:58 2002 +--- tests/Makefile.in.orig 2003-03-06 04:45:12.000000000 +0000 +++ tests/Makefile.in -@@ -231,11 +231,11 @@ - - catarchive$(EXEEXT): $(catarchive_OBJECTS) $(catarchive_DEPENDENCIES) +@@ -233,19 +233,19 @@ clean-noinstPROGRAMS: + done + catarchive$(EXEEXT): $(catarchive_OBJECTS) $(catarchive_DEPENDENCIES) @rm -f catarchive$(EXEEXT) - $(LINK) $(catarchive_LDFLAGS) $(catarchive_OBJECTS) $(catarchive_LDADD) $(LIBS) + $(LINK) $(catarchive_LDFLAGS) $(catarchive_OBJECTS) $(catarchive_LDADD) $(LIBS) $(INTLLIBS) - - catfile$(EXEEXT): $(catfile_OBJECTS) $(catfile_DEPENDENCIES) + catfile$(EXEEXT): $(catfile_OBJECTS) $(catfile_DEPENDENCIES) @rm -f catfile$(EXEEXT) - $(LINK) $(catfile_LDFLAGS) $(catfile_OBJECTS) $(catfile_LDADD) $(LIBS) + $(LINK) $(catfile_LDFLAGS) $(catfile_OBJECTS) $(catfile_LDADD) $(LIBS) $(INTLLIBS) + extractarchive$(EXEEXT): $(extractarchive_OBJECTS) $(extractarchive_DEPENDENCIES) + @rm -f extractarchive$(EXEEXT) +- $(LINK) $(extractarchive_LDFLAGS) $(extractarchive_OBJECTS) $(extractarchive_LDADD) $(LIBS) ++ $(LINK) $(extractarchive_LDFLAGS) $(extractarchive_OBJECTS) $(extractarchive_LDADD) $(LIBS) $(INTLLIBS) + makearchive$(EXEEXT): $(makearchive_OBJECTS) $(makearchive_DEPENDENCIES) + @rm -f makearchive$(EXEEXT) + $(LINK) $(makearchive_LDFLAGS) $(makearchive_OBJECTS) $(makearchive_LDADD) $(LIBS) + showtree$(EXEEXT): $(showtree_OBJECTS) $(showtree_DEPENDENCIES) + @rm -f showtree$(EXEEXT) +- $(LINK) $(showtree_LDFLAGS) $(showtree_OBJECTS) $(showtree_LDADD) $(LIBS) ++ $(LINK) $(showtree_LDFLAGS) $(showtree_OBJECTS) $(showtree_LDADD) $(LIBS) $(INTLLIBS) - tags: TAGS - + mostlyclean-compile: + -rm -f *.$(OBJEXT) core *.core -- cgit v1.2.3