Merged haikuports/haikuports into master

This commit is contained in:
julien lepiller
2014-04-18 11:51:53 +02:00
15 changed files with 733 additions and 19 deletions

View File

@@ -1,4 +1,4 @@
From 72e4b6e9859ea8e7c3f4a55947a20141bdd4a254 Mon Sep 17 00:00:00 2001
From ddc3088b56acff9a92dd611bc35989cbea8ba580 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Sun, 24 Nov 2013 19:58:36 -0700
Subject: Include config.h before other headers
@@ -17,3 +17,39 @@ index 57fa9d0..26e820b 100644
--
1.8.3.4
From a9cb54731100e3d642a38721d655340d7ba47778 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 14 Apr 2014 18:36:36 +0000
Subject: gcc2 fix
diff --git a/configure b/configure
index 98d81a5..b7af1ec 100755
--- a/configure
+++ b/configure
@@ -17612,6 +17612,8 @@ if ac_fn_c_try_compile "$LINENO"; then :
else
ac_cv_header_stdbool_h=no
fi
+ac_cv_header_stdbool_h=yes
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
diff --git a/src/uuencode.c b/src/uuencode.c
index 370726e..bbf259d 100644
--- a/src/uuencode.c
+++ b/src/uuencode.c
@@ -249,7 +249,7 @@ process_opts (int argc, char ** argv, int * mode)
if (HAVE_OPT(ENCODE_FILE_NAME))
{
size_t nmlen = strlen (output_name);
- size_t bfsz = nmlen + (nmlen / 3) + 4;;
+ size_t bfsz = nmlen + (nmlen / 3) + 4;
char * p = malloc (bfsz);
if (p == NULL)
fserr (UUENCODE_EXIT_FAILURE, "malloc", _("file name"));
--
1.8.3.4

View File

@@ -15,20 +15,14 @@ shell. unshar may also process files containing concatenated shell archives.
HOMEPAGE="http://www.gnu.org/software/sharutils/"
LICENSE="GNU GPL v3"
COPYRIGHT="1990-2013 Free Software Foundation, Inc."
SRC_URI="http://ftp.gnu.org/gnu/sharutils/sharutils-4.14.tar.xz"
CHECKSUM_MD5="77ede22951bdb67279c6e78e79a04784"
SRC_URI="http://ftp.gnu.org/gnu/sharutils/sharutils-4.14.tar.gz"
CHECKSUM_SIZE="2113043"
CHECKSUM_RMD160="18199af4630ffb16ed9d87573cb89f1cc49a6c57"
CHECKSUM_SHA512="248dbdb5bdee69a729d866044a7d0e33c683ed8ad3d356fb6f62d9838d742e4be13f7b41bc45a1c97d905e164057f1261dba9b97b201946dbb19f191a7c78ef4"
REVISION="1"
ARCHITECTURES="x86 ?x86_64"
if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
# x86_gcc2 is fine as primary target architecture as long as we're building
# for a different secondary architecture.
ARCHITECTURES="$ARCHITECTURES x86_gcc2"
else
ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
fi
SECONDARY_ARCHITECTURES="x86"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
sharutils$secondaryArchSuffix = $portVersion
@@ -47,6 +41,7 @@ BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
cmd:awk
cmd:make
cmd:which
cmd:bison

View File

@@ -0,0 +1,95 @@
From a24228db5eb4450d185904b3a3795bffa28ce5f7 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 14 Apr 2014 16:24:18 +0000
Subject: initial haiku patch
diff --git a/archive.hpp b/archive.hpp
index 95645ed..377b779 100644
--- a/archive.hpp
+++ b/archive.hpp
@@ -67,7 +67,6 @@ class Archive:public File
size_t SearchSubBlock(const wchar *Type);
size_t SearchRR();
void WriteBlock(HEADER_TYPE HeaderType,BaseBlock *wb=NULL,bool OnlySetSize=false,bool NonFinalWrite=false);
- void SetBlockSize(HEADER_TYPE HeaderType,BaseBlock *wb=NULL) {WriteBlock(HeaderType,wb,true);}
size_t ReadHeader();
void CheckArc(bool EnableBroken);
void CheckOpen(const wchar *Name);
diff --git a/makefile b/makefile
index dfb3efb..bc6419a 100644
--- a/makefile
+++ b/makefile
@@ -7,8 +7,12 @@ CXXFLAGS=-O2
LIBFLAGS=-fPIC
DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP
STRIP=strip
-LDFLAGS=-pthread
+LDFLAGS=-lbsd
DESTDIR=/usr
+RC=rc
+XRES=xres
+MIMESET=mimeset
+DESTDIR=(shell finddir B_SYSTEM_DIRECTORY)
# Linux using LCC
#CXX=lcc
@@ -116,12 +120,14 @@ install: install-unrar
uninstall: uninstall-unrar
clean:
- @rm -f *.o *.bak *~
+ @rm -f *.o *.bak *~ *.rsrc
unrar: clean $(OBJECTS) $(UNRAR_OBJ)
@rm -f unrar
$(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)
- $(STRIP) unrar
+ $(RC) -o unrar.rsrc unrar.rdef
+ $(XRES) -o unrar unrar.rsrc
+ $(MIMESET) unrar
sfx: WHAT=SFX_MODULE
sfx: clean $(OBJECTS)
diff --git a/os.hpp b/os.hpp
index ed76a19..41594be 100644
--- a/os.hpp
+++ b/os.hpp
@@ -187,6 +187,15 @@
#endif
#endif
+#ifdef __HAIKU__
+ #include <endian.h>
+ #if LITTLE_ENDIAN
+ #undef BIG_ENDIAN
+ #elif BIG_ENDIAN
+ #undef LITTLE_ENDIAN
+ #endif
+#endif
+
#if defined(__sparc) || defined(sparc) || defined(__hpux)
#ifndef BIG_ENDIAN
#define BIG_ENDIAN
diff --git a/unrar.rdef b/unrar.rdef
new file mode 100644
index 0000000..79411da
--- /dev/null
+++ b/unrar.rdef
@@ -0,0 +1,13 @@
+
+resource app_signature "application/x-vnd.Roshal-UnRAR";
+resource app_flags B_MULTIPLE_LAUNCH | B_BACKGROUND_APP;
+
+resource app_version {
+ major = 5,
+ middle = 0,
+ minor = 4,
+ variety = 0,
+ internal = 0,
+ short_info = "5.0.4",
+ long_info = "5.0.4 Alexander Roshal"
+};
--
1.8.3.4

View File

@@ -0,0 +1,58 @@
SUMMARY="Uncompress rar files"
DESCRIPTION="
Unrar decompresses rar files. It is a powerful archive manager that can backup \
your data and reduce the size of email attachments. Unrar can decompress the \
following file formats:
- RAR
- ZIP
- CAB
- ARJ
- JZH
- TAR
- GZ and TAR.GZ
- BZ2 and TAR.BZ2
- ACE
- UUE
- JAR (Java Archive)
- ISO
- 7Z
- XZ
- Z (Unix Compress)
"
HOMEPAGE="http://www.rarlab.com/"
SRC_URI="http://www.rarlab.com/rar/unrarsrc-$portVersion.tar.gz"
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64"
CHECKSUM_SIZE="209707"
CHECKSUM_RMD160="3466c70410f3856af5aad9be57aa5fcc7ae7034b"
CHECKSUM_SHA512="91b05bd2974e0a1cb8bd8f01ee90637c9c48da71a4ffa74e161de969f17bedbcda0cfbac128d366ffa5065e8195004fe82763a2a1e8628f0016621b1c2d364f2"
PATCHES="unrar-5.0.14.patchset"
PROVIDES="
unrar = $portVersion
cmd:unrar = $portVersion
"
REQUIRES="
haiku >= $haikuVersion
"
BUILD_REQUIRES="
haiku_devel >= $haikuVersion
cmd:make
cmd:g++
"
SOURCE_DIR="unrar"
BUILD()
{
make DESTDIR=$prefix
}
INSTALL()
{
make DESTDIR=$prefix install
}
LICENSE="UnRAR"
COPYRIGHT="Alexander Roshal"

View File

@@ -0,0 +1,83 @@
SUMMARY="Portable Network Graphics library"
DESCRIPTION="
libpng is the official PNG reference library. It supports almost all PNG \
features, is extensible, and has been extensively tested for over 17 years
"
HOMEPAGE="http://www.libpng.org"
COPYRIGHT="
1998-2013 Glenn Randers-Pehrson
1996-1997 Andreas Dilger
1995-1996 Guy Eric Schalnat, Group 42, Inc.
"
LICENSE="LibPNG"
SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-$portVersion.tar.gz"
CHECKSUM_SIZE="1355498"
CHECKSUM_RMD160="f8ac24ed499846a69b241c182efb8e73bc72bc77"
CHECKSUM_SHA512="e473e3ea436b55da2e0d68ea58fe4356127a7edb93f28de68ff18efe6aa4a346d7f1a50a1c6dd0fb32500cf0e00f122d82ab710f7484cbe465faebefcf6bf018"
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
libpng$secondaryArchSuffix = $portVersion compat >= 1.6
lib:libpng$secondaryArchSuffix = 16.10.0 compat >= 16
lib:libpng16$secondaryArchSuffix = 16.10.0 compat >= 16
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libz$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
devel:libz$secondaryArchSuffix >= 1.0.4
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtool >= 2.4.2
cmd:make
"
BUILD()
{
aclocal
libtoolize --force --copy --install
aclocal
autoconf
runConfigure ./configure
make $jobArgs
}
INSTALL()
{
make install
prepareInstalledDevelLibs libpng libpng16
fixPkgconfig
# devel package
packageEntries devel \
$binDir \
$developDir \
$manDir/man3
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
libpng${secondaryArchSuffix}_devel = $portVersion compat >= 1.6
cmd:libpng_config$secondaryArchSuffix = $portVersion compat >= 1.6
cmd:libpng16_config$secondaryArchSuffix = $portVersion compat >= 1.6
cmd:pngfix$secondaryArchSuffix = $portVersion compat >= 1.6
cmd:png_fix_itxt$secondaryArchSuffix = $portVersion compat >= 1.6
devel:libpng$secondaryArchSuffix = 16.10.0 compat >= 16
devel:libpng16$secondaryArchSuffix = 16.10.0 compat >= 16
"
REQUIRES_devel="
libpng$secondaryArchSuffix == $portVersion base
haiku$secondaryArchSuffix >= $haikuVersion
lib:libz$secondaryArchSuffix
"

View File

@@ -0,0 +1,86 @@
SUMMARY="Ogg Vorbis audio compression format library"
DESCRIPTION="
Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free, \
general-purpose compressed audio format for mid to high quality (8kHz-48.0kHz, \
16+ bit, polyphonic) audio and music at fixed and variable bitrates from 16 to \
128 kbps/channel. This places Vorbis in the same competitive class as audio \
representations such as MPEG-4 (AAC), and similar to, but higher performance \
than MPEG-1/2 audio layer 3, MPEG-4 audio (TwinVQ), WMA and PAC.
The bitstream format for Vorbis I was frozen Monday, May 8th 2000. All \
bitstreams encoded since will remain compatible with all future releases of \
Vorbis.
"
HOMEPAGE="http://www.xiph.org/vorbis/"
LICENSE="BSD (3-clause)"
COPYRIGHT="1994-2010 Xiph.Org Foundation"
SRC_URI="http://downloads.xiph.org/releases/vorbis/libvorbis-$portVersion.tar.gz"
CHECKSUM_SIZE="1632091"
CHECKSUM_RMD160="3dd9530cff06bcb31adab220906f9c47644b0919"
CHECKSUM_SHA512="5d380cdd2f36b1fe74d7ede0747d3176f951a23bf462a237f2910a2dd9af11a48dc88d8927d0d54831ee6e0c2f5dbbdd606bf3da54d61c26187c7e728decc660"
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PATCHES="libvorbis-1.3.4.patchset"
PROVIDES="
libvorbis$secondaryArchSuffix = $portVersion
lib:libvorbis$secondaryArchSuffix = 0.4.7 compat >= 0
lib:libvorbisenc$secondaryArchSuffix = 2.0.10 compat >= 2
lib:libvorbisfile$secondaryArchSuffix = 3.3.6 compat >= 3
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libogg$secondaryArchSuffix
"
BUILD_REQUIRES="
devel:libogg$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtoolize
cmd:make
cmd:pkg_config
"
BUILD()
{
libtoolize -fci
mkdir -p m4
aclocal --install -I m4
autoconf
automake
runConfigure ./configure \
--docdir $developDocDir
make $jobArgs
}
INSTALL()
{
make install
prepareInstalledDevelLibs libvorbis libvorbisenc libvorbisfile
fixPkgconfig
# devel package
packageEntries devel \
$dataDir \
$developDir
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
libvorbis${secondaryArchSuffix}_devel = $portVersion
devel:libvorbis$secondaryArchSuffix = 0.4.7 compat >= 0
devel:libvorbisenc$secondaryArchSuffix = 2.0.10 compat >= 2
devel:libvorbisfile$secondaryArchSuffix = 3.3.6 compat >= 3
"
REQUIRES_devel="
libvorbis$secondaryArchSuffix == $portVersion
"

View File

@@ -0,0 +1,83 @@
From 70dcb91819b2acac447344c2ad6b0c5c89dfa630 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Tue, 11 Jun 2013 17:54:49 +0200
Subject: applying patch libvorbis-1.3.2.patch
diff --git a/configure.ac b/configure.ac
index 98b78ac..4b881b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -206,6 +206,10 @@ else
DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
CFLAGS="-O20 -Wall -W -ffast-math -D_REENTRANT -fsigned-char"
PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";;
+ *-*-haiku*)
+ DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
+ CFLAGS="-O20 -Wall -D__NO_MATH_INLINES -fsigned-char"
+ PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
*)
DEBUG="-g -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char"
CFLAGS="-O20 -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char"
--
1.7.5
From ef7dac90d78c39bb3990d66ff932d50bc1ea98d3 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Tue, 11 Jun 2013 18:06:31 +0200
Subject: doc/*/Makefile.am: remove hard-coded docdir
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2870528..6d7851b 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,8 +2,6 @@
SUBDIRS = libvorbis vorbisfile vorbisenc
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
-
### all of the static docs, commited to SVN and included as is
static_docs = \
rfc5215.xml \
diff --git a/doc/libvorbis/Makefile.am b/doc/libvorbis/Makefile.am
index 0bcc135..aea57e9 100644
--- a/doc/libvorbis/Makefile.am
+++ b/doc/libvorbis/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to produce Makefile.in
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/libvorbis
-
doc_DATA = index.html reference.html style.css vorbis_comment.html\
vorbis_info.html vorbis_analysis_blockout.html vorbis_analysis_buffer.html\
vorbis_analysis_headerout.html vorbis_analysis_init.html \
diff --git a/doc/vorbisenc/Makefile.am b/doc/vorbisenc/Makefile.am
index bbab3c5..008586e 100644
--- a/doc/vorbisenc/Makefile.am
+++ b/doc/vorbisenc/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to produce Makefile.in
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisenc
-
doc_DATA = changes.html examples.html index.html ovectl_ratemanage2_arg.html \
ovectl_ratemanage_arg.html overview.html reference.html style.css\
vorbis_encode_ctl.html vorbis_encode_init.html vorbis_encode_setup_init.html \
diff --git a/doc/vorbisfile/Makefile.am b/doc/vorbisfile/Makefile.am
index fb27d44..faa6352 100644
--- a/doc/vorbisfile/Makefile.am
+++ b/doc/vorbisfile/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to produce Makefile.in
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisfile
-
doc_DATA = OggVorbis_File.html callbacks.html chaining_example_c.html\
chainingexample.html crosslap.html datastructures.html decoding.html\
example.html exampleindex.html fileinfo.html index.html\
--
1.7.5

View File

@@ -0,0 +1,8 @@
#command
\177 back-screen
^H back-screen
#line-edit
\177 backspace
^H backspace
#env
LESS=-R -M

View File

@@ -7,15 +7,17 @@ termcap (or terminfo on some systems), so it can run on a variety of \
terminals. There is even limited support for hardcopy terminals.
"
HOMEPAGE="http://www.gnu.org/software/less/"
SRC_URI="http://ftp.gnu.org/gnu/less/less-451.tar.gz"
CHECKSUM_MD5="765f082658002b2b46b86af4a0da1842"
SRC_URI="http://ftp.gnu.org/gnu/less/less-$portVersion.tar.gz"
CHECKSUM_SIZE="310144"
CHECKSUM_RMD160="da5bcae3e503fd45ef590d4b38b0a5018b3b0d07"
CHECKSUM_SHA512="6a9a0853e802306c9f6695e8a71f2bcfd38479c80a4f814852fd012caf4823f448d9f203ca52bc356f31aa368bf96e773938ee2be5ff20804dce3ee1a28bf42d"
LICENSE="GNU GPL v3"
COPYRIGHT="1984-2012 Mark Nudelman"
REVISION="2"
REVISION="4"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PROVIDES="
less = 451
less = $portVersion
cmd:less
cmd:lessecho
cmd:lesskey
@@ -41,14 +43,27 @@ BUILD_PREREQUIRES="
PATCHES="less-451.patch"
GLOBAL_WRITABLE_FILES="
settings/etc/sysless.src keep-old
settings/etc/sysless keep-old
"
BUILD()
{
autoconf
runConfigure ./configure --with-editor=nano
runConfigure ./configure --with-editor=nano \
--sysconfdir=$settingsDir/etc
make
}
INSTALL()
{
make install
syslessDir=$settingsDir/etc
mkdir $syslessDir
cp "$portDir/additional-files/sysless.in" \
"$syslessDir/sysless.src"
$binDir/lesskey -o "$syslessDir/sysless" \
"$syslessDir/sysless.src"
}

View File

@@ -0,0 +1,64 @@
SUMMARY="A tool for generating scanners."
DESCRIPTION="
Flex is a fast lexical analyser generator. It is a tool for generating \
programs that perform pattern-matching on text.
"
HOMEPAGE="http://flex.sourceforge.net/"
COPYRIGHT="2001-2007 The Flex Project; 1990, 1997 The Regents of the University of California"
LICENSE="Flex"
SRC_URI="http://sourceforge.net/projects/flex/files/flex-$portVersion.tar.bz2"
CHECKSUM_SIZE="1612101"
CHECKSUM_RMD160="df37c29727c40527fb8b8118a6a580c21a923591"
CHECKSUM_SHA512="8b1b86b81e7d231c746887c0c24fd1004f3f7598af4e41408667f609918a9994721b61d666a1e184822409de329323b829193a4a8dcdf12ce9313d0fe37cbbc1"
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PATCHES="flex-2.5.39.patchset"
PROVIDES="
flex = $portVersion compat >= 2.5
cmd:flex = $portVersion compat >= 2.5
cmd:flex++ = $portVersion compat >= 2.5
lib:libfl = 2.0.0 compat >= 2
lib:libfl_pic = 2.0.0 compat >= 2
devel:libfl = 2.0.0 compat >= 2
devel:libfl_pic = 2.0.0 compat >= 2
"
REQUIRES="
haiku >= $haikuVersion
cmd:m4
"
BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:gcc
cmd:ld
cmd:libtoolize
cmd:make
cmd:makeinfo
"
BUILD()
{
rm aclocal.m4
libtoolize --force --copy --install
aclocal -I m4
autoconf
automake --add-missing --force-missing
runConfigure ./configure \
--disable-rpath --with-gnu-ld
make $jobArgs
}
INSTALL()
{
make install
# prepare develop/lib
prepareInstalledDevelLibs libfl libfl_pic
}

View File

@@ -0,0 +1,35 @@
From 40175da3a270397dcf9f684c360f9161c637039f Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 14 Apr 2014 17:00:54 +0000
Subject: initial haiku patch
diff --git a/configure.ac b/configure.ac
index 871082f..a3913b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,7 +48,7 @@ LT_INIT
AC_PROG_AWK
AC_PROG_INSTALL
-AC_PATH_PROG(BISON, bison,bison)
+AC_CHECK_PROG(BISON, bison,bison)
AC_PATH_PROG(HELP2MAN, help2man, help2man)
# Check for a m4 that supports -P
diff --git a/tests/test-pthread/Makefile.am b/tests/test-pthread/Makefile.am
index fe5d545..e8023e8 100644
--- a/tests/test-pthread/Makefile.am
+++ b/tests/test-pthread/Makefile.am
@@ -27,7 +27,7 @@ CLEANFILES = scanner.c scanner.h parser.c parser.h $(testname)$(EXEEXT) OUTPUT $
OBJS = scanner.o # parser.o
AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
-LIBS = -lpthread
+#LIBS = -lpthread
#LFLAGS = --header="scanner.h"
#YFLAGS = --defines --output=parser.c
--
1.8.3.4

View File

@@ -35,6 +35,7 @@ PROVIDES="
cmd:gcc$secondaryArchSuffix = $portVersion compat >= 4
cmd:gcc_4.8.2$secondaryArchSuffix = $portVersion compat >= 4
cmd:gcov$secondaryArchSuffix = $portVersion compat >= 4
lib:libstdc++$secondaryArchSuffix = $portVersion compat >= 4
"
REQUIRES="

View File

@@ -7,7 +7,9 @@ HOMEPAGE="http://www.gnu.org/software/libtool"
COPYRIGHT="2004-2010 Free Software Foundation, Inc."
LICENSE="GNU GPL v2"
SRC_URI="ftp://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz"
CHECKSUM_MD5="d2f3b7d4627e69e13514a40e72a24d50"
CHECKSUM_SIZE="2632347"
CHECKSUM_RMD160="b7153f3f1e1c50d8c04787cafccd4e19af62ec7d"
CHECKSUM_SHA512="0e54af7bbec376f943f2b8e4f13631fe5627b099a37a5f0252e12bade76473b0a36a673529d594778064cd8632abdc43d8a20883d66d6b27738861afbb7e211d"
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64"
@@ -29,6 +31,8 @@ REQUIRES="
cmd:automake
cmd:sed
cmd:tar
cmd:find
cmd:xargs
"
BUILD_REQUIRES="
"

View File

@@ -0,0 +1,76 @@
SUMMARY="Library for inspecting program's backtrace"
DESCRIPTION="
This is a quick-n-dirty BSD licensed clone of backtrace facility found
in the GNU libc, mainly intended for porting linuxish code to BSD
platforms, however it can be used at any platform which has a gcc
compiler.
"
HOMEPAGE="http://www.freshports.org/devel/libexecinfo"
COPYRIGHT="2003-2014 Maxim Sobolev"
LICENSE="BSD (2-clause)"
SRC_URI="http://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/itetcu/libexecinfo-1.1.tar.bz2"
CHECKSUM_SIZE="4841"
CHECKSUM_RMD160="b2227d4095be0002185b667b9fde71cd876a4ed7"
CHECKSUM_SHA512="51fea7910ef6873061a25c22434ce4da724e9d8e37616a069ad0a58c0463755be4c6c7da88cd747484c2f3373909d7be4678b32a4bd91b6d9e0f74526094e92c"
REVISION="1"
ARCHITECTURES="x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
libexecinfo$secondaryArchSuffix = $portVersion compat >= 1
lib:libexecinfo$secondaryArchSuffix = $portVersion compat >= 1
"
REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
"
BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
"
PATCHES="libexecinfo-$portVersion.patchset"
BUILD()
{
gcc -c -o execinfo.o execinfo.c
gcc -c -o stacktraverse.o stacktraverse.c
ar rcs libexecinfo.a execinfo.o stacktraverse.o
gcc -shared -Wl,-soname,libexecinfo.so.1.1 -o libexecinfo.so execinfo.o stacktraverse.o
}
INSTALL()
{
mkdir -p $libDir
mkdir -p $includeDir
cp libexecinfo.a $libDir
cp libexecinfo.so $libDir/libexecinfo.so.1.1
ln -s $libDir/libexecinfo.so-1.1 $libDir/libexecinfo.so
cp execinfo.h $includeDir
prepareInstalledDevelLibs libexecinfo
# devel package
packageEntries devel \
$developDir
}
TEST()
{
gcc test.c -o test libexecinfo.a
./test
}
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
libexecinfo${secondaryArchSuffix}_devel = $portVersion compat >= 1
devel:libexecinfo${secondaryArchSuffix} = $portVersion compat >= 1
"
REQUIRES_devel="
libexecinfo${secondaryArchSuffix} == $portVersion base
"

View File

@@ -0,0 +1,75 @@
From 9618f81449961ea9f5c6d85e45aab86a6b4a16c7 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Thu, 17 Apr 2014 11:06:49 +0200
Subject: Import FreeBSD patches.
diff --git a/execinfo.c b/execinfo.c
index 906fb14..9448b60 100644
--- a/execinfo.c
+++ b/execinfo.c
@@ -69,7 +69,8 @@ backtrace(void **buffer, int size)
char **
backtrace_symbols(void *const *buffer, int size)
{
- int i, clen, alen, offset;
+ size_t clen, alen;
+ int i, offset;
char **rval;
char *cp;
Dl_info info;
@@ -78,7 +79,6 @@ backtrace_symbols(void *const *buffer, int size)
rval = malloc(clen);
if (rval == NULL)
return NULL;
- (char **)cp = &(rval[size]);
for (i = 0; i < size; i++) {
if (dladdr(buffer[i], &info) != 0) {
if (info.dli_sname == NULL)
@@ -92,14 +92,14 @@ backtrace_symbols(void *const *buffer, int size)
2 + /* " <" */
strlen(info.dli_sname) + /* "function" */
1 + /* "+" */
- D10(offset) + /* "offset */
+ 10 + /* "offset */
5 + /* "> at " */
strlen(info.dli_fname) + /* "filename" */
1; /* "\0" */
rval = realloc_safe(rval, clen + alen);
if (rval == NULL)
return NULL;
- snprintf(cp, alen, "%p <%s+%d> at %s",
+ snprintf((char *) rval + clen, alen, "%p <%s+%d> at %s",
buffer[i], info.dli_sname, offset, info.dli_fname);
} else {
alen = 2 + /* "0x" */
@@ -108,12 +108,15 @@ backtrace_symbols(void *const *buffer, int size)
rval = realloc_safe(rval, clen + alen);
if (rval == NULL)
return NULL;
- snprintf(cp, alen, "%p", buffer[i]);
+ snprintf((char *) rval + clen, alen, "%p", buffer[i]);
}
- rval[i] = cp;
- cp += alen;
+ rval[i] = (char *) clen;
+ clen += alen;
}
+ for (i = 0; i < size; i++)
+ rval[i] += (long) rval;
+
return rval;
}
@@ -155,6 +158,6 @@ backtrace_symbols_fd(void *const *buffer, int size, int fd)
return;
snprintf(buf, len, "%p\n", buffer[i]);
}
- write(fd, buf, len - 1);
+ write(fd, buf, strlen(buf));
}
}
--
1.8.3.4