diff options
| author | sunpoet <sunpoet@FreeBSD.org> | 2012-01-16 12:51:02 +0000 |
|---|---|---|
| committer | sunpoet <sunpoet@FreeBSD.org> | 2012-01-16 12:51:02 +0000 |
| commit | c7c5fbb6096d574302836c0b137fbfb0cc43108d (patch) | |
| tree | d63f916a768956a5de3769f1b4027e7ee9fcae75 /archivers | |
| parent | 648b79e5db57d32977f1c3c55763a9159d9324c2 (diff) | |
| download | FreeBSD-ports-c7c5fbb6096d574302836c0b137fbfb0cc43108d.zip FreeBSD-ports-c7c5fbb6096d574302836c0b137fbfb0cc43108d.tar.gz | |
- Fix build after removal of hardcoded CXX/CXXFLAGS
Submitted by: sunpoet (myself)
Approved by: Yar <yarodin@gmail.com> (maintainer)
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/unrar-iconv/Makefile | 2 | ||||
| -rw-r--r-- | archivers/unrar-iconv/files/patch-iconv | 16 |
2 files changed, 2 insertions, 16 deletions
diff --git a/archivers/unrar-iconv/Makefile b/archivers/unrar-iconv/Makefile index cf56e2a..be13be9 100644 --- a/archivers/unrar-iconv/Makefile +++ b/archivers/unrar-iconv/Makefile @@ -13,6 +13,8 @@ MASTERDIR= ${.CURDIR}/../unrar EXTRA_PATCHES= ${.CURDIR}/files/patch-iconv +CPPFLAGS+= -DWITH_ICONV -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -liconv USE_ICONV= yes CONFLICTS= unrar-[0-9]* zh-unrar-[0-9]* diff --git a/archivers/unrar-iconv/files/patch-iconv b/archivers/unrar-iconv/files/patch-iconv index ff0be29..4c255d1 100644 --- a/archivers/unrar-iconv/files/patch-iconv +++ b/archivers/unrar-iconv/files/patch-iconv @@ -126,22 +126,6 @@ #define MCannotDelete "\nCannot delete %s" #define MCalcCRC "\nCalculating the control sum" #define MTooLargeSFXArc "\nWARNING: Too large SFX archive. Windows cannot run the executable file exceeding 4 GB." ---- makefile.unix.orig 2010-03-30 23:26:26.000000000 +0800 -+++ makefile.unix 2011-01-18 11:21:35.000000000 +0800 -@@ -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$(LOCALBASE)/include -+# where to get libiconv.so* -+LIBS+= -L$(LOCALBASE)/lib -liconv -+# enable iconv stuff -+DEFINES+= -DWITH_ICONV - - # Linux using LCC - #CXX=lcc --- os.hpp.orig 2011-01-04 20:28:47.000000000 +0800 +++ os.hpp 2011-01-18 11:21:35.000000000 +0800 @@ -192,6 +192,10 @@ |
