diff options
| author | Johan van Selst <johans@FreeBSD.org> | 2010-03-13 18:16:15 +0000 |
|---|---|---|
| committer | Johan van Selst <johans@FreeBSD.org> | 2010-03-13 18:16:15 +0000 |
| commit | 1c8d036f44710cb56795969c676acfedfac7b5f4 (patch) | |
| tree | 3afc0ea0ee5efaa4031b3db99c82e997cf1a4932 /editors | |
| parent | a830675d04f40cc92b9d23e0c1fa759d6ba7f40b (diff) | |
| download | ports-1c8d036f44710cb56795969c676acfedfac7b5f4.tar.gz ports-1c8d036f44710cb56795969c676acfedfac7b5f4.zip | |
Notes
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/nvi-devel/Makefile | 3 | ||||
| -rw-r--r-- | editors/nvi-devel/files/patch-configure | 16 |
2 files changed, 14 insertions, 5 deletions
diff --git a/editors/nvi-devel/Makefile b/editors/nvi-devel/Makefile index eacb8bec57fe..2a23bfb8a866 100644 --- a/editors/nvi-devel/Makefile +++ b/editors/nvi-devel/Makefile @@ -27,12 +27,13 @@ USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS+= --with-db-prefix=${LOCALBASE} \ --program-prefix=n +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib" CONFIGURE_SCRIPT= ../dist/configure MAN1= nex.1 nvi.1 nview.1 .include <bsd.port.options.mk> -.if defined(WITH_WIDE_CHARS) +.if defined(WITH_WIDECHAR) CONFIGURE_ARGS+= --enable-widechar .endif diff --git a/editors/nvi-devel/files/patch-configure b/editors/nvi-devel/files/patch-configure index 6e5eda529975..6083d8416579 100644 --- a/editors/nvi-devel/files/patch-configure +++ b/editors/nvi-devel/files/patch-configure @@ -13,7 +13,15 @@ # Prevent multiple expansion -@@ -27631,6 +27631,8 @@ _ACEOF +@@ -22335,6 +22335,7 @@ + #define USE_ICONV 1 + _ACEOF + ++LIBS="${LIBS} -liconv" + + for ac_func in iswblank + do +@@ -27631,6 +27632,8 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -22,7 +30,7 @@ main(){char buf[20]; exit(sprintf(buf, "XXX") != 3);} _ACEOF rm -f conftest$ac_exeext -@@ -28624,7 +28626,7 @@ cat confdefs.h >>conftest.$ac_ext +@@ -28624,7 +28627,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <stdio.h> @@ -31,7 +39,7 @@ int main () -@@ -28755,18 +28757,19 @@ fi +@@ -28755,18 +28758,19 @@ SAVELDFLAGS="$LDFLAGS" if test "x$with_db_prefix" != "x"; then LDFLAGS="-L$with_db_prefix/lib $LDFLAGS" @@ -53,7 +61,7 @@ #include <db.h> int main () -@@ -28958,7 +28961,7 @@ _ACEOF +@@ -28958,7 +28962,7 @@ dl_src=../common/dldb.c LIBS="-ldl $LIBS" else |