Date: Tue, 6 Jun 2023 06:17:13 GMT From: Oleksii Samorukov <samm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 3bfd79d83148 - main - archivers/libunrar: Remove obsoleted port Message-ID: <202306060617.3566HD7T092157@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by samm: URL: https://cgit.FreeBSD.org/ports/commit/?id=3bfd79d831480f132190ecf5dc593c1a1a5a1edf commit 3bfd79d831480f132190ecf5dc593c1a1a5a1edf Author: Oleksii Samorukov <samm@FreeBSD.org> AuthorDate: 2023-06-06 06:16:49 +0000 Commit: Oleksii Samorukov <samm@FreeBSD.org> CommitDate: 2023-06-06 06:17:08 +0000 archivers/libunrar: Remove obsoleted port --- MOVED | 1 + archivers/Makefile | 1 - archivers/libunrar/Makefile | 28 ------------------ archivers/libunrar/distinfo | 2 -- archivers/libunrar/files/patch-dll.cpp | 13 -------- archivers/libunrar/files/patch-dll.hpp | 19 ------------ archivers/libunrar/files/patch-extract.cpp | 10 ------- archivers/libunrar/files/patch-makefile.unix | 44 ---------------------------- archivers/libunrar/pkg-descr | 5 ---- archivers/libunrar/pkg-plist | 3 -- 10 files changed, 1 insertion(+), 125 deletions(-) diff --git a/MOVED b/MOVED index 4ffe53afd8ff..f17a6d973755 100644 --- a/MOVED +++ b/MOVED @@ -7633,3 +7633,4 @@ www/rubygem-rack227|www/rubygem-rack22|2023-06-05|Remove obsoleted port. Use www databases/rubygem-pg13|databases/rubygem-pg|2023-06-05|Remove obsoleted port. Use databases/rubygem-pg instead devel/rubygem-fast_gettext1|devel/rubygem-fast_gettext|2023-06-05|Remove obsoleted port. Use devel/rubygem-fast_gettext instead devel/rubygem-gettext-setup0|devel/rubygem-gettext-setup|2023-06-05|Remove obsoleted port. Use devel/rubygem-gettext-setup instead +archivers/libunrar|archivers/libunrar6|2023-06-06|Remove obsoleted port. Use archivers/libunrar6 instead diff --git a/archivers/Makefile b/archivers/Makefile index f76683b042aa..b1e5e7ccef0c 100644 --- a/archivers/Makefile +++ b/archivers/Makefile @@ -68,7 +68,6 @@ SUBDIR += libmspack SUBDIR += libpar2 SUBDIR += librtfcomp - SUBDIR += libunrar SUBDIR += libunrar6 SUBDIR += libzip SUBDIR += libzippp diff --git a/archivers/libunrar/Makefile b/archivers/libunrar/Makefile deleted file mode 100644 index 7cc54f481cb9..000000000000 --- a/archivers/libunrar/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -PORTNAME= libunrar -PORTVERSION= 3.9.10 -PORTEPOCH= 1 -CATEGORIES= archivers -MASTER_SITES= http://www.rarlab.com/rar/ -DISTNAME= unrarsrc-${PORTVERSION} - -MAINTAINER= samm@FreeBSD.org -COMMENT= Library to work with RAR archives -WWW= https://www.rarsoft.com/ - -WRKSRC= ${WRKDIR}/unrar - -USES= gmake - -CONFLICTS_INSTALL= libunrar6 # lib/libunrar.so - -MAKEFILE= makefile.unix -ALL_TARGET= lib -USE_LDCONFIG= yes - -do-install: - ${INSTALL_LIB} ${WRKSRC}/libunrar.so.3 ${STAGEDIR}${PREFIX}/lib/ - cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libunrar.so.3 libunrar.so - ${MKDIR} ${STAGEDIR}${PREFIX}/include/libunrar3 - ${INSTALL_DATA} ${WRKSRC}/dll.hpp ${STAGEDIR}${PREFIX}/include/libunrar3/dll.hpp - -.include <bsd.port.mk> diff --git a/archivers/libunrar/distinfo b/archivers/libunrar/distinfo deleted file mode 100644 index 79bbfee7ee90..000000000000 --- a/archivers/libunrar/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (unrarsrc-3.9.10.tar.gz) = 3b4627d8f5700588bc594afee6911865f55201625299f414438a654da488207a -SIZE (unrarsrc-3.9.10.tar.gz) = 142718 diff --git a/archivers/libunrar/files/patch-dll.cpp b/archivers/libunrar/files/patch-dll.cpp deleted file mode 100644 index 1751b68cd735..000000000000 --- a/archivers/libunrar/files/patch-dll.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- dll.cpp.orig 2010-03-15 06:30:52 UTC -+++ dll.cpp -@@ -281,7 +281,9 @@ int PASCAL ProcessFile(HANDLE hArcData,i - strcpy(Data->Cmd.Command,Operation==RAR_EXTRACT ? "X":"T"); - Data->Cmd.Test=Operation!=RAR_EXTRACT; - bool Repeat=false; -- Data->Extract.ExtractCurrentFile(&Data->Cmd,Data->Arc,Data->HeaderSize,Repeat); -+ -+ if(Data->Extract.ExtractCurrentFile(&Data->Cmd,Data->Arc,Data->HeaderSize,Repeat) == false) -+ return (ERAR_UNKNOWN); - - while (Data->Arc.ReadHeader()!=0 && Data->Arc.GetHeaderType()==NEWSUB_HEAD) - { diff --git a/archivers/libunrar/files/patch-dll.hpp b/archivers/libunrar/files/patch-dll.hpp deleted file mode 100644 index 9a075eb41c89..000000000000 --- a/archivers/libunrar/files/patch-dll.hpp +++ /dev/null @@ -1,19 +0,0 @@ ---- dll.hpp.orig 2010-03-15 06:30:53 UTC -+++ dll.hpp -@@ -28,14 +28,14 @@ - - #define RAR_DLL_VERSION 4 - --#ifdef _UNIX -+// #ifdef _UNIX - #define CALLBACK - #define PASCAL - #define LONG long - #define HANDLE void * - #define LPARAM long - #define UINT unsigned int --#endif -+// #endif - - struct RARHeaderData - { diff --git a/archivers/libunrar/files/patch-extract.cpp b/archivers/libunrar/files/patch-extract.cpp deleted file mode 100644 index 3343c6255c49..000000000000 --- a/archivers/libunrar/files/patch-extract.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- extract.cpp.orig 2010-03-15 06:30:52 UTC -+++ extract.cpp -@@ -354,6 +354,7 @@ bool CmdExtract::ExtractCurrentFile(Comm - char CurVolName[NM]; - strcpy(CurVolName,ArcName); - -+ if(strcmp(ArcName,"")==0) return(false); - VolNameToFirstName(ArcName,ArcName,(Arc.NewMhd.Flags & MHD_NEWNUMBERING)!=0); - if (stricomp(ArcName,CurVolName)!=0 && FileExist(ArcName)) - { diff --git a/archivers/libunrar/files/patch-makefile.unix b/archivers/libunrar/files/patch-makefile.unix deleted file mode 100644 index 66ff4e0854db..000000000000 --- a/archivers/libunrar/files/patch-makefile.unix +++ /dev/null @@ -1,44 +0,0 @@ ---- makefile.unix.orig 2009-05-03 05:18:45 UTC -+++ makefile.unix -@@ -7,10 +7,11 @@ - - # Linux using GCC - #CXX=g++ --#CXXFLAGS=-O2 --DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -+CXXFLAGS=$(CFLAGS) -fPIC -DPIC -+DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DGUI -DSILENT - STRIP=strip - DESTDIR=/usr -+RANLIB=ranlib - - # Linux using LCC - #CXX=lcc -@@ -100,7 +101,7 @@ LINK=$(CXX) - WHAT=UNRAR - - UNRAR_OBJ=filestr.o recvol.o rs.o scantree.o --LIB_OBJ=filestr.o scantree.o dll.o -+LIB_OBJ=dll.o - - OBJECTS=rar.o strlist.o strfn.o pathfn.o savepos.o smallfn.o global.o file.o filefn.o filcreat.o \ - archive.o arcread.o unicode.o system.o isnt.o crypt.o crc.o rawread.o encname.o \ -@@ -131,9 +132,15 @@ sfx: $(OBJECTS) - $(STRIP) default.sfx - - lib: WHAT=RARDLL --lib: $(OBJECTS) $(LIB_OBJ) -- @rm -f libunrar.so -- $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) -+lib: $(OBJECTS) $(LIB_OBJ) $(UNRAR_OBJ) -+ @rm -f libunrar.so.3 -+ $(LINK) -shared -o libunrar.so.3 $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) $(UNRAR_OBJ) -+ -+liba: WHAT=RARDLL -+liba: $(OBJECTS) $(LIB_OBJ) $(UNRAR_OBJ) -+ @rm -f libunrar.a -+ $(AR) rc libunrar.a $(OBJECTS) $(LIB_OBJ) $(UNRAR_OBJ) -+ $(RANLIB) libunrar.a - - install-unrar: - install unrar $(DESTDIR)/bin diff --git a/archivers/libunrar/pkg-descr b/archivers/libunrar/pkg-descr deleted file mode 100644 index 5e53635321a9..000000000000 --- a/archivers/libunrar/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ - The UnRAR library is a minor part of the RAR archiver and contains - RAR uncompression algorithm. UnRAR requires very small volume of - memory to operate. - UnRAR library can be used by other programs to extract RAR archives. - This package contains small fixes from the http://mcmcc.bat.ru/clamav/. diff --git a/archivers/libunrar/pkg-plist b/archivers/libunrar/pkg-plist deleted file mode 100644 index a39fb89941e0..000000000000 --- a/archivers/libunrar/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -lib/libunrar.so -lib/libunrar.so.3 -include/libunrar3/dll.hpp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306060617.3566HD7T092157>