Attached is an update to lumail-0.18. Lumail now depends on gmime in
place of mimetic for it's mime related needs. Figured I'd send the diff
out to make sure I didn't overlook anything in the switch over.

The gmime libs get set in a different variable in the distfile's
Makefile that is why they don't have to be declared in LDLIBS in case
anyone was wondering.

Tested on amd64.

oks? or simple Makefile reads fine? Thanks.

-- 
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 01:03:35 -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,7 +13,8 @@ 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 intl
+WANTLIB +=             ${MODLUA_WANTLIB} m ncursesw pcre pcrecpp pthread
 
 MODULES =              gcc4 lang/lua
 
@@ -21,16 +22,16 @@ 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_ENV =             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 01:03:35 -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: /cvs/ports/mail/lumail/patches/patch-Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-Makefile
--- patches/patch-Makefile      12 Aug 2013 00:24:57 -0000      1.7
+++ patches/patch-Makefile      15 Aug 2013 01:03:35 -0000
@@ -1,14 +1,18 @@
 $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++
+--- Makefile.orig      Wed Aug 14 04:47:58 2013
++++ Makefile   Wed Aug 14 20:37:32 2013
+@@ -38,11 +38,11 @@ VERSION=$(shell sh -c 'git describe --abbrev=0 --tags 
+ #
+ #  Basics
+ #
+-CC=g++
++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
+-LDLIBS+=$(shell pkg-config --libs ${LVER}) -lncursesw -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
- 
- 
++LDLIBS?=$(shell pkg-config --libs ${LVER}) -lncursesw -lpcrecpp
  
+ #
+ #  Experiments in gmime.
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 01:03:35 -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"

Reply via email to