From e4f515b6baf645161693787c240bdc82d0efaa6a Mon Sep 17 00:00:00 2001 From: miqlas Date: Sat, 14 Jan 2017 18:33:10 +0100 Subject: [PATCH] irssi: bump version, removed old recipes and patchfiles. (#1005) * irssi: bump version, removed old recipes and patchfiles. * Removed unnecessary LDFLAGS and CFLAG * Removed secondary arch suffixes --- net-irc/irssi/irssi-0.8.15.recipe | 30 -------- net-irc/irssi/irssi-0.8.19_git.recipe | 66 ------------------ net-irc/irssi/irssi-1.0.0.recipe | 66 ++++++++++++++++++ .../irssi/patches/irssi-0.8.18_git.patchset | 68 ------------------- net-irc/irssi/patches/irssi-ncurses.patch | 49 ------------- 5 files changed, 66 insertions(+), 213 deletions(-) delete mode 100644 net-irc/irssi/irssi-0.8.15.recipe delete mode 100644 net-irc/irssi/irssi-0.8.19_git.recipe create mode 100644 net-irc/irssi/irssi-1.0.0.recipe delete mode 100644 net-irc/irssi/patches/irssi-0.8.18_git.patchset delete mode 100644 net-irc/irssi/patches/irssi-ncurses.patch diff --git a/net-irc/irssi/irssi-0.8.15.recipe b/net-irc/irssi/irssi-0.8.15.recipe deleted file mode 100644 index e1a023492..000000000 --- a/net-irc/irssi/irssi-0.8.15.recipe +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="Irssi is a command line irc client" -HOMEPAGE="http://www.irssi.org/" -SOURCE_URI="http://www.irssi.org/files/irssi-0.8.15.tar.gz" -CHECKSUM_MD5="870db8e319f640c2bf446c30d0c24ef6" -REVISION="1" - -STATUS_HAIKU="untested" -DEPEND="sys-devel/gettext >= 0.18.1 - dev-util/pkgconfig >= 0.25 - dev-libs/glib >= 2.24.2" - -BUILD() -{ - cd irssi-0.8.15 - libtoolize --force --copy --install - autoreconf -i - sed -i.bak 's/\$withval\/include\/ncurses.h/\/boot\/develop\/headers\/3rdparty\/ncurses.h/g' configure - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-ncurses=`finddir B_COMMON_DIRECTORY` - make - -} - -INSTALL() -{ - cd irssi-0.8.15 - make install -} - -LICENSE="GNU GPL v2" -COPYRIGHT="1999-2012 Timo Sirainen" diff --git a/net-irc/irssi/irssi-0.8.19_git.recipe b/net-irc/irssi/irssi-0.8.19_git.recipe deleted file mode 100644 index e3b89d00f..000000000 --- a/net-irc/irssi/irssi-0.8.19_git.recipe +++ /dev/null @@ -1,66 +0,0 @@ -SUMMARY="A text-based IRC client" -DESCRIPTION="Irssi is an IRC client written in the C programming language.\ -It uses a text-mode user interface. Numerous Perl scripts have been \ -made available for Irssi to customise how it looks and operates. Plugins \ -are available which add encryption and protocols such as ICQ and XMPP." -HOMEPAGE="https://irssi.org/" -COPYRIGHT="1999-2016 Timo Sirainen" -LICENSE="GNU GPL v2" -REVISION="1" -srcGitRev="1cfec5f63d4adf32117f68638fb35802146e2784" -SOURCE_URI="https://github.com/irssi/irssi/archive/$srcGitRev.tar.gz" -CHECKSUM_SHA256="e4118fedeee70133b4aab70406c30be107cc0078c4d5c509e2b068277284d88a" -SOURCE_DIR="irssi-$srcGitRev" -PATCHES="irssi-ncurses.patch" - -ARCHITECTURES="x86_gcc2 x86" - -PROVIDES=" - irssi$secondaryArchSuffix = $portVersion - cmd:irssi$secondaryArchSuffix - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libglib_2.0$secondaryArchSuffix - lib:libiconv$secondaryArchSuffix - lib:libintl$secondaryArchSuffix - lib:libncurses$secondaryArchSuffix - lib:libperl$secondaryArchSuffix - lib:libssl$secondaryArchSuffix - " - -BUILD_REQUIRES=" - devel:libglib_2.0$secondaryArchSuffix - devel:libncurses$secondaryArchSuffix - devel:libssl$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - cmd:aclocal - cmd:autoreconf - cmd:chmod - cmd:gcc$secondaryArchSuffix - cmd:git - cmd:libtoolize$secondaryArchSuffix - cmd:links - cmd:ld$secondaryArchSuffix - cmd:make - cmd:pkg_config$secondaryArchSuffix - " - -GLOBAL_WRITABLE_FILES=" - settings/irssi.conf keep-old - " - -BUILD() -{ - chmod +x autogen.sh irssi-version.sh file2header.sh - ./autogen.sh $configureDirArgs --with-perl --with-socks --with-proxy \ - --enable-true-color - make $jobArgs -} - -INSTALL() -{ - make install-strip -} diff --git a/net-irc/irssi/irssi-1.0.0.recipe b/net-irc/irssi/irssi-1.0.0.recipe new file mode 100644 index 000000000..bea256d02 --- /dev/null +++ b/net-irc/irssi/irssi-1.0.0.recipe @@ -0,0 +1,66 @@ +SUMMARY="A text-based IRC client" +DESCRIPTION="Irssi is an IRC client written in the C programming language.\ +It uses a text-mode user interface. Numerous Perl scripts have been \ +made available for Irssi to customise how it looks and operates. Plugins \ +are available which add encryption and protocols such as ICQ and XMPP." +HOMEPAGE="https://irssi.org/" +COPYRIGHT="1999-2016 Timo Sirainen" +LICENSE="GNU GPL v2" +REVISION="1" +SOURCE_URI="https://github.com/irssi/irssi/releases/download/$portVersion/irssi-$portVersion.tar.gz" +CHECKSUM_SHA256="790eb3b62d8889d1fb3973845d8ca5d7c2578620632abc671ffdff3da13aa487" +SOURCE_DIR="irssi-$portVersion" + +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + irssi = $portVersion + cmd:irssi + " +REQUIRES=" + haiku + lib:libglib_2.0 + lib:libiconv + lib:libintl + lib:libncursesw + lib:libperl + lib:libssl + " + +BUILD_REQUIRES=" + devel:libglib_2.0 + devel:libncursesw + devel:libssl + " +BUILD_PREREQUIRES=" + haiku_devel + cmd:aclocal + cmd:autoreconf + cmd:gcc + cmd:git + cmd:libtoolize + cmd:links + cmd:ld + cmd:make + cmd:perl + cmd:pkg_config + " + +GLOBAL_WRITABLE_FILES=" + settings/irssi.conf keep-old + " + +BUILD() +{ + chmod +x autogen.sh irssi-version.sh file2header.sh + ./autogen.sh $configureDirArgs --with-perl=module --with-socks \ + --with-proxy --enable-true-color + make $jobArgs +} + +INSTALL() +{ + make install-strip + + rm $libDir/irssi/modules/lib*.la +} diff --git a/net-irc/irssi/patches/irssi-0.8.18_git.patchset b/net-irc/irssi/patches/irssi-0.8.18_git.patchset deleted file mode 100644 index 5c456c81d..000000000 --- a/net-irc/irssi/patches/irssi-0.8.18_git.patchset +++ /dev/null @@ -1,68 +0,0 @@ -From 2e397f7609099a71b4ff48cd538fb323bd583ab6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= -Date: Tue, 22 Jul 2014 01:39:16 +0200 -Subject: [PATCH 1/2] Check for socket() in libnetwork for Haiku - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 7bcd3fe..fad030e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -187,7 +187,7 @@ case "$host_os" in - esac - - --AC_SEARCH_LIBS([socket], [socket]) -+AC_SEARCH_LIBS([socket], [network socket]) - - AC_SEARCH_LIBS([inet_addr], [nsl]) - --- -2.2.2 - -From 80e28a66f2ef86217f85c64d3ea43b25bc357010 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= -Date: Tue, 22 Jul 2014 01:39:39 +0200 -Subject: [PATCH 2/2] Add proper ncurses check for Haiku - ---- - m4/curses.m4 | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/m4/curses.m4 b/m4/curses.m4 -index 82b110f..0241b38 100644 ---- a/m4/curses.m4 -+++ b/m4/curses.m4 -@@ -244,6 +244,26 @@ AC_DEFUN([AC_SEARCH_NCURSES], [ - [renamed ncurses in /usr/local/include/ncurses]) - AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses, -I/usr/include/ncurses -DRENAMED_NCURSES, - [renamed ncurses in /usr/include/ncurses]) -+ AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses, -I/usr/include/ncurses -DRENAMED_NCURSES, -+ [renamed ncurses in /usr/include/ncurses]) -+ -+ dnl -+ dnl Try Haiku ncurses -+ dnl Depending if we are building for the primary or secondary arch -+ dnl it can be installed at different locations -+ dnl -+ if $search_ncurses -+ then -+ if test -d /system/develop/headers -+ then -+ haiku_arch=`getarch` -+ for haiku_h in `findpaths -a $haiku_arch B_FIND_PATH_HEADERS_DIRECTORY` -+ do -+ AC_NCURSES($haiku_h, ncurses.h, -lncurses,, -+ [ncurses in $haiku_h]) -+ done -+ fi -+ fi - - dnl - dnl We couldn't find ncurses, try SysV curses --- -2.2.2 - diff --git a/net-irc/irssi/patches/irssi-ncurses.patch b/net-irc/irssi/patches/irssi-ncurses.patch deleted file mode 100644 index fdbc7b44e..000000000 --- a/net-irc/irssi/patches/irssi-ncurses.patch +++ /dev/null @@ -1,49 +0,0 @@ -From dadf80f3802ad275f3efa30418490efcac63148e Mon Sep 17 00:00:00 2001 -From: pisculichi -Date: Fri, 8 Apr 2016 16:13:24 +0000 -Subject: [PATCH] Fix search ncurses in haiku - ---- - m4/curses.m4 | 20 +++++++++++++++++++- - 1 file changed, 19 insertions(+), 1 deletion(-) - -diff --git a/m4/curses.m4 b/m4/curses.m4 -index 41c0e6c..00039d0 100644 ---- a/m4/curses.m4 -+++ b/m4/curses.m4 -@@ -57,7 +57,7 @@ dnl - dnl /*=== Curses version detection defines ===*/ - dnl /* Found some version of curses that we're going to use */ - dnl #undef HAS_CURSES --dnl -+dnl - dnl /* Use SunOS SysV curses? */ - dnl #undef USE_SUNOS_CURSES - dnl -@@ -246,6 +246,24 @@ AC_DEFUN([AC_SEARCH_NCURSES], [ - [renamed ncurses in /usr/include/ncurses]) - - dnl -+ dnl Try Haiku ncurses -+ dnl Depending if we are building for the primary or secondary arch -+ dnl it can be installed at different locations -+ dnl -+ if $search_ncurses -+ then -+ if test -d /system/develop/headers -+ then -+ haiku_arch=`getarch` -+ for haiku_h in `findpaths -a $haiku_arch B_FIND_PATH_HEADERS_DIRECTORY` -+ do -+ AC_NCURSES($haiku_h, ncurses.h, -lncurses,, -+ [ncurses in $haiku_h]) -+ done -+ fi -+ fi -+ -+ dnl - dnl We couldn't find ncurses, try SysV curses - dnl - if $search_ncurses --- -2.2.2