Christian Weisgerber <[email protected]> wrote: > Unrar 4.00 is out, but before I propose an update, we need to make > up our mind how to deal with unrar's versioning.
We can still decide differently on the version numbering, but meanwhile here's a suggestion for an update to 4.00. I've looked at license.txt again, I don't see the restrictions we currently have in PERMIT_*. I suppose the license changed at some point. PERMIT_*=Yes should be fine now. Index: Makefile =================================================================== RCS file: /cvs/ports/archivers/unrar/Makefile,v retrieving revision 1.51 diff -u -p -r1.51 Makefile --- Makefile 11 Jan 2011 18:23:12 -0000 1.51 +++ Makefile 9 Mar 2011 20:09:29 -0000 @@ -2,19 +2,26 @@ COMMENT= extract, list, and test RAR archives -DISTNAME= unrarsrc-4.0.2 -PKGNAME= unrar-4.02 -REVISION= 0 +# NB: The software version is different from the distfile version. +# Check version.hpp or the banner printed when running unrar +# for the version to use in PKGNAME. In particular, RARVER_BETA +# is *not* a third digit, but increments before finally being set +# to 0 for a non-beta release, e.g., "4.00 beta 6" was succeeded +# by "4.00". + +PKGNAME= unrar-4.00 +EPOCH= 0 +DISTNAME= unrarsrc-4.0.7 CATEGORIES= archivers HOMEPAGE= http://www.rarlab.com/ MAINTAINER= Rui Reis <[email protected]> -# Restrictive -PERMIT_PACKAGE_CDROM= no fee -PERMIT_PACKAGE_FTP= may not modify -PERMIT_DISTFILES_CDROM= no fee +# nonstandard +PERMIT_PACKAGE_CDROM= Yes +PERMIT_PACKAGE_FTP= Yes +PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= c m stdc++ @@ -24,9 +31,7 @@ MASTER_SITES= ${HOMEPAGE}rar/ WRKDIST= ${WRKDIR}/unrar MAKE_FILE= makefile.unix -MAKE_FLAGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" - -MAKE_FLAGS+= EXTRA_CFLAGS=${EXTRA_CFLAGS} +MAKE_FLAGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" STRIP=: do-install: ${INSTALL_PROGRAM} ${WRKBUILD}/unrar ${PREFIX}/bin Index: distinfo =================================================================== RCS file: /cvs/ports/archivers/unrar/distinfo,v retrieving revision 1.20 diff -u -p -r1.20 distinfo --- distinfo 30 Dec 2010 07:51:27 -0000 1.20 +++ distinfo 9 Mar 2011 20:09:29 -0000 @@ -1,5 +1,5 @@ -MD5 (unrarsrc-4.0.2.tar.gz) = bb1VqFNo54TGk/Qv8yc1TQ== -RMD160 (unrarsrc-4.0.2.tar.gz) = QwxlCBoqgWDL5EsPm1LroVeeoxo= -SHA1 (unrarsrc-4.0.2.tar.gz) = fxUuUuZQ2Q5OSAAo8siICQ6aSjU= -SHA256 (unrarsrc-4.0.2.tar.gz) = c94TIrNm4bWcHXD8+7HzIekdqztFkCyldvtFZVCdmCo= -SIZE (unrarsrc-4.0.2.tar.gz) = 151009 +MD5 (unrarsrc-4.0.7.tar.gz) = QbCpvKlFtK4mCEIa/Y9gbg== +RMD160 (unrarsrc-4.0.7.tar.gz) = Bin4YA6d2ymPWfwFuVab1AcDrK8= +SHA1 (unrarsrc-4.0.7.tar.gz) = 5Miw1HJ4R189+3foSX9YGOyj1KA= +SHA256 (unrarsrc-4.0.7.tar.gz) = 6sntdJOHDKf2eyPpIIrvHbcBw4ESOsRi6X9wN3ejMHE= +SIZE (unrarsrc-4.0.7.tar.gz) = 152853 Index: patches/patch-makefile_unix =================================================================== RCS file: /cvs/ports/archivers/unrar/patches/patch-makefile_unix,v retrieving revision 1.12 diff -u -p -r1.12 patch-makefile_unix --- patches/patch-makefile_unix 8 Nov 2009 16:42:21 -0000 1.12 +++ patches/patch-makefile_unix 9 Mar 2011 20:09:29 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-makefile_unix,v 1.12 2009/11/08 16:42:21 jasper Exp $ ---- makefile.unix.orig Sat May 2 23:18:45 2009 -+++ makefile.unix Sun Nov 8 09:39:46 2009 -@@ -107,9 +107,17 @@ OBJECTS=rar.o strlist.o strfn.o pathfn.o savepos.o sma +--- makefile.unix.orig Wed Mar 9 17:40:47 2011 ++++ makefile.unix Wed Mar 9 17:41:01 2011 +@@ -107,6 +107,8 @@ OBJECTS=rar.o strlist.o strfn.o pathfn.o savepos.o sma resource.o match.o timefn.o rdwrfn.o consio.o options.o ulinks.o errhnd.o rarvm.o \ rijndael.o getbits.o sha1.o extinfo.o extract.o volume.o list.o find.o unpack.o cmddata.o @@ -10,20 +10,3 @@ $OpenBSD: patch-makefile_unix,v 1.12 200 .cpp.o: $(COMPILE) -D$(WHAT) -c $< -+recvol.o: recvol.cpp -+ $(COMPILE) $(EXTRA_CFLAGS) -D$(WHAT) -c $< -+ -+extract.o: extract.cpp -+ $(COMPILE) $(EXTRA_CFLAGS) -D$(WHAT) -c $< -+ - all: unrar - - install: install-unrar -@@ -122,7 +130,6 @@ clean: - unrar: $(OBJECTS) $(UNRAR_OBJ) - @rm -f unrar - $(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS) -- $(STRIP) unrar - - sfx: WHAT=SFX_MODULE - sfx: $(OBJECTS) Index: patches/patch-rar_hpp =================================================================== RCS file: patches/patch-rar_hpp diff -N patches/patch-rar_hpp --- patches/patch-rar_hpp 11 Sep 2009 16:14:01 -0000 1.7 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-rar_hpp,v 1.7 2009/09/11 16:14:01 naddy Exp $ ---- rar.hpp.orig Sun Aug 16 13:09:36 2009 -+++ rar.hpp Mon Sep 7 17:51:10 2009 -@@ -17,6 +17,7 @@ - #include "rarlang.hpp" - #include "unicode.hpp" - #include "errhnd.hpp" -+#include "global.hpp" - #include "array.hpp" - #include "timefn.hpp" - #include "options.hpp" -@@ -70,8 +71,5 @@ - #include "volume.hpp" - #include "smallfn.hpp" - #include "ulinks.hpp" -- --#include "global.hpp" -- - - #endif Index: patches/patch-unicode_hpp =================================================================== RCS file: /cvs/ports/archivers/unrar/patches/patch-unicode_hpp,v retrieving revision 1.2 diff -u -p -r1.2 patch-unicode_hpp --- patches/patch-unicode_hpp 11 Jan 2011 18:23:14 -0000 1.2 +++ patches/patch-unicode_hpp 9 Mar 2011 20:09:29 -0000 @@ -1,11 +1,11 @@ $OpenBSD: patch-unicode_hpp,v 1.2 2011/01/11 18:23:14 miod Exp $ ---- unicode.hpp.orig Fri Nov 26 07:20:01 2010 -+++ unicode.hpp Sun Jan 9 18:59:44 2011 -@@ -29,6 +29,8 @@ int uni_done(); - // Borland C++ Builder 5 uses the old style swprintf without the buffer size, +--- unicode.hpp.orig Wed Mar 9 17:36:52 2011 ++++ unicode.hpp Wed Mar 9 17:37:14 2011 +@@ -30,7 +30,7 @@ int uni_done(); // so we replace it with snwprintf in our custom sprintfw definition. #define sprintfw snwprintf -+#elif defined (__OpenBSD__) + #elif defined (__OpenBSD__) +-#define sprintfw(s,...) *(s)=0 +inline int sprintfw(wchar *s, ...) { *s = '\0'; return 1; } #else #define sprintfw swprintf -- Christian "naddy" Weisgerber [email protected]
