Merge branch 'package-management' of bitbucket.org:haikuports/haikuports into package-management

This commit is contained in:
Oliver Tappe
2013-04-27 21:39:35 +02:00
10 changed files with 91 additions and 315 deletions

View File

@@ -1,21 +0,0 @@
DESCRIPTION="libedit - A BSD licensed replacement for the GNU readline library."
HOMEPAGE="http://www.thrysoee.dk/editline/"
SRC_URI="http://www.thrysoee.dk/editline/libedit-20090923-3.0.tar.gz"
CHECKSUM_MD5="1e6dad38e8499d71b9c78045e5536734"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD()
{
cd libedit-20090923-3.0
./configure --prefix=`finddir B_COMMON_DIRECTORY`
make
}
INSTALL()
{
cd libedit-20090923-3.0
make install
}
LICENSE="BSD (3-clause)"
COPYRIGHT="1992-2010 The NetBSD Foundation, Inc."

View File

@@ -1,24 +0,0 @@
DESCRIPTION="A BSD licensed replacement for the GNU readline library."
HOMEPAGE="http://www.thrysoee.dk/editline/"
SRC_URI="http://ports-space.haiku-files.org/dev-libs/source/libedit-20100424-3.0.tar.gz"
CHECKSUM_MD5="eb4482139525beff12c8ef59f1a84aae"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
LICENSE="BSD (3-clause)"
COPYRIGHT="1992-2010 The NetBSD Foundation, Inc."
BUILD()
{
cd libedit-20100424-3.0
autoreconf --force --install
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--disable-shared \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
make
}
INSTALL()
{
cd libedit-20100424-3.0
make install
}

View File

@@ -1,24 +0,0 @@
DESCRIPTION="A BSD licensed replacement for the GNU readline library."
HOMEPAGE="http://www.thrysoee.dk/editline/"
SRC_URI="http://www.thrysoee.dk/editline/libedit-20110802-3.0.tar.gz"
CHECKSUM_MD5="0ea42e2c794da8ed32f6307b427f6590"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
LICENSE="BSD (3-clause)"
COPYRIGHT="1992-2011 The NetBSD Foundation, Inc."
BUILD()
{
cd libedit-20110802-3.0
autoreconf --force --install
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--disable-shared \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
make
}
INSTALL()
{
cd libedit-20110802-3.0
make install
}

View File

@@ -1,24 +0,0 @@
DESCRIPTION="A BSD licensed replacement for the GNU readline library."
HOMEPAGE="http://www.thrysoee.dk/editline/"
SRC_URI="http://www.thrysoee.dk/editline/libedit-20120601-3.0.tar.gz"
CHECKSUM_MD5="e50f6a7afb4de00c81650f7b1a0f5aea"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
LICENSE="BSD (3-clause)"
COPYRIGHT="1992-2012 The NetBSD Foundation, Inc."
BUILD()
{
cd libedit-20120601-3.0
autoreconf --force --install
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--disable-shared \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
make
}
INSTALL()
{
cd libedit-20120601-3.0
make install
}

View File

@@ -0,0 +1,49 @@
SUMMARY="A BSD licensed replacement for the GNU readline library"
DESCRIPTION="This is an autotool- and libtoolized port of the NetBSD Editline library (libedit). This Berkeley-style licensed command line editor library provides generic line editing, history, and tokenization functions, similar to those found in GNU Readline."
LICENSE="BSD (3-clause)"
COPYRIGHT="1992-2012 The NetBSD Foundation, Inc."
HOMEPAGE="http://www.thrysoee.dk/editline/"
SRC_URI="http://www.thrysoee.dk/editline/libedit-20120601-3.0.tar.gz"
CHECKSUM_MD5="e50f6a7afb4de00c81650f7b1a0f5aea"
REVISION="2"
ARCHITECTURES="x86_gcc2 ?x86"
PATCHES="libedit-20120601_3.0.patch"
PROVIDES="
libedit = $portVersion
lib:libedit = 0.0.41 compat >= 0
"
REQUIRES="
haiku >= $haikuVersion
ncurses
"
BUILD_REQUIRES="
$REQUIRES
cmd:aclocal
cmd:autoreconf
cmd:gcc
cmd:ld
cmd:libtoolize
cmd:make
cmd:sed
"
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
"
SOURCE_DIR="libedit-20120601-3.0"
BUILD()
{
autoreconf --force --install
runConfigure ./configure
make
}
INSTALL()
{
make install
prepareInstalledDevelLibs libedit
fixPkgconfig
}

View File

