SF.net SVN: gar:[22767] csw/mgar/pkg/libedit/trunk

[dmichelsen at users.sourceforge.net]

Revision: 22767
          http://sourceforge.net/p/gar/code/22767
Author:   dmichelsen
Date:     2014-01-01 17:04:36 +0000 (Wed, 01 Jan 2014)
Log Message:
-----------
libedit/trunk: Update to 20130712-3.1

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

Removed Paths:
-------------
    csw/mgar/pkg/libedit/trunk/files/0001-Add-definition-for-sig_t.patch
    csw/mgar/pkg/libedit/trunk/files/0001-Honour-LDFLAGS.patch

Modified: csw/mgar/pkg/libedit/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libedit/trunk/Makefile	2014-01-01 16:49:14 UTC (rev 22766)
+++ csw/mgar/pkg/libedit/trunk/Makefile	2014-01-01 17:04:36 UTC (rev 22767)
@@ -1,55 +1,28 @@
 # $Id$
 # TODO (release-critical prefixed with !, non release-critical with *)
-# ! Linkage of libedit.so needs a SONAME, probably libedit.so.1
-# ! Package creation is missing
 
 NAME = libedit
-VERSION = 0.3
+VERSION = 20130712-3.1
 GARTYPE = v2
 
 DESCRIPTION = Non-GPL replacement for readline library
-define BLURB
-endef
 
-MASTER_SITES = $(SF_MIRROR)
-DISTNAME = libedit
+MASTER_SITES = http://thrysoee.dk/editline/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
-PATCHFILES += 0001-Add-definition-for-sig_t.patch
-PATCHFILES += 0001-Honour-LDFLAGS.patch
+VENDOR_URL = http://thrysoee.dk/editline/
 
-PACKAGES += CSWlibedit1
-SPKG_DESC_CSWlibedit1 = Non-GPL replacement for readline library
-PKGFILES_CSWlibedit1 += $(call pkgfiles_lib,libedit.so.1)
+PACKAGES += CSWlibedit0
+SPKG_DESC_CSWlibedit0 = Non-GPL replacement for readline library
+PKGFILES_CSWlibedit0 += $(call pkgfiles_lib,libedit.so.0)
 
 PACKAGES += CSWlibedit-dev
 SPKG_DESC_CSWlibedit-dev = Development files to libedit.so.1
 # PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWlibedit-dev += CSWlibedit1
+RUNTIME_DEP_PKGS_CSWlibedit-dev += CSWlibedit0
 
 BUILD64_LIBS_ONLY = 1
 
-# The vis.h is completely different what libedit expects
-EXTRA_CONFIGURE_ENV += ac_cv_header_vis_h=no
-
-EXTRA_CFLAGS += $(CPPFLAGS)
-EXTRA_CFLAGS += -Kpic
-EXTRA_INC += $(includedir)/ncurses
-
 CONFIGURE_ARGS += $(DIRPATHS)
 
-TEST_TARGET = TEST
-TEST_OVERRIDE_VARS += LDADD
-TEST_OVERRIDE_VAR_LDADD = $(LDFLAGS)
-
-INSTALL_OVERRIDE_VARS += LIBDIR INCDIR MANDIR
-INSTALL_OVERRIDE_VAR_LIBDIR = $(DESTDIR)$(libdir)
-INSTALL_OVERRIDE_VAR_INCDIR = $(DESTDIR)$(includedir)
-INSTALL_OVERRIDE_VAR_MANDIR = $(DESTDIR)$(mandir)
-
 include gar/category.mk
-
-post-install:
-	cd $(DESTDIR)$(libdir) && mv libedit.so libedit.so.1
-	ln -s libedit.so.1 $(DESTDIR)$(libdir)/libedit.so
-	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/libedit/trunk/checksums
===================================================================
--- csw/mgar/pkg/libedit/trunk/checksums	2014-01-01 16:49:14 UTC (rev 22766)
+++ csw/mgar/pkg/libedit/trunk/checksums	2014-01-01 17:04:36 UTC (rev 22767)
@@ -1 +1 @@
-252fbaa3812f0034715f7e78203897ec  libedit-0.3.tar.gz
+0891336c697362727a1fa7e60c5cb96c  libedit-20130712-3.1.tar.gz

Deleted: csw/mgar/pkg/libedit/trunk/files/0001-Add-definition-for-sig_t.patch
===================================================================
--- csw/mgar/pkg/libedit/trunk/files/0001-Add-definition-for-sig_t.patch	2014-01-01 16:49:14 UTC (rev 22766)
+++ csw/mgar/pkg/libedit/trunk/files/0001-Add-definition-for-sig_t.patch	2014-01-01 17:04:36 UTC (rev 22767)
@@ -1,24 +0,0 @@
-From 0c52ba0a8b12b1eccbe87a7c03591b28d8c23a6f Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Thu, 1 Mar 2012 16:53:53 +0100
-Subject: [PATCH] Add definition for sig_t
-
----
- sig.h |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/sig.h b/sig.h
-index e7231b6..5a68e8a 100644
---- a/sig.h
-+++ b/sig.h
-@@ -62,6 +62,7 @@
- 	_DO(SIGCONT)	\
- 	_DO(SIGWINCH)
- 
-+typedef int	sig_t;
- typedef sig_t	*el_signal_t;
- 
- protected void	sig_end(EditLine*);
--- 
-1.7.9
-

Deleted: csw/mgar/pkg/libedit/trunk/files/0001-Honour-LDFLAGS.patch
===================================================================
--- csw/mgar/pkg/libedit/trunk/files/0001-Honour-LDFLAGS.patch	2014-01-01 16:49:14 UTC (rev 22766)
+++ csw/mgar/pkg/libedit/trunk/files/0001-Honour-LDFLAGS.patch	2014-01-01 17:04:36 UTC (rev 22767)
@@ -1,25 +0,0 @@
-From 647781bd34ae85a97a317f38c910bc355b8900c9 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Tue, 31 Dec 2013 17:35:27 +0100
-Subject: [PATCH] Honour LDFLAGS
-
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 1bacf82..361bcf7 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -100,7 +100,7 @@ libedit.a: ${OOBJS}
- 	ar -r $@ ${OOBJS}
- 
- libedit.so: ${OOBJS}
--	${CC} --shared -o $@ ${OOBJS}
-+	${CC} $(LDFLAGS) -G -h libedit.so.1 -o $@ ${OOBJS}
- 
- # minimal dependency to make "make depend" optional
- editline.o editline.po editline.so editline.ln:	\
--- 
-1.8.4.1
-

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