5 files changed, 162 insertions, 46 deletions

diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile
index d1db67941118..6a3580ee8337 100644
--- a/archivers/libcomprex/Makefile
+++ b/archivers/libcomprex/Makefile
@@ -7,54 +7,25 @@
 #
 
 PORTNAME=	libcomprex
-PORTVERSION=	0.3.1
+PORTVERSION=	0.3.2
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnupdate
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	curl.2:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext \
+		curl.2:${PORTSDIR}/ftp/curl
+
 .if !exists(/usr/bin/bzip2) 
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif
 
 USE_LIBTOOL=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+LIBTOOLFLAGS=	# none
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lintl"
 INSTALLS_SHLIB=	yes
 
-MAN1=	comprex-config.1
-MAN3=	cxCleanup.3 cxCleanupModules.3 cxClearErr.3 cxClose.3 \
-	cxCloseArchive.3 cxCloseFile.3 cxDestroyArchive.3 \
-	cxDestroyDirectory.3 cxDestroyFile.3 cxDirAddFile.3 \
-	cxDirAddSubDir.3 cxDirRemoveFile.3 cxDirRemoveSubDir.3 cxEof.3 \
-	cxError.3 cxFixPath.3 cxGetArchiveAccessMode.3 cxGetArchiveFileName.3 \
-	cxGetArchiveFileSize.3 cxGetArchiveModule.3 cxGetArchivePath.3 \
-	cxGetArchivePhysicalPath.3 cxGetArchiveRoot.3 cxGetArchiveSize.3 \
-	cxGetArchiveType.3 cxGetBaseName.3 cxGetBasePath.3 cxGetDirArchive.3 \
-	cxGetDirParent.3 cxGetDirectory.3 cxGetDirectoryName.3 cxGetFile.3 \
-	cxGetFileArchive.3 cxGetFileCompressedSize.3 cxGetFileCount.3 \
-	cxGetFileDate.3 cxGetFileGid.3 cxGetFileMode.3 cxGetFileName.3 \
-	cxGetFileParent.3 cxGetFilePath.3 cxGetFilePhysicalPath.3 \
-	cxGetFileSize.3 cxGetFileType.3 cxGetFileUid.3 cxGetFirstFile.3 \
-	cxGetFirstModule.3 cxGetFirstSubDir.3 cxGetFpAccessMode.3 \
-	cxGetFullFilePath.3 cxGetModule.3 cxGetNextDir.3 cxGetNextFile.3 \
-	cxGetPreviousDir.3 cxGetPreviousFile.3 cxGetSubDirCount.3 \
-	cxIsArchiveLocal.3 cxIsFileLocal.3 cxLinkModule.3 cxLoadModule.3 \
-	cxNewArchive.3 cxNewDirectory.3 cxNewFile.3 cxNewFp.3 cxOpenArchive.3 \
-	cxOpenArchiveBuffer.3 cxOpenArchiveStream.3 cxOpenBuffer.3 \
-	cxOpenFile.3 cxOpenFileHandle.3 cxOpenStream.3 cxRead.3 \
-	cxRegisterModule.3 cxRewind.3 cxSaveArchive.3 cxSeek.3 \
-	cxSetArchiveAccessMode.3 cxSetArchiveFileName.3 \
-	cxSetArchiveFileSize.3 cxSetArchiveLocal.3 cxSetArchiveModule.3 \
-	cxSetArchivePath.3 cxSetArchivePhysicalPath.3 cxSetArchiveSize.3 \
-	cxSetArchiveType.3 cxSetCloseFunc.3 cxSetDirArchive.3 \
-	cxSetDirParent.3 cxSetDirectoryName.3 cxSetError.3 cxSetFileArchive.3 \
-	cxSetFileCompressedSize.3 cxSetFileDate.3 cxSetFileGid.3 \
-	cxSetFileLocal.3 cxSetFileMode.3 cxSetFileName.3 cxSetFileParent.3 \
-	cxSetFilePath.3 cxSetFilePhysicalPath.3 cxSetFileSize.3 \
-	cxSetFileType.3 cxSetFileUid.3 cxSetFpAccessMode.3 cxSetReadFunc.3 \
-	cxSetSeekFunc.3 cxSetWriteFunc.3 cxStrError.3 cxTell.3 \
-	cxUnlinkModule.3 cxUnloadModule.3 cxWrite.3
-
+.include "Makefile.man"
 .include <bsd.port.mk>
