Date: Sun, 7 Jun 2009 14:35:33 GMT From: Yar Odin <yarodin@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/135326: [UPDATE] archivers/unrar-iconv fix custom prefix, fix iconv dep Message-ID: <200906071435.n57EZX98010078@www.freebsd.org> Resent-Message-ID: <200906071440.n57Ee1VA048422@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 135326
>Category: ports
>Synopsis: [UPDATE] archivers/unrar-iconv fix custom prefix, fix iconv dep
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Jun 07 14:40:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Yar Odin
>Release: FreeBSD 6.4-RELEASE-p4
>Organization:
>Environment:
>Description:
1. Fix problem with custom prefix.
2. Add miss USE_ICONV
>How-To-Repeat:
>Fix:
How to apply:
1) Put patch-unrar-iconv.txt to /usr/ports/archivers/
2) cd /usr/ports/archivers/ && patch -E -p <patch-unrar-iconv.txt && find /usr/ports/archivers/unrar-iconv -type f -name "*.orig" -exec rm -f {} \;
Patch attached with submission follows:
diff -ruN unrar-iconv.orig/Makefile unrar-iconv/Makefile
--- unrar-iconv.orig/Makefile 2008-06-18 21:36:53.000000000 +0400
+++ unrar-iconv/Makefile 2009-06-07 17:38:26.000000000 +0400
@@ -13,6 +13,10 @@
EXTRA_PATCHES= ${.CURDIR}/files/patch-iconv
+USE_ICONV= yes
+
+MAKE_ENV= LOCALBASE="${LOCALBASE}"
+
CONFLICTS= unrar-[0-9]* zh-unrar-[0-9]*
post-install:
diff -ruN unrar-iconv.orig/files/patch-iconv unrar-iconv/files/patch-iconv
--- unrar-iconv.orig/files/patch-iconv 2008-07-03 03:02:46.000000000 +0400
+++ unrar-iconv/files/patch-iconv 2009-06-07 17:27:38.000000000 +0400
@@ -123,22 +123,23 @@
+#define MCHelpSwLO "\n lo<option> Encoding option {ignore,translit,<empty>}"
+#define MIconvCannotOpen "\nCannot open iconv to convert between '%s' and '%s' with option '%s'"
+#endif
---- makefile.unix 2008-05-31 14:18:14.000000000 +0800
-+++ makefile.unix 2008-06-27 17:03:22.459952295 +0800
+--- makefile.unix.orig 2008-10-09 17:43:06.000000000 +0400
++++ makefile.unix 2009-06-07 17:27:00.000000000 +0400
@@ -11,6 +11,13 @@
DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
STRIP=strip
DESTDIR=/usr
+# iconv stuff. Remove #ICONV# to enable
+# where to get iconv.h
-+CXXFLAGS+= -I/usr/local/include
++CXXFLAGS+= -I$(LOCALBASE)/include
+# where to get libiconv.so*
-+LIBS+= -L/usr/local/lib -liconv
++LIBS+= -L$(LOCALBASE)/lib -liconv
+# enable iconv stuff
+DEFINES+= -DWITH_ICONV
# Linux using LCC
#CXX=lcc
+
--- os.hpp Tue Oct 4 11:57:54 2005
+++ os.hpp Mon Jan 16 18:04:41 2006
@@ -169,6 +169,10 @@
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906071435.n57EZX98010078>