diff options
| author | rakuco <rakuco@FreeBSD.org> | 2013-11-18 05:35:00 +0800 |
|---|---|---|
| committer | rakuco <rakuco@FreeBSD.org> | 2013-11-18 05:35:00 +0800 |
| commit | 7258de6f3e27a5bc069b9779b43c995fd57dd48d (patch) | |
| tree | 5c193e509604a53b75ce1c0ba2adfa1d91633595 | |
| parent | 155fce8f3182f3b1c4201874ebcbd042da33ebb6 (diff) | |
| download | freebsd-ports-gnome-7258de6f3e27a5bc069b9779b43c995fd57dd48d.tar.gz freebsd-ports-gnome-7258de6f3e27a5bc069b9779b43c995fd57dd48d.tar.zst freebsd-ports-gnome-7258de6f3e27a5bc069b9779b43c995fd57dd48d.zip | |
- Fix the build with libc++.
- Fix the build with iconv in base.
- Be verbose in the sed calls done in post-patch.
| -rw-r--r-- | archivers/unalz/Makefile | 4 | ||||
| -rw-r--r-- | archivers/unalz/files/patch-UnAlz.cpp | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/archivers/unalz/Makefile b/archivers/unalz/Makefile index 900273cbb713..c317d4d43eb1 100644 --- a/archivers/unalz/Makefile +++ b/archivers/unalz/Makefile @@ -30,7 +30,9 @@ UNALZ_OBJS= main.o UnAlz.o UnAlzUtils.o UnAlzBz2decompress.o \ UnAlzBzip2.o UnAlzbzlib.o post-patch: - @${REINPLACE_CMD} -e \ + ${REINPLACE_CMD} -e \ + 's/-liconv/${ICONV_LIB}/g' ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e \ '/<sys\/timeb.h>/d' ${WRKSRC}/main.cpp do-install: diff --git a/archivers/unalz/files/patch-UnAlz.cpp b/archivers/unalz/files/patch-UnAlz.cpp index b5e3aad67761..6bb4d2e3d5a5 100644 --- a/archivers/unalz/files/patch-UnAlz.cpp +++ b/archivers/unalz/files/patch-UnAlz.cpp @@ -1,5 +1,14 @@ --- UnAlz.cpp.orig +++ UnAlz.cpp +@@ -37,7 +37,7 @@ + # include <errno.h> + #endif + +-#if defined(__NetBSD__) ++#if defined(__NetBSD__) || defined(__FreeBSD__) + # include <sys/param.h> // __NetBSD_Version__ + # include <errno.h> // iconv.h 때문에 필요 + #endif @@ -1907,7 +1907,11 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// UINT32 CUnAlz::CRC32(UINT32 l, BYTE c) |