diff --git a/archivers/libcomprex/Makefile.man b/archivers/libcomprex/Makefile.man
new file mode 100644
index 000000000000..9a58d1fbb60d
--- /dev/null
+++ b/archivers/libcomprex/Makefile.man
@@ -0,0 +1,137 @@
+MAN1+=	comprex-config.1
+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+=	cxDestroyFsNode.3
+MAN3+=	cxDirAddFile.3
+MAN3+=	cxDirAddSubDir.3
+MAN3+=	cxDirRemoveFile.3
+MAN3+=	cxDirRemoveSubDir.3
+MAN3+=	cxEof.3
+MAN3+=	cxError.3
+MAN3+=	cxFixPath.3
+MAN3+=	cxGetArchiveAccessMode.3
+MAN3+=	cxGetArchiveFileName.3
+MAN3+=	cxGetArchiveFileSize.3
+MAN3+=	cxGetArchiveModule.3
+MAN3+=	cxGetArchivePath.3
+MAN3+=	cxGetArchivePhysicalPath.3
+MAN3+=	cxGetArchiveRoot.3
+MAN3+=	cxGetArchiveSize.3
+MAN3+=	cxGetArchiveType.3
+MAN3+=	cxGetBaseName.3
+MAN3+=	cxGetBasePath.3
+MAN3+=	cxGetDirArchive.3
+MAN3+=	cxGetDirName.3
+MAN3+=	cxGetDirParent.3
+MAN3+=	cxGetDirectory.3
+MAN3+=	cxGetFile.3
+MAN3+=	cxGetFileArchive.3
+MAN3+=	cxGetFileCompressedSize.3
+MAN3+=	cxGetFileCount.3
+MAN3+=	cxGetFileDate.3
+MAN3+=	cxGetFileGid.3
+MAN3+=	cxGetFileMode.3
+MAN3+=	cxGetFileName.3
+MAN3+=	cxGetFileParent.3
+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+=	cxGetFsNodeArchive.3
+MAN3+=	cxGetFsNodeDate.3
+MAN3+=	cxGetFsNodeGid.3
+MAN3+=	cxGetFsNodeMode.3
+MAN3+=	cxGetFsNodeName.3
+MAN3+=	cxGetFsNodeParent.3
+MAN3+=	cxGetFsNodePath.3
+MAN3+=	cxGetFsNodeType.3
+MAN3+=	cxGetFsNodeUid.3
+MAN3+=	cxGetFullFilePath.3
+MAN3+=	cxGetModule.3
+MAN3+=	cxGetNextDir.3
+MAN3+=	cxGetNextFile.3
+MAN3+=	cxGetPreviousDir.3
+MAN3+=	cxGetPreviousFile.3
+MAN3+=	cxGetSubDirCount.3
+MAN3+=	cxIsArchiveLocal.3
+MAN3+=	cxIsFileLocal.3
+MAN3+=	cxIsFsNodeLocal.3
+MAN3+=	cxLinkModule.3
+MAN3+=	cxLoadModule.3
+MAN3+=	cxNewArchive.3
+MAN3+=	cxNewDirectory.3
+MAN3+=	cxNewFile.3
+MAN3+=	cxNewFp.3
+MAN3+=	cxNewFsNode.3
+MAN3+=	cxOpenArchive.3
+MAN3+=	cxOpenArchiveBuffer.3
+MAN3+=	cxOpenArchiveFromHandle.3
+MAN3+=	cxOpenArchiveStream.3
+MAN3+=	cxOpenBuffer.3
+MAN3+=	cxOpenFile.3
+MAN3+=	cxOpenFileHandle.3
+MAN3+=	cxOpenStream.3
+MAN3+=	cxRead.3
+MAN3+=	cxRegisterModule.3
+MAN3+=	cxRewind.3
+MAN3+=	cxSaveArchive.3
+MAN3+=	cxSeek.3
+MAN3+=	cxSetArchiveAccessMode.3
+MAN3+=	cxSetArchiveFileName.3
+MAN3+=	cxSetArchiveFileSize.3
+MAN3+=	cxSetArchiveLocal.3
+MAN3+=	cxSetArchiveModule.3
+MAN3+=	cxSetArchivePath.3
+MAN3+=	cxSetArchivePhysicalPath.3
+MAN3+=	cxSetArchiveSize.3
+MAN3+=	cxSetArchiveType.3
+MAN3+=	cxSetCloseFunc.3
+MAN3+=	cxSetDirArchive.3
+MAN3+=	cxSetDirName.3
+MAN3+=	cxSetDirParent.3
+MAN3+=	cxSetError.3
+MAN3+=	cxSetFileArchive.3
+MAN3+=	cxSetFileCompressedSize.3
+MAN3+=	cxSetFileDate.3
+MAN3+=	cxSetFileGid.3
+MAN3+=	cxSetFileLocal.3
+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
+MAN3+=	cxSetFsNodeDate.3
+MAN3+=	cxSetFsNodeGid.3
+MAN3+=	cxSetFsNodeLocal.3
+MAN3+=	cxSetFsNodeMode.3
+MAN3+=	cxSetFsNodeName.3
+MAN3+=	cxSetFsNodeParent.3
+MAN3+=	cxSetFsNodePath.3
+MAN3+=	cxSetFsNodeType.3
+MAN3+=	cxSetFsNodeUid.3
+MAN3+=	cxSetReadFunc.3
+MAN3+=	cxSetSeekFunc.3
+MAN3+=	cxSetWriteFunc.3
+MAN3+=	cxSplitPath.3
+MAN3+=	cxStrError.3
+MAN3+=	cxTell.3
+MAN3+=	cxUnlinkModule.3
+MAN3+=	cxUnloadModule.3
+MAN3+=	cxWrite.3
diff --git a/archivers/libcomprex/distinfo b/archivers/libcomprex/distinfo
index c6ea0e62d445..81c5bb4acb6b 100644
--- a/archivers/libcomprex/distinfo
+++ b/archivers/libcomprex/distinfo
@@ -1 +1 @@
-MD5 (libcomprex-0.3.1.tar.gz) = f5f15bdcc9bc17b3bd61f96923d9eb6a
+MD5 (libcomprex-0.3.2.tar.gz) = 638c41d7e41d9e5b0f9e1a58c2e8dadd
diff --git a/archivers/libcomprex/files/patch-configure b/archivers/libcomprex/files/patch-configure
new file mode 100644
index 000000000000..3cc004c49b52
--- /dev/null
+++ b/archivers/libcomprex/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Tue Jul  2 18:02:18 2002
++++ configure	Sat Jan 18 20:21:09 2003
+@@ -7334,6 +7334,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/archivers/libcomprex/pkg-plist b/archivers/libcomprex/pkg-plist
index ae1ffff6d285..9b4a5b28b3f7 100644
--- a/archivers/libcomprex/pkg-plist
+++ b/archivers/libcomprex/pkg-plist
@@ -6,31 +6,29 @@ include/libcomprex/comprex.h
 include/libcomprex/directory.h
 include/libcomprex/file.h
 include/libcomprex/fp.h