@@ -1,66 +0,0 @@
diff -ur libedit-20090923-3.0/examples/fileman.c libedit-20090923-3.0-haiku/examples/fileman.c
--- libedit-20090923-3.0/examples/fileman.c 2008-07-12 02:41:43.000000000 -0600
+++ libedit-20090923-3.0-haiku/examples/fileman.c 2009-10-29 15:35:57.000000000 -0600
@@ -11,7 +11,11 @@
#include <sys/types.h>
#include <sys/file.h>
#include <sys/stat.h>
+#if defined(__HAIKU__)
+#include <errno.h>
+#else
#include <sys/errno.h>
+#endif
#include <ctype.h>
#include <string.h>
#include <stdlib.h>
diff -ur libedit-20090923-3.0/src/editline/readline.h libedit-20090923-3.0-haiku/src/editline/readline.h
--- libedit-20090923-3.0/src/editline/readline.h 2009-09-23 15:04:26.000000000 -0600
+++ libedit-20090923-3.0-haiku/src/editline/readline.h 2009-10-29 15:35:17.000000000 -0600
@@ -75,7 +75,7 @@
#ifndef CTRL
#include <sys/ioctl.h>
-#if !defined(__sun) && !defined(__hpux) && !defined(_AIX)
+#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__HAIKU__)
#include <sys/ttydefaults.h>
#endif
#ifndef CTRL
diff -ur libedit-20090923-3.0/src/el.c libedit-20090923-3.0-haiku/src/el.c
--- libedit-20090923-3.0/src/el.c 2009-09-23 15:04:26.000000000 -0600
+++ libedit-20090923-3.0-haiku/src/el.c 2009-10-29 15:30:46.000000000 -0600
@@ -41,10 +41,6 @@
#endif
#endif /* not lint && not SCCSID */
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 4096
-#endif
-
/*
* el.c: EditLine interface functions
*/
@@ -56,6 +52,10 @@
#include <ctype.h>
#include "el.h"
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 4096
+#endif
+
/* el_init():
* Initialize editline and set default parameters.
*/
diff -ur libedit-20090923-3.0/src/vis.c libedit-20090923-3.0-haiku/src/vis.c
--- libedit-20090923-3.0/src/vis.c 2009-09-23 15:04:26.000000000 -0600
+++ libedit-20090923-3.0-haiku/src/vis.c 2009-10-29 15:34:45.000000000 -0600
@@ -65,6 +65,10 @@
#include <vis.h>
#include <stdlib.h>
+#if defined(__HAIKU__)
+#include <stdint.h>
+#endif
+
#ifdef __weak_alias
__weak_alias(strsvis,_strsvis)
__weak_alias(strsvisx,_strsvisx)

View File

