Update lumail to 0.18.

Lumail now depends on gmime instead of mimetic so update LIB_DEPENDS and
WANTLIB. Also, switch to MAKE_FLAGS which removes the need for
patch-Makefile. Suggestions from sthen@ and aja@.

"fine with me" sthen@
This commit is contained in:
jturner 2013-08-15 15:05:27 +00:00
parent 9b02db2773
commit 1489a9b088
4 changed files with 15 additions and 28 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.10 2013/08/12 00:24:57 jturner Exp $
# $OpenBSD: Makefile,v 1.11 2013/08/15 15:05:27 jturner Exp $
COMMENT = console-based e-mail client with Lua scripting support
DISTNAME = lumail-0.17
DISTNAME = lumail-0.18
CATEGORIES = mail
MAINTAINER = James Turner <james@calminferno.net>
@ -13,24 +13,25 @@ MASTER_SITES = http://lumail.org/download/
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += c ${MODLUA_WANTLIB} m mimetic ncursesw pcre pcrecpp
WANTLIB += c gio-2.0 glib-2.0 gmime-2.6 gobject-2.0
WANTLIB += ${MODLUA_WANTLIB} m ncursesw pcre pcrecpp pthread
MODULES = gcc4 lang/lua
MODULES = devel/gettext gcc4 lang/lua
MODGCC4_ARCHS = *
MODGCC4_LANGS = c++
LIB_DEPENDS += ${MODLUA_LIB_DEPENDS} \
mail/mimetic \
mail/gmime \
devel/pcre
USE_GMAKE = Yes
ALL_TARGET = lumail
MAKE_ENV = CXX="${CXX}" \
MAKE_FLAGS = CC="${CXX}" \
CPPFLAGS="-std=gnu++0x -I${LOCALBASE}/include \
`pkg-config --cflags ${MODLUA_DEP}`" \
LDLIBS="`pkg-config --libs ${MODLUA_DEP}` \
-lmimetic -lncursesw -lpcrecpp -lpcre"
-lncursesw -lpcrecpp -lpcre"
NO_TEST = Yes

View File

@ -1,2 +1,2 @@
SHA256 (lumail-0.17.tar.gz) = 1FZQNBSjB5y+XhLbmxSwElNDxW6JnXPrMi/8tJIT6pA=
SIZE (lumail-0.17.tar.gz) = 72012
SHA256 (lumail-0.18.tar.gz) = c3RJudo1qoLcNApQZ44l3CP3wuu9OgDHfVCPw8DY0rk=
SIZE (lumail-0.18.tar.gz) = 65924

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-Makefile,v 1.7 2013/08/12 00:24:57 jturner Exp $
--- Makefile.orig Fri Aug 9 16:52:06 2013
+++ Makefile Sun Aug 11 20:17:00 2013
@@ -41,8 +41,8 @@ VERSION=$(shell sh -c 'git describe --abbrev=0 --tags
CC=g++
LINKER=$(CC) -o
LVER=lua5.1
-CPPFLAGS+=-std=gnu++0x -Wall -Werror $(shell pkg-config --cflags ${LVER}) $(shell pcre-config --cflags) -I/usr/include/ncursesw/
-LDLIBS+=$(shell pkg-config --libs ${LVER}) -lncursesw -lmimetic -lpcre -lpcrecpp
+CPPFLAGS?=-std=gnu++0x -Wall -Werror $(shell pkg-config --cflags ${LVER}) $(shell pcre-config --cflags) -I/usr/include/ncursesw/
+LDLIBS?=$(shell pkg-config --libs ${LVER}) -lncursesw -lmimetic -lpcre -lpcrecpp

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-src_screen_cc,v 1.1 2013/08/06 23:20:37 jturner Exp $
--- src/screen.cc.orig Sun Aug 4 18:12:46 2013
+++ src/screen.cc Sun Aug 4 18:12:50 2013
@@ -25,7 +25,7 @@
$OpenBSD: patch-src_screen_cc,v 1.2 2013/08/15 15:05:27 jturner Exp $
--- src/screen.cc.orig Wed Aug 14 04:47:58 2013
+++ src/screen.cc Wed Aug 14 20:36:51 2013
@@ -24,7 +24,7 @@
#include <cctype>
#include <sys/ioctl.h>
#include <dirent.h>
-#include <cursesw.h>
+#include <curses.h>
#include "debug.h"
#include "file.h"
#include "input.h"