+include/libcomprex/fsiter.h
+include/libcomprex/fsnode.h
 include/libcomprex/io.h
 include/libcomprex/module.h
 include/libcomprex/types.h
 include/libcomprex/utils.h
-lib/comprex/archive/libar.a
 lib/comprex/archive/libar.la
 lib/comprex/archive/libar.so
-lib/comprex/archive/libbzip2.a
 lib/comprex/archive/libbzip2.la
 lib/comprex/archive/libbzip2.so
-lib/comprex/archive/libtar.a
 lib/comprex/archive/libtar.la
 lib/comprex/archive/libtar.so
-lib/comprex/archive/libzlib.a
 lib/comprex/archive/libzlib.la
 lib/comprex/archive/libzlib.so
-lib/comprex/scheme/libcurlscm.a
 lib/comprex/scheme/libcurlscm.la
 lib/comprex/scheme/libcurlscm.so
 lib/libcomprex.a
 lib/libcomprex.la
 lib/libcomprex.so
-lib/libcomprex.so.2
+lib/libcomprex.so.3
 share/aclocal/libcomprex.m4
-@dirrm include/libcomprex
-@dirrm lib/comprex/archive
+share/locale/nl/LC_MESSAGES/libcomprex.mo
 @dirrm lib/comprex/scheme
+@dirrm lib/comprex/archive
 @dirrm lib/comprex
+@dirrm include/libcomprex