- Fix build with custom LOCALBASE.

- Fix iconv dependency

PR:	ports/135326
Submitted by:	Yar Odin <yarodin@gmail.com> (maintainer)
This commit is contained in:
Dennis Herrmann 2009-06-07 17:24:26 +00:00
parent 348e19e5a8
commit 632767ae3b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=235365
2 changed files with 8 additions and 4 deletions

View file

@ -13,6 +13,9 @@ MASTERDIR= ${.CURDIR}/../unrar
EXTRA_PATCHES= ${.CURDIR}/files/patch-iconv
USE_ICONV= yes
MAKE_ENV= LOCALBASE="${LOCALBASE}"
CONFLICTS= unrar-[0-9]* zh-unrar-[0-9]*
post-install:

View file

@ -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 @@