FreeBSD Bugzilla – Attachment 36618 Details for
Bug 58620
Update port: archivers/libcomprex to 0.3.3
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 8.49 KB, created by
tkato
on 2003-10-28 13:50:07 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
tkato
Created:
2003-10-28 13:50:07 UTC
Size:
8.49 KB
patch
obsolete
>diff -urN /usr/ports/archivers/libcomprex/Makefile archivers/libcomprex/Makefile >--- /usr/ports/archivers/libcomprex/Makefile Mon Oct 27 10:55:59 2003 >+++ archivers/libcomprex/Makefile Tue Oct 28 14:08:33 2003 >@@ -7,8 +7,7 @@ > # > > PORTNAME= libcomprex >-PORTVERSION= 0.3.2 >-PORTREVISION= 2 >+PORTVERSION= 0.3.3 > CATEGORIES= archivers > MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} > MASTER_SITE_SUBDIR= gnupdate >@@ -16,19 +15,20 @@ > MAINTAINER= ports@FreeBSD.org > COMMENT= Transparently handles automatic compression and decompression of files > >-LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \ >- curl.2:${PORTSDIR}/ftp/curl \ >- ltdl.4:${PORTSDIR}/devel/libltdl >- >-.if !exists(/usr/bin/bzip2) >+LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext \ >+ ltdl.4:${PORTSDIR}/devel/libltdl \ >+ curl.2:${PORTSDIR}/ftp/curl >+.if !exists(/usr/bin/bzip2) > LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 > .endif > >-GNU_CONFIGURE= yes >+USE_GNOME= gnomehack gnometarget pkgconfig > USE_LIBTOOL= yes >-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ >- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lintl" >+LIBTOOLFLAGS= # none >+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ >+ LDFLAGS="-L${LOCALBASE}/lib -lintl" > INSTALLS_SHLIB= yes > >+.include <bsd.port.pre.mk> > .include "Makefile.man" >-.include <bsd.port.mk> >+.include <bsd.port.post.mk> >diff -urN /usr/ports/archivers/libcomprex/Makefile.man archivers/libcomprex/Makefile.man >--- /usr/ports/archivers/libcomprex/Makefile.man Sun Feb 2 21:59:04 2003 >+++ archivers/libcomprex/Makefile.man Fri Jun 6 22:56:24 2003 >@@ -1,13 +1,14 @@ > MAN1+= comprex-config.1 >+MAN3+= cxApplyFsNodeInfo.3 > MAN3+= cxCleanup.3 > MAN3+= cxCleanupModules.3 > MAN3+= cxClearErr.3 > MAN3+= cxClose.3 > MAN3+= cxCloseArchive.3 >-MAN3+= cxCloseFile.3 > MAN3+= cxDestroyArchive.3 > MAN3+= cxDestroyDirectory.3 > MAN3+= cxDestroyFile.3 >+MAN3+= cxDestroyFsIterator.3 > MAN3+= cxDestroyFsNode.3 > MAN3+= cxDirAddFile.3 > MAN3+= cxDirAddSubDir.3 >@@ -15,8 +16,11 @@ > MAN3+= cxDirRemoveSubDir.3 > MAN3+= cxEof.3 > MAN3+= cxError.3 >+MAN3+= cxExtractArchive.3 >+MAN3+= cxExtractFile.3 > MAN3+= cxFixPath.3 > MAN3+= cxGetArchiveAccessMode.3 >+MAN3+= cxGetArchiveFileCount.3 > MAN3+= cxGetArchiveFileName.3 > MAN3+= cxGetArchiveFileSize.3 > MAN3+= cxGetArchiveModule.3 >@@ -28,8 +32,14 @@ > MAN3+= cxGetBaseName.3 > MAN3+= cxGetBasePath.3 > MAN3+= cxGetDirArchive.3 >+MAN3+= cxGetDirDate.3 >+MAN3+= cxGetDirGid.3 >+MAN3+= cxGetDirMode.3 > MAN3+= cxGetDirName.3 > MAN3+= cxGetDirParent.3 >+MAN3+= cxGetDirPath.3 >+MAN3+= cxGetDirPhysicalPath.3 >+MAN3+= cxGetDirUid.3 > MAN3+= cxGetDirectory.3 > MAN3+= cxGetFile.3 > MAN3+= cxGetFileArchive.3 >@@ -43,12 +53,14 @@ > MAN3+= cxGetFilePath.3 > MAN3+= cxGetFilePhysicalPath.3 > MAN3+= cxGetFileSize.3 >-MAN3+= cxGetFileType.3 > MAN3+= cxGetFileUid.3 > MAN3+= cxGetFirstFile.3 > MAN3+= cxGetFirstModule.3 > MAN3+= cxGetFirstSubDir.3 > MAN3+= cxGetFpAccessMode.3 >+MAN3+= cxGetFsIterFirst.3 >+MAN3+= cxGetFsIterNext.3 >+MAN3+= cxGetFsIterPrev.3 > MAN3+= cxGetFsNodeArchive.3 > MAN3+= cxGetFsNodeDate.3 > MAN3+= cxGetFsNodeGid.3 >@@ -62,18 +74,26 @@ > MAN3+= cxGetModule.3 > MAN3+= cxGetNextDir.3 > MAN3+= cxGetNextFile.3 >+MAN3+= cxGetNextFsNode.3 > MAN3+= cxGetPreviousDir.3 > MAN3+= cxGetPreviousFile.3 >+MAN3+= cxGetPreviousFsNode.3 > MAN3+= cxGetSubDirCount.3 >+MAN3+= cxGets.3 > MAN3+= cxIsArchiveLocal.3 >+MAN3+= cxIsDirLocal.3 > MAN3+= cxIsFileLocal.3 > MAN3+= cxIsFsNodeLocal.3 > MAN3+= cxLinkModule.3 > MAN3+= cxLoadModule.3 >+MAN3+= cxMakeFile.3 >+MAN3+= cxMakePhysDirs.3 >+MAN3+= cxMkDir.3 > MAN3+= cxNewArchive.3 > MAN3+= cxNewDirectory.3 > MAN3+= cxNewFile.3 > MAN3+= cxNewFp.3 >+MAN3+= cxNewFsIterator.3 > MAN3+= cxNewFsNode.3 > MAN3+= cxOpenArchive.3 > MAN3+= cxOpenArchiveBuffer.3 >@@ -89,6 +109,7 @@ > MAN3+= cxSaveArchive.3 > MAN3+= cxSeek.3 > MAN3+= cxSetArchiveAccessMode.3 >+MAN3+= cxSetArchiveExtractCallback.3 > MAN3+= cxSetArchiveFileName.3 > MAN3+= cxSetArchiveFileSize.3 > MAN3+= cxSetArchiveLocal.3 >@@ -99,8 +120,14 @@ > MAN3+= cxSetArchiveType.3 > MAN3+= cxSetCloseFunc.3 > MAN3+= cxSetDirArchive.3 >+MAN3+= cxSetDirDate.3 >+MAN3+= cxSetDirGid.3 >+MAN3+= cxSetDirLocal.3 >+MAN3+= cxSetDirMode.3 > MAN3+= cxSetDirName.3 > MAN3+= cxSetDirParent.3 >+MAN3+= cxSetDirPhysicalPath.3 >+MAN3+= cxSetDirUid.3 > MAN3+= cxSetError.3 > MAN3+= cxSetFileArchive.3 > MAN3+= cxSetFileCompressedSize.3 >@@ -110,10 +137,8 @@ > MAN3+= cxSetFileMode.3 > MAN3+= cxSetFileName.3 > MAN3+= cxSetFileParent.3 >-MAN3+= cxSetFilePath.3 > MAN3+= cxSetFilePhysicalPath.3 > MAN3+= cxSetFileSize.3 >-MAN3+= cxSetFileType.3 > MAN3+= cxSetFileUid.3 > MAN3+= cxSetFpAccessMode.3 > MAN3+= cxSetFsNodeArchive.3 >@@ -123,7 +148,6 @@ > MAN3+= cxSetFsNodeMode.3 > MAN3+= cxSetFsNodeName.3 > MAN3+= cxSetFsNodeParent.3 >-MAN3+= cxSetFsNodePath.3 > MAN3+= cxSetFsNodeType.3 > MAN3+= cxSetFsNodeUid.3 > MAN3+= cxSetReadFunc.3 >diff -urN /usr/ports/archivers/libcomprex/distinfo archivers/libcomprex/distinfo >--- /usr/ports/archivers/libcomprex/distinfo Tue Feb 4 20:48:39 2003 >+++ archivers/libcomprex/distinfo Fri Jun 6 22:46:22 2003 >@@ -1 +1 @@ >-MD5 (libcomprex-0.3.2.tar.gz) = 638c41d7e41d9e5b0f9e1a58c2e8dadd >+MD5 (libcomprex-0.3.3.tar.gz) = f29e364600251420114b31d7dd3e47fe >diff -urN /usr/ports/archivers/libcomprex/files/patch-Makefile.in archivers/libcomprex/files/patch-Makefile.in >--- /usr/ports/archivers/libcomprex/files/patch-Makefile.in Thu Jan 1 09:00:00 1970 >+++ archivers/libcomprex/files/patch-Makefile.in Tue Oct 28 13:55:10 2003 >@@ -0,0 +1,11 @@ >+--- Makefile.in.orig Thu Mar 6 13:30:58 2003 >++++ Makefile.in Tue Oct 28 13:55:01 2003 >+@@ -126,7 +126,7 @@ >+ modlibdir = @modlibdir@ >+ sedpath = @sedpath@ >+ >+-@DYNAMIC_MODS_TRUE@LIBLTDLDIR = libltdl >++@DYNAMIC_MODS_TRUE@LIBLTDLDIR = >+ >+ SUBDIRS = debian docs intl $(LIBLTDLDIR) modules libcomprex po tests >+ >diff -urN /usr/ports/archivers/libcomprex/files/patch-libcomprex::Makefile.in archivers/libcomprex/files/patch-libcomprex::Makefile.in >--- /usr/ports/archivers/libcomprex/files/patch-libcomprex::Makefile.in Thu Jan 1 09:00:00 1970 >+++ archivers/libcomprex/files/patch-libcomprex::Makefile.in Tue Oct 28 13:57:18 2003 >@@ -0,0 +1,21 @@ >+--- libcomprex/Makefile.in.orig Thu Mar 6 13:33:01 2003 >++++ libcomprex/Makefile.in Tue Oct 28 13:56:41 2003 >+@@ -161,7 +161,7 @@ >+ utils.c >+ >+ >+-libcomprex_la_LIBADD = @DLLDFLAGS@ $(LIBLTDL) $(STATIC_LINK_LIBS) >++libcomprex_la_LIBADD = @DLLDFLAGS@ -lltdl $(STATIC_LINK_LIBS) >+ >+ libcomprex_la_LDFLAGS = \ >+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) >+@@ -169,8 +169,7 @@ >+ >+ INCLUDES = \ >+ -I$(top_srcdir) \ >+- -DCOMPREX_LIBDIR=\""$(libdir)/comprex"\" \ >+- $(INCLTDL) >++ -DCOMPREX_LIBDIR=\""$(libdir)/comprex"\" >+ >+ subdir = libcomprex >+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs >diff -urN /usr/ports/archivers/libcomprex/files/patch-tests::extractarchive.c archivers/libcomprex/files/patch-tests::extractarchive.c >--- /usr/ports/archivers/libcomprex/files/patch-tests::extractarchive.c Thu Jan 1 09:00:00 1970 >+++ archivers/libcomprex/files/patch-tests::extractarchive.c Mon Jun 23 13:26:49 2003 >@@ -0,0 +1,13 @@ >+--- tests/extractarchive.c.orig Fri Dec 20 08:03:40 2002 >++++ tests/extractarchive.c Mon Jun 23 13:16:14 2003 >+@@ -37,7 +37,9 @@ >+ void >+ __extractprogress(CxArchive *archive, CxFile *file, size_t onFile, size_t fileCount) >+ { >+- static int first_file = 0, last_file = 1; >++ static int first_file, last_file; >++ first_file = 0; >++ last_file = 1; >+ if (first_file++ == 0) >+ fprintf(stdout, "Extracting archive: %s\n", cxGetArchiveFileName(archive)); >+ >diff -urN /usr/ports/archivers/libcomprex/pkg-plist archivers/libcomprex/pkg-plist >--- /usr/ports/archivers/libcomprex/pkg-plist Mon Oct 27 10:56:00 2003 >+++ archivers/libcomprex/pkg-plist Tue Oct 28 14:06:38 2003 >@@ -1,5 +1,4 @@ > bin/comprex-config >-include/comprex.h > include/libcomprex/archive.h > include/libcomprex/archive_io.h > include/libcomprex/comprex.h >@@ -12,15 +11,29 @@ > include/libcomprex/module.h > include/libcomprex/types.h > include/libcomprex/utils.h >+lib/comprex/archive/libar.la > lib/comprex/archive/libar.so >+lib/comprex/archive/libbzip2.la > lib/comprex/archive/libbzip2.so >+lib/comprex/archive/libcab.la >+lib/comprex/archive/libcab.so >+lib/comprex/archive/libcpio.la >+lib/comprex/archive/libcpio.so >+lib/comprex/archive/libtar.la > lib/comprex/archive/libtar.so >+lib/comprex/archive/libzip.la >+lib/comprex/archive/libzip.so >+lib/comprex/archive/libzlib.la > lib/comprex/archive/libzlib.so >+lib/comprex/scheme/libcurlscm.la > lib/comprex/scheme/libcurlscm.so > lib/libcomprex.a >+lib/libcomprex.la > lib/libcomprex.so > lib/libcomprex.so.3 >+libdata/pkgconfig/libcomprex.pc > share/aclocal/libcomprex.m4 >+share/locale/it/LC_MESSAGES/libcomprex.mo > share/locale/nl/LC_MESSAGES/libcomprex.mo > @dirrm lib/comprex/scheme > @dirrm lib/comprex/archive
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 58620
: 36618