update profanity to 0.5.0. From Rafael Sadowski

ok feinerer
This commit is contained in:
tb 2016-11-29 22:26:57 +00:00
parent 48afb49537
commit 189dba3c62
5 changed files with 57 additions and 42 deletions

View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.3 2016/04/26 09:35:38 sthen Exp $
# $OpenBSD: Makefile,v 1.4 2016/11/29 22:26:57 tb Exp $
COMMENT = console based XMPP client
DISTNAME = profanity-0.4.7
DISTNAME = profanity-0.5.0
CATEGORIES = net
HOMEPAGE = http://www.profanity.im/
@ -12,19 +12,22 @@ PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES = http://www.profanity.im/
WANTLIB += assuan c curl ereadline glib-2.0 gpg-error gpgme intl ncursesw
WANTLIB += otr strophe uuid
WANTLIB += assuan c crypto curl ereadline expat ffi gcrypt gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gpg-error
WANTLIB += gpgme iconv intl m ncursesw nghttp2 notify otr
WANTLIB += pcre png pthread ssl strophe z
BUILD_DEPENDS +=${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
LIB_DEPENDS += net/curl \
LIB_DEPENDS += devel/glib2 \
devel/libnotify \
devel/readline>=6.1p2 \
devel/glib2 \
net/libstrophe \
graphics/gdk-pixbuf2 \
net/curl \
net/libstrophe>=0.9.1 \
security/gpgme \
security/libotr \
sysutils/e2fsprogs
security/libotr
TEST_DEPENDS = devel/cmocka
@ -33,8 +36,9 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
CONFIGURE_ARGS = --with-xscreensaver=no \
--enable-notifications \
--enable-otr
--enable-icons=no \
--enable-notifications=yes \
--enable-otr=yes
MAKE_FLAGS = CC="${CC}" CFLAGS="${CFLAGS}"
@ -45,6 +49,6 @@ AUTOMAKE_VERSION = 1.11
post-patch:
find ${WRKSRC} -type f -name "*.c" \
-exec sed -i '/stub\_ui.h/d' "{}" \;
sed -i s,/usr/local,${LOCALBASE}, ${WRKSRC}/configure.ac
sed -i s,${TRUEPREFIX},${LOCALBASE}, ${WRKSRC}/configure.ac
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (profanity-0.4.7.tar.gz) = sCxOAp/oSUEFDMq2yM318V3yPeXROEtNHsZtpvruEd0=
SIZE (profanity-0.4.7.tar.gz) = 463291
SHA256 (profanity-0.5.0.tar.gz) = eDvoqm6rcZL8IR8ArawTayHlgOpS2cBxKDEqlgmTlmg=
SIZE (profanity-0.5.0.tar.gz) = 687169

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.1.1.1 2016/04/25 17:46:38 tb Exp $
--- configure.ac.orig Sun Sep 20 17:42:03 2015
+++ configure.ac Sun Oct 4 23:13:15 2015
@@ -19,6 +19,7 @@ AC_CANONICAL_HOST
$OpenBSD: patch-configure_ac,v 1.2 2016/11/29 22:26:57 tb Exp $
--- configure.ac.orig Wed Sep 14 22:52:04 2016
+++ configure.ac Sun Sep 25 21:17:03 2016
@@ -22,6 +22,7 @@ AC_CANONICAL_HOST
PLATFORM="unknown"
AS_CASE([$host_os],
[freebsd*], [PLATFORM="freebsd"],
@ -9,24 +9,9 @@ $OpenBSD: patch-configure_ac,v 1.1.1.1 2016/04/25 17:46:38 tb Exp $
[darwin*], [PLATFORM="osx"],
[cygwin], [PLATFORM="cygwin"],
[PLATFORM="nix"])
@@ -57,12 +58,12 @@ AC_ARG_WITH([themes],
# Use the CFLAGS and libs provided by libstrophe.pc if libstrophe has pkg-config support.
PKG_CHECK_MODULES([libstrophe], [libstrophe], [LIBS="$libstrophe_LIBS $LIBS"],
[
- if test "x$PLATFORM" != xfreebsd; then
+ if test "x$PLATFORM" != xfreebsd || test "x$PLATFORM" != xopenbsd; then
AC_CHECK_LIB([resolv], [res_query], [],
[AC_CHECK_LIB([resolv], [__res_query], [],
[AC_MSG_ERROR([libresolv not found; libresolv required for profanity])])])
else
- AC_MSG_NOTICE([skipping libresolv checks for freebsd])
+ AC_MSG_NOTICE([skipping libresolv checks for FreeBSD and OpenBSD])
fi
### Check for libstrophe dependencies
@@ -141,17 +142,24 @@ PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.26], [],
PKG_CHECK_MODULES([curl], [libcurl], [],
[AC_MSG_ERROR([libcurl is required for profanity])])
@@ -172,15 +173,22 @@ AS_IF([test "x$enable_icons" != xno],
[AC_MSG_ERROR([gtk+-2.0 or higher is required for icons])],
[AC_MSG_NOTICE([gtk+-2.0 not found, icons not enabled])])])])
-AS_IF([test "x$PLATFORM" != xosx],
- [AC_CHECK_LIB([readline], [main], [],
@ -54,8 +39,14 @@ $OpenBSD: patch-configure_ac,v 1.1.1.1 2016/04/25 17:46:38 tb Exp $
+ [AC_MSG_ERROR([libreadline is required for profanity])])],
+ [AC_MSG_ERROR([libreadline is required for profanity])])
-AC_CHECK_LIB([uuid], [uuid_generate], [],
+AC_CHECK_LIB([uuid], [uuid_generate], [LIBS="-luuid $LIBS"],
[AC_MSG_ERROR([libuuid is required for profanity])])
AS_IF([test "x$PLATFORM" = xosx], [LIBS="-lcurl $LIBS"])
### Check for desktop notification support
### Linux/FreeBSD require libnotify
@@ -196,7 +204,7 @@ AS_IF([test "x$PLATFORM" = xosx],
[AC_MSG_ERROR([terminal-notifier not found, required for desktop notifications.])],
[AC_MSG_NOTICE([Desktop notifications not supported.])])],
[AC_DEFINE([HAVE_OSXNOTIFY], [1], [terminal notifier])])])],
- [test "x$PLATFORM" = xnix -o "x$PLATFORM" = xfreebsd],
+ [test "x$PLATFORM" = xnix -o "x$PLATFORM" = xfreebsd -o "x$PLATFORM" = xopenbsd],
[AS_IF([test "x$enable_notifications" != xno],
[PKG_CHECK_MODULES([libnotify], [libnotify],
[AC_DEFINE([HAVE_LIBNOTIFY], [1], [libnotify module])],

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-tests_unittests_tools_stub_http_upload_c,v 1.1 2016/11/29 22:26:57 tb Exp $
fix missing include
--- tests/unittests/tools/stub_http_upload.c.orig Wed Sep 28 22:32:21 2016
+++ tests/unittests/tools/stub_http_upload.c Wed Sep 28 22:33:12 2016
@@ -37,6 +37,8 @@
#include <curl/curl.h>
+#include <pthread.h>
+
// forward -> ui/win_types.h
typedef struct prof_win_t ProfWin;

View File

@ -1,11 +1,16 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2016/04/25 17:46:38 tb Exp $
@comment $OpenBSD: PLIST,v 1.2 2016/11/29 22:26:57 tb Exp $
@bin bin/profanity
@man man/man1/profanity.1
share/profanity/
share/profanity/icons/
share/profanity/icons/proIcon.png
share/profanity/icons/proIconMsg.png
share/profanity/themes/
share/profanity/themes/aqua
share/profanity/themes/batman
share/profanity/themes/bios
share/profanity/themes/boothj5
share/profanity/themes/boothj5_slack
share/profanity/themes/complex
share/profanity/themes/forest
share/profanity/themes/hacker