View | Details | Raw Unified | Return to bug 135326 | Differences between
and this patch

Collapse All | Expand All

(-)unrar-iconv/Makefile (+4 lines)
Lines 13-18 Link Here
13
13
14
EXTRA_PATCHES=	${.CURDIR}/files/patch-iconv
14
EXTRA_PATCHES=	${.CURDIR}/files/patch-iconv
15
15
16
USE_ICONV=	yes
17
18
MAKE_ENV=	LOCALBASE="${LOCALBASE}"
19
16
CONFLICTS=	unrar-[0-9]* zh-unrar-[0-9]*
20
CONFLICTS=	unrar-[0-9]* zh-unrar-[0-9]*
17
21
18
post-install:
22
post-install:
(-)unrar-iconv/files/patch-iconv (-4 / +5 lines)
Lines 123-144 Link Here
123
+#define MCHelpSwLO           "\n  lo<option>    Encoding option {ignore,translit,<empty>}"
123
+#define MCHelpSwLO           "\n  lo<option>    Encoding option {ignore,translit,<empty>}"
124
+#define MIconvCannotOpen     "\nCannot open iconv to convert between '%s' and '%s' with option '%s'"
124
+#define MIconvCannotOpen     "\nCannot open iconv to convert between '%s' and '%s' with option '%s'"
125
+#endif
125
+#endif
126
--- makefile.unix	2008-05-31 14:18:14.000000000 +0800
126
--- makefile.unix.orig	2008-10-09 17:43:06.000000000 +0400
127
+++ makefile.unix	2008-06-27 17:03:22.459952295 +0800
127
+++ makefile.unix	2009-06-07 17:27:00.000000000 +0400
128
@@ -11,6 +11,13 @@
128
@@ -11,6 +11,13 @@
129
 DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
129
 DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
130
 STRIP=strip
130
 STRIP=strip
131
 DESTDIR=/usr
131
 DESTDIR=/usr
132
+# iconv stuff. Remove #ICONV# to enable
132
+# iconv stuff. Remove #ICONV# to enable
133
+# where to get iconv.h
133
+# where to get iconv.h
134
+CXXFLAGS+= -I/usr/local/include
134
+CXXFLAGS+= -I$(LOCALBASE)/include
135
+# where to get libiconv.so*
135
+# where to get libiconv.so*
136
+LIBS+= -L/usr/local/lib -liconv
136
+LIBS+= -L$(LOCALBASE)/lib -liconv
137
+# enable iconv stuff
137
+# enable iconv stuff
138
+DEFINES+= -DWITH_ICONV
138
+DEFINES+= -DWITH_ICONV
139
 
139
 
140
 # Linux using LCC
140
 # Linux using LCC
141
 #CXX=lcc
141
 #CXX=lcc
142
142
--- os.hpp	Tue Oct  4 11:57:54 2005
143
--- os.hpp	Tue Oct  4 11:57:54 2005
143
+++ os.hpp	Mon Jan 16 18:04:41 2006
144
+++ os.hpp	Mon Jan 16 18:04:41 2006
144
@@ -169,6 +169,10 @@
145
@@ -169,6 +169,10 @@

Return to bug 135326