[csw-devel] SF.net SVN: gar:[7933] csw/mgar/pkg/screen/trunk

[chninkel at users.sourceforge.net]

Revision: 7933
          http://gar.svn.sourceforge.net/gar/?rev=7933&view=rev
Author:   chninkel
Date:     2010-01-10 00:31:17 +0000 (Sun, 10 Jan 2010)

Log Message:
-----------
screen: now linked with opencsw libncurses

Modified Paths:
--------------
    csw/mgar/pkg/screen/trunk/Makefile
    csw/mgar/pkg/screen/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/screen/trunk/files/enable_ncurses.patch

Modified: csw/mgar/pkg/screen/trunk/Makefile
===================================================================
--- csw/mgar/pkg/screen/trunk/Makefile	2010-01-09 23:41:50 UTC (rev 7932)
+++ csw/mgar/pkg/screen/trunk/Makefile	2010-01-10 00:31:17 UTC (rev 7933)
@@ -22,11 +22,17 @@
 PACKAGES = CSWscrn
 CATALOGNAME = screen
 
+REQUIRED_PKGS = CSWncurses
+
+# we want to use opencsw libncurses and not solaris libcurses
+# so we modify configure.in so ncurses is tried before curses
+PATCHFILES += enable_ncurses.patch
+
 # this patch increases the maximum number of simultaneously allowed 
 # windows per screen session.
-PATCHFILES = screen-maxwin.patch
+PATCHFILES += screen-maxwin.patch
 
-# screen is not isntalled with setuid bit so we disable utmp update
+# screen is not installed with setuid bit so we disable utmp update
 PATCHFILES += screen-utmp.patch
 
 CONFIGURE_ARGS  = $(DIRPATHS)
@@ -39,6 +45,10 @@
 
 include gar/category.mk
 
+# we must recreate configure as we modified configure.in
+pre-configure-modulated:
+	cd $(WORKSRC) && $(prefix)/bin/autoconf
+
 post-merge:
 	ginstall -D $(WORKDIR_FIRSTMOD)/screenrc $(PKGROOT)/etc/$(prefix)/screenrc
 	ginstall -D $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/$(GARNAME)/changelog.CSW

Modified: csw/mgar/pkg/screen/trunk/checksums
===================================================================
--- csw/mgar/pkg/screen/trunk/checksums	2010-01-09 23:41:50 UTC (rev 7932)
+++ csw/mgar/pkg/screen/trunk/checksums	2010-01-10 00:31:17 UTC (rev 7933)
@@ -1,4 +1,5 @@
 a7026461bcda14338f2175ba958195cb  changelog.CSW
+bc3ac54668be521328c598408cab2d60  enable_ncurses.patch
 8506fd205028a96c741e4037de6e3c42  screen-4.0.3.tar.gz
 ed83d7a9001fa159a367d699580c1dd2  screen-maxwin.patch
 3f25f108225cea31321046da5b033f6a  screen-utmp.patch

Added: csw/mgar/pkg/screen/trunk/files/enable_ncurses.patch
===================================================================
--- csw/mgar/pkg/screen/trunk/files/enable_ncurses.patch	                        (rev 0)
+++ csw/mgar/pkg/screen/trunk/files/enable_ncurses.patch	2010-01-10 00:31:17 UTC (rev 7933)
@@ -0,0 +1,23 @@
+diff -ur screen-4.0.3.orig/configure.in screen-4.0.3/configure.in
+--- screen-4.0.3.orig/configure.in	2003-06-03 13:58:24.000000000 +0200
++++ screen-4.0.3/configure.in	2010-01-10 01:58:58.248639453 +0100
+@@ -643,6 +643,9 @@
+ AC_CHECKING(for tgetent)
+ AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
+ olibs="$LIBS"
++LIBS="-lncurses $olibs"
++AC_CHECKING(libncurses)
++AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
+ LIBS="-lcurses $olibs"
+ AC_CHECKING(libcurses)
+ AC_TRY_LINK(,[
+@@ -658,9 +661,6 @@
+ LIBS="-ltermlib $olibs"
+ AC_CHECKING(libtermlib)
+ AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
+-LIBS="-lncurses $olibs"
+-AC_CHECKING(libncurses)
+-AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
+ AC_MSG_ERROR(!!! no tgetent - no screen))))))
+ 
+ AC_TRY_RUN([


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.