On Thu, Aug 15, 2013 at 10:10:42AM +0100, Stuart Henderson wrote:
> On 2013/08/14 21:07, James Turner wrote:
> > -MAKE_ENV = CXX="${CXX}" \
> > +MAKE_ENV = CC="${CXX}" \
>
> ..
>
> > +-CC=g++
> > ++CC?=g++
>
> If you use MAKE_FLAGS rather than MAKE_ENV, you shouldn't need to touch
> the CC line in the patch.
>
Thanks. This change and adding gettext to MODULES (via aja) is attached.
With the MAKE_FLAGS switch the need for patch_Makefile is completely
removed, so apply with -E.
--
James Turner
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/lumail/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile 12 Aug 2013 00:24:57 -0000 1.10
+++ Makefile 15 Aug 2013 13:03:14 -0000
@@ -2,7 +2,7 @@
COMMENT = console-based e-mail client with Lua scripting support
-DISTNAME = lumail-0.17
+DISTNAME = lumail-0.18
CATEGORIES = mail
MAINTAINER = James Turner <[email protected]>
@@ -13,24 +13,25 @@ MASTER_SITES = http://lumail.org/downlo
# 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
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/lumail/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- distinfo 12 Aug 2013 00:24:57 -0000 1.8
+++ distinfo 15 Aug 2013 13:03:14 -0000
@@ -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
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 12 Aug 2013 00:24:57 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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
-
-
-
Index: patches/patch-src_screen_cc
===================================================================
RCS file: /cvs/ports/mail/lumail/patches/patch-src_screen_cc,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_screen_cc
--- patches/patch-src_screen_cc 6 Aug 2013 23:20:37 -0000 1.1
+++ patches/patch-src_screen_cc 15 Aug 2013 13:03:14 -0000
@@ -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 @@
+--- 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"
