[76858] trunk/dports/sysutils/dpkg

[jmr at macports.org]

Revision: 76858
          http://trac.macports.org/changeset/76858
Author:   jmr at macports.org
Date:     2011-03-10 17:18:17 -0800 (Thu, 10 Mar 2011)
Log Message:
-----------
dpkg: fix build with ncurses headers in the standard location (#28731)

Modified Paths:
--------------
    trunk/dports/sysutils/dpkg/Portfile

Added Paths:
-----------
    trunk/dports/sysutils/dpkg/files/ncurses.diff

Modified: trunk/dports/sysutils/dpkg/Portfile
===================================================================
--- trunk/dports/sysutils/dpkg/Portfile	2011-03-11 00:24:35 UTC (rev 76857)
+++ trunk/dports/sysutils/dpkg/Portfile	2011-03-11 01:18:17 UTC (rev 76858)
@@ -35,7 +35,8 @@
 			patch-main_remove.c \
 			patch-main_archives.c \
 			patch-scripts-Makefile \
-			patch-dpkg-deb_build.c
+			patch-dpkg-deb_build.c \
+			ncurses.diff
 
 configure.env		PERL=${prefix}/bin/perl5
 configure.args		--without-sgml-doc --with-libintl-prefix=${prefix} \

Added: trunk/dports/sysutils/dpkg/files/ncurses.diff
===================================================================
--- trunk/dports/sysutils/dpkg/files/ncurses.diff	                        (rev 0)
+++ trunk/dports/sysutils/dpkg/files/ncurses.diff	2011-03-11 01:18:17 UTC (rev 76858)
@@ -0,0 +1,33 @@
+--- dselect/Makefile.in.orig	2010-03-09 07:32:20.000000000 +1100
++++ dselect/Makefile.in	2011-03-11 12:01:25.000000000 +1100
+@@ -640,7 +640,7 @@
+ 
+ curkeys.$(OBJEXT): curkeys.h
+ curkeys.h: $(srcdir)/keyoverride $(srcdir)/mkcurkeys.pl
+-	cursesfile=`echo '#include <ncursesw/curses.h>' | \
++	cursesfile=`echo '#include <curses.h>' | \
+ 		$(CC) -E - | grep 'curses.h' | head -n 1 | \
+ 		sed -e 's/^[^"]*"//; s/".*$$//'`; \
+ 	if [ "$$cursesfile" = "" ]; then \
+--- dselect/dselect.h.orig	2010-03-09 07:27:35.000000000 +1100
++++ dselect/dselect.h	2011-03-11 12:01:43.000000000 +1100
+@@ -28,7 +28,7 @@
+ 
+ #include <signal.h>
+ #undef ERR
+-#include <ncursesw/curses.h>
++#include <curses.h>
+ 
+ struct helpmenuentry {
+   char key;
+--- dselect/main.cc.orig	2010-03-09 07:27:35.000000000 +1100
++++ dselect/main.cc	2011-03-11 12:01:36.000000000 +1100
+@@ -37,7 +37,7 @@ extern "C" {
+ #include <ctype.h>
+ #include <assert.h>
+ 
+-#include <ncursesw/term.h>
++#include <term.h>
+ 
+ extern "C" {
+ #include <dpkg.h>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110310/7d5afebe/attachment.html>