Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 21 Nov 2003 00:47:48 +0100
From:      "Clement Laforet" <sheepkiller@cultdeadsheep.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        Clement Laforet <sheepkiller@cultdeadsheep.org>
Subject:   ports/59534: [bento fix] devel/adacurses: update to 5.3 and unbreak on -CURRENT
Message-ID:  <20031120234822.0B55543FB1@mx1.FreeBSD.org>
Resent-Message-ID: <200311202350.hAKNoQOF024347@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         59534
>Category:       ports
>Synopsis:       [bento fix] devel/adacurses: update to 5.3 and unbreak on -CURRENT
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 20 15:50:26 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Clement Laforet
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
cotds.org
>Environment:
System: FreeBSD lucifer.cultdeadsheep.org 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Tue Nov 18 23:10:46 CET 2003 clement@lucifer.cultdeadsheep.org:/usr/obj/usr/src/sys/LUCIFER i386


	
>Description:
	- Update to 5.3 and get rid of BROKEN 
	- New file:
		files/patch-configure
	Tested on -CURRENT and -STABLE

>How-To-Repeat:
	http://bento.freebsd.org/errorlogs/i386-5-latest/adacurses-5.2.log
>Fix:

	

--- adacurses.diff begins here ---
Index: adacurses/Makefile
===================================================================
RCS file: /WORK/REPO/FreeBSD/ports/devel/adacurses/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- adacurses/Makefile	18 May 2003 09:35:30 -0000	1.7
+++ adacurses/Makefile	20 Nov 2003 23:20:45 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		adacurses
-PORTVERSION=		5.2
+PORTVERSION=		5.3
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	ncurses
@@ -17,19 +17,14 @@
 
 BUILD_DEPENDS=		gnat:${PORTSDIR}/lang/gnat
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/misc --disable-overwrite \
 		--disable-termcap --includedir=${PREFIX}/include/ncurses \
 		--with-profile --with-shared --without-debug \
 		--without-curses-h --with-termlib --with-libtool
-CONFIGURE_ENV=	ac_cv_path_LDCONFIG="${LDCONFIG} -m ${PREFIX}/lib"
+CONFIGURE_ENV=	ac_cv_path_LDCONFIG="${LDCONFIG} -m ${PREFIX}/lib" \
+		 ADA_SUBDIRS="gen src"
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/adacurses
@@ -39,4 +34,4 @@
 	@${CP} ${WRKSRC}/Ada95/src/*.a ${PREFIX}/lib/adacurses
 	@${INSTALL_SCRIPT} ${FILESDIR}/adacurses-config ${PREFIX}/bin
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: adacurses/distinfo
===================================================================
RCS file: /WORK/REPO/FreeBSD/ports/devel/adacurses/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- adacurses/distinfo	19 Jun 2002 20:05:20 -0000	1.1
+++ adacurses/distinfo	20 Nov 2003 22:11:42 -0000
@@ -1 +1 @@
-MD5 (ncurses-5.2.tar.gz) = 464d6a49010cf2a6eb9ce59a264d4d47
+MD5 (ncurses-5.3.tar.gz) = 5dcc9faa93157eafa572494bffed131a
Index: adacurses/pkg-plist
===================================================================
RCS file: /WORK/REPO/FreeBSD/ports/devel/adacurses/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- adacurses/pkg-plist	19 Jun 2002 20:05:20 -0000	1.1
+++ adacurses/pkg-plist	20 Nov 2003 23:37:47 -0000
@@ -93,6 +93,18 @@
 lib/adacurses/terminal_interface-curses.adb
 lib/adacurses/terminal_interface-curses.ads
 lib/adacurses/terminal_interface-curses.ali
+lib/adacurses/terminal_interface-curses-trace.ads
+lib/adacurses/terminal_interface-curses-terminfo.ads
+lib/adacurses/terminal_interface-curses-termcap.ads
+lib/adacurses/terminal_interface-curses-putwin.ads
+lib/adacurses/terminal_interface-curses-trace.ali
+lib/adacurses/terminal_interface-curses-terminfo.ali
+lib/adacurses/terminal_interface-curses-termcap.ali
+lib/adacurses/terminal_interface-curses-putwin.ali
+lib/adacurses/terminal_interface-curses-trace.adb
+lib/adacurses/terminal_interface-curses-terminfo.adb
+lib/adacurses/terminal_interface-curses-termcap.adb
+lib/adacurses/terminal_interface-curses-putwin.adb
 lib/adacurses/terminal_interface.ads
 lib/adacurses/terminal_interface.ali
 @dirrm lib/adacurses
Index: adacurses/files/adacurses-config
===================================================================
RCS file: /WORK/REPO/FreeBSD/ports/devel/adacurses/files/adacurses-config,v
retrieving revision 1.1
diff -u -r1.1 adacurses-config
--- adacurses/files/adacurses-config	19 Jun 2002 20:05:24 -0000	1.1
+++ adacurses/files/adacurses-config	20 Nov 2003 23:13:47 -0000
@@ -7,7 +7,7 @@
 prefix=/usr/local
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
-VERSION=5.2
+VERSION=5.3
 
 CFLAGS="-I$libdir/adacurses -L$libdir/adacurses"
 LIBS="-L$prefix/lib -lAdaCurses"
Index: adacurses/files/patch-configure
===================================================================
RCS file: adacurses/files/patch-configure
diff -N adacurses/files/patch-configure
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ adacurses/files/patch-configure	20 Nov 2003 23:25:23 -0000
@@ -0,0 +1,11 @@
+--- configure.orig	Thu Nov 20 23:24:59 2003
++++ configure	Thu Nov 20 23:25:17 2003
+@@ -10590,7 +10590,7 @@
+ ADA_SUBDIRS=
+ if test "$cf_cv_prog_gnat_correct" = yes && test -f $srcdir/Ada95/Makefile.in; then
+    SRC_SUBDIRS="$SRC_SUBDIRS Ada95"
+-   ADA_SUBDIRS="gen src samples"
++   ADA_SUBDIRS="gen src"
+ fi
+ 
+ SUB_MAKEFILES=
--- adacurses.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031120234822.0B55543FB1>