@@ -1,66 +0,0 @@
diff -up libedit-20100424-3.0/configure.ac.orig libedit-20100424-3.0/configure.ac
--- libedit-20100424-3.0/configure.ac.orig 2010-04-29 17:13:51.201588736 -0600
+++ libedit-20100424-3.0/configure.ac 2010-04-29 17:13:56.768344064 -0600
@@ -46,7 +46,7 @@ AC_FUNC_ALLOCA
AC_HEADER_DIRENT
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdlib.h string.h sys/ioctl.h sys/param.h unistd.h curses.h ncurses.h sys/cdefs.h])
+AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdint.h stdlib.h string.h sys/errno.h errno.h sys/ioctl.h sys/param.h unistd.h curses.h ncurses.h sys/cdefs.h langinfo.h])
AC_CHECK_HEADER([termios.h], [], [AC_MSG_ERROR([termios.h is required!])],[])
diff -up libedit-20100424-3.0/examples/fileman.c.orig libedit-20100424-3.0/examples/fileman.c
--- libedit-20100424-3.0/examples/fileman.c.orig 2010-04-29 17:11:46.768868352 -0600
+++ libedit-20100424-3.0/examples/fileman.c 2010-04-29 17:11:53.987496448 -0600
@@ -11,7 +11,11 @@
#include <sys/types.h>
#include <sys/file.h>
#include <sys/stat.h>
+#ifdef HAVE_SYS_ERRNO_H
#include <sys/errno.h>
+#elif HAVE_ERRNO_H
+#include <errno.h>
+#endif
#include <ctype.h>
#include <string.h>
#include <stdlib.h>
diff -up libedit-20100424-3.0/src/el.c.orig libedit-20100424-3.0/src/el.c
--- libedit-20100424-3.0/src/el.c.orig 2010-04-29 17:13:07.215482368 -0600
+++ libedit-20100424-3.0/src/el.c 2010-04-29 17:13:27.866385920 -0600
@@ -55,7 +55,9 @@ __RCSID("$NetBSD: el.c,v 1.59 2010/04/15
#include <stdarg.h>
#include <ctype.h>
#include <locale.h>
+#ifdef HAVE_LANGINFO_H
#include <langinfo.h>
+#endif
#include "el.h"
/* el_init():
diff -up libedit-20100424-3.0/src/vis.c.orig libedit-20100424-3.0/src/vis.c
--- libedit-20100424-3.0/src/vis.c.orig 2010-04-29 17:12:31.912261120 -0600
+++ libedit-20100424-3.0/src/vis.c 2010-04-29 17:12:56.681574400 -0600
@@ -67,6 +67,10 @@ __RCSID("$NetBSD: vis.c,v 1.41 2009/11/2
#include <vis.h>
#include <stdlib.h>
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
#ifdef __weak_alias
__weak_alias(strsvis,_strsvis)
__weak_alias(strsvisx,_strsvisx)
diff -up libedit-20100424-3.0/src/editline/readline.h.orig libedit-20100424-3.0/src/editline/readline.h
--- libedit-20100424-3.0/src/editline/readline.h.orig 2010-04-29 17:12:05.235143168 -0600
+++ libedit-20100424-3.0/src/editline/readline.h 2010-04-29 17:12:16.735313920 -0600
@@ -75,7 +75,7 @@ typedef KEYMAP_ENTRY *Keymap;
#ifndef CTRL
#include <sys/ioctl.h>
-#if !defined(__sun) && !defined(__hpux) && !defined(_AIX)
+#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__HAIKU__)
#include <sys/ttydefaults.h>
#endif
#ifndef CTRL

View File

@@ -1,66 +0,0 @@
diff -urN libedit-20110802-3.0/configure.ac libedit-20110802-3.0-haiku/configure.ac
--- libedit-20110802-3.0/configure.ac 2011-08-02 01:09:05.036962304 -0700
+++ libedit-20110802-3.0-haiku/configure.ac 2012-06-16 10:41:31.579338240 -0700
@@ -64,7 +64,7 @@
AC_HEADER_DIRENT
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdlib.h string.h sys/ioctl.h sys/param.h unistd.h curses.h ncurses.h sys/cdefs.h termcap.h])
+AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdint.h stdlib.h string.h sys/errno.h errno.h sys/ioctl.h sys/param.h unistd.h curses.h ncurses.h sys/cdefs.h langinfo.h])
AC_CHECK_HEADER([termios.h], [], [AC_MSG_ERROR([termios.h is required!])],[])
diff -urN libedit-20110802-3.0/examples/fileman.c libedit-20110802-3.0-haiku/examples/fileman.c
--- libedit-20110802-3.0/examples/fileman.c 2010-04-22 12:13:17.046137344 -0700
+++ libedit-20110802-3.0-haiku/examples/fileman.c 2012-06-16 10:41:31.721944576 -0700
@@ -11,7 +11,11 @@
#include <sys/types.h>
#include <sys/file.h>
#include <sys/stat.h>
+#ifdef HAVE_SYS_ERRNO_H
#include <sys/errno.h>
+#elif HAVE_ERRNO_H
+#include <errno.h>
+#endif
#include <ctype.h>
#include <string.h>
#include <stdlib.h>
diff -urN libedit-20110802-3.0/src/editline/readline.h libedit-20110802-3.0-haiku/src/editline/readline.h
--- libedit-20110802-3.0/src/editline/readline.h 2011-02-26 14:42:59.045088768 -0800
+++ libedit-20110802-3.0-haiku/src/editline/readline.h 2012-06-16 10:41:32.068943872 -0700
@@ -75,7 +75,7 @@
#ifndef CTRL
#include <sys/ioctl.h>
-#if !defined(__sun) && !defined(__hpux) && !defined(_AIX)
+#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__HAIKU__)
#include <sys/ttydefaults.h>
#endif
#ifndef CTRL
diff -urN libedit-20110802-3.0/src/el.c libedit-20110802-3.0-haiku/src/el.c
--- libedit-20110802-3.0/src/el.c 2011-08-02 00:02:46.039583744 -0700
+++ libedit-20110802-3.0-haiku/src/el.c 2012-06-16 10:41:31.823394304 -0700
@@ -55,7 +55,9 @@
#include <stdarg.h>
#include <ctype.h>
#include <locale.h>
+#ifdef HAVE_LANGINFO_H
#include <langinfo.h>
+#endif
#include "el.h"
/* el_init():
diff -urN libedit-20110802-3.0/src/vis.c libedit-20110802-3.0-haiku/src/vis.c
--- libedit-20110802-3.0/src/vis.c 2011-07-08 23:39:42.044564480 -0700
+++ libedit-20110802-3.0-haiku/src/vis.c 2012-06-16 10:41:31.985137152 -0700
@@ -68,6 +68,10 @@
#include <errno.h>
#include <stdlib.h>
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
#ifdef __weak_alias
__weak_alias(strvisx,_strvisx)
#endif

View File

@@ -37,19 +37,6 @@ diff -urN libedit-20120601-3.0/src/editline/readline.h libedit-20120601-3.0-haik
#include <sys/ttydefaults.h>
#endif
#ifndef CTRL
diff -urN libedit-20120601-3.0/src/el.c libedit-20120601-3.0-haiku/src/el.c
--- libedit-20120601-3.0/src/el.c 2012-03-11 15:00:23.000000000 -0700
+++ libedit-20120601-3.0-haiku/src/el.c 2012-06-16 15:01:11.013893632 -0700
@@ -55,7 +55,9 @@
#include <stdarg.h>
#include <ctype.h>
#include <locale.h>
+#ifdef HAVE_LANGINFO_H
#include <langinfo.h>
+#endif
#include "el.h"
/* el_init():
diff -urN libedit-20120601-3.0/src/vis.c libedit-20120601-3.0-haiku/src/vis.c
--- libedit-20120601-3.0/src/vis.c 2011-07-08 23:39:42.000000000 -0700
+++ libedit-20120601-3.0-haiku/src/vis.c 2012-06-16 15:01:11.063176704 -0700

View File

@@ -4,7 +4,7 @@ SRC_URI="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz"
CHECKSUM_MD5="8cb9c412e5f2d96bc6f459aa8c6282a1"
LICENSE="MIT"
COPYRIGHT="1998-2011 Free Software Foundation, Inc."
REVISION="4"
REVISION="5"
ARCHITECTURES="x86_gcc2 ?x86"
PROVIDES="
@@ -13,6 +13,7 @@ PROVIDES="
cmd:clear = $portVersion compat >= 5
cmd:infocmp = $portVersion compat >= 5
cmd:infotocap = $portVersion compat >= 5
cmd:ncurses5_config = $portVersion compat >= 5
cmd:ncursesw5_config = $portVersion compat >= 5
cmd:reset = $portVersion compat >= 5
cmd:tabs = $portVersion compat >= 5
@@ -20,10 +21,15 @@ PROVIDES="
cmd:toe = $portVersion compat >= 5
cmd:tput = $portVersion compat >= 5
cmd:tset = $portVersion compat >= 5
lib:libform = $portVersion compat >= 5
lib:libformw = $portVersion compat >= 5
lib:libmenu = $portVersion compat >= 5
lib:libmenuw = $portVersion compat >= 5
lib:libncurses++w = $portVersion compat >= 5
lib:libncurses = $portVersion compat >= 5
lib:libncursesw = $portVersion compat >= 5
lib:libncurses++ = $portVersion compat >= 5
lib:libncurses++w = $portVersion compat >= 5
lib:libpanel = $portVersion compat >= 5
lib:libpanelw = $portVersion compat >= 5
"
REQUIRES="
@@ -40,27 +46,52 @@ BUILD_REQUIRES="
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
"
SOURCE_DIR="$portVersionedName"
doBuild()
{
if [ $# -lt 1 ]; then
echo >&2 "Usage: doBuild <targetDir> [ <configureFlags> ... ]"
exit 1
fi
targetDir=$(pwd)/$1
shift 1
rm -rf $targetDir
mkdir $targetDir
runConfigure \
--omit-dirs "dataRootDir docDir" ./configure \
--with-libtool \
--enable-termcap \
--enable-hard-tabs \
$@
make
make install DESTDIR=$targetDir
}
BUILD()
{
runConfigure --omit-dirs "dataRootDir docDir" ./configure \
--with-libtool \
--enable-termcap \
--enable-widec
make
# Unfortunately building only works in the source directory. So we build
# two times, installing in temporary directories from which we copy to the
# actual installation directory in INSTALL().
doBuild build-nowidec
doBuild build-widec --enable-widec --without-progs
}
INSTALL()
{
./misc/shlib make install
cp -ra build-nowidec/$prefix/. $prefix
cp -ra build-widec/$prefix/. $prefix
# prepare develop/lib
prepareInstalledDevelLibs libformw libmenuw libncursesw libncurses++w \
libpanelw
prepareInstalledDevelLibs \
libform libmenu libncurses libncurses++ libpanel \
libformw libmenuw libncursesw libncurses++w libpanelw
}
DESCRIPTION="The Ncurses (new curses) library is a free software emulation of curses in System V Release 4.0, and more. It uses Terminfo format, supports pads and color and multiple highlights and forms characters and function-key mapping, and has all the other SYSV-curses enhancements over BSD Curses.
The ncurses code was developed under GNU/Linux. It has been in use for some time with OpenBSD as the system curses library, and on FreeBSD and NetBSD as an external package. It should port easily to any ANSI/POSIX-conforming UNIX. It has even been ported to OS/2 Warp!