whoops, very stupid error. ignore previous. built fine here now.
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/claws-mail/Makefile,v
retrieving revision 1.66
diff -u -p -r1.66 Makefile
--- Makefile    26 Sep 2013 13:46:28 -0000      1.66
+++ Makefile    2 Oct 2013 02:48:37 -0000
@@ -3,20 +3,13 @@
 SHARED_ONLY=           Yes
 
 COMMENT-main=          mail and news client
-COMMENT-bogofilter=    bogofilter plugin
-COMMENT-clamav=                clamav plugin
-COMMENT-spamassassin=  spamassassin plugin
 COMMENT-htmlviewer=    fancy htmlviewer plugin
-COMMENT-pdfviewer=     pdfviewer plugin
 
 V=                     3.9.2
-REVISION=              0
+REVISION=              1
 DISTNAME=              claws-mail-${V}
 PKGNAME-main=          ${DISTNAME}
-PKGNAME-bogofilter=    claws-mail-bogofilter-${V}
-PKGNAME-spamassassin=  claws-mail-spamassassin-${V}
 PKGNAME-htmlviewer=    claws-mail-htmlviewer-${V}
-PKGNAME-pdfviewer=     claws-mail-pdfviewer-${V}
 
 CATEGORIES=            mail news
 
@@ -30,43 +23,35 @@ EXTRACT_SUFX=               .tar.bz2
 
 DIST_SUBDIR=           claws
 
-MULTI_PACKAGES=                -main -bogofilter -spamassassin -htmlviewer 
-pdfviewer
+MULTI_PACKAGES=                -main -htmlviewer
 FLAVORS=               jpilot compface ldap debug
 FLAVOR?=
 
 FLAVOR_STRING=         ${FLAVOR_EXT:S/-/,/g}
 SUBST_VARS=            FLAVOR_STRING
 
-RUN_DEPENDS-bogofilter=        ${BUILD_PKGPATH} \
-                       mail/bogofilter
-RUN_DEPENDS-spamassassin=${BUILD_PKGPATH} \
-                       mail/p5-Mail-SpamAssassin
-
-WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender archive atk-1.0 bz2 cairo crypto curl
-WANTLIB += etpan execinfo expat ffi fontconfig freetype gdk-x11-2.0
-WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz idn lzma m pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
-WANTLIB += pthread-stubs sasl2 ssl xcb xcb-render xcb-shm z
+WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender archive asn1 atk-1.0 bz2 cairo com_err crypto
+WANTLIB += curl dbus-1 dbus-glib-1 enchant etpan execinfo expat ffi
+WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
+WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gpg-error graphite2 gssapi
+WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz heimbase idn jpeg krb5 lzma 
+WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png
+WANTLIB += pthread pthread-stubs roken sasl2 ssl stdc++ wind xcb xcb-render
+WANTLIB += xcb-shm xml2 z
 
 WANTLIB-main =  ${WANTLIB}
-WANTLIB-main += ICE SM X11-xcb assuan c dbus-1 dbus-glib-1 enchant
-WANTLIB-main += gmp gnutls gpg-error gpgme hogweed nettle p11-kit perl
-WANTLIB-main += startup-notification-1 stdc++ tasn1 util xcb-aux xml2
+WANTLIB-main += X11-xcb assuan c enchant gmp gnutls gpgme hogweed
+WANTLIB-main += lcms2 nettle openjpeg p11-kit perl poppler poppler-glib
+WANTLIB-main += startup-notification-1 tasn1 tiff util xcb-aux
 
 WANTLIB-htmlviewer =  ${WANTLIB}
-WANTLIB-htmlviewer += EGL GL ICE SM Xt asn1 com_err dbus-1 dbus-glib-1 enchant
-WANTLIB-htmlviewer += gailutil gcrypt geoclue gpg-error graphite2 gssapi
-WANTLIB-htmlviewer += gstapp-1.0 gstaudio-1.0 gstbase-1.0 gstfft-1.0 
gstpbutils-1.0
+WANTLIB-htmlviewer += EGL GL Xt gailutil gcrypt geoclue gstapp-1.0
+WANTLIB-htmlviewer += gstaudio-1.0 gstbase-1.0 gstfft-1.0 gstpbutils-1.0
 WANTLIB-htmlviewer += gstreamer-1.0 gsttag-1.0 gstvideo-1.0 harfbuzz-icu
-WANTLIB-htmlviewer += heimbase icudata icui18n icuuc javascriptcoregtk-1.0
-WANTLIB-htmlviewer += jpeg krb5 roken secret-1 soup-2.4 soup-gnome-2.4 sqlite3
-WANTLIB-htmlviewer += stdc++ webkitgtk-1.0 webp wind xml2 xslt
-
-WANTLIB-pdfviewer =  ${WANTLIB}
-WANTLIB-pdfviewer += asn1 com_err graphite2 gssapi heimbase jpeg krb5 lcms2
-WANTLIB-pdfviewer += openjpeg poppler poppler-glib roken tiff wind
+WANTLIB-htmlviewer += icudata icui18n icuuc javascriptcoregtk-1.0
+WANTLIB-htmlviewer += secret-1 soup-2.4 soup-gnome-2.4 sqlite3
+WANTLIB-htmlviewer += webkitgtk-1.0 webp xslt
 
 WANTLIB-docs=
 
@@ -79,20 +64,25 @@ LIB_DEPENDS=                archivers/libarchive \
 
 RUN_DEPENDS-main=      ${RUN_DEPENDS} \
                        devel/desktop-file-utils \
+                       mail/bogofilter \
+                       mail/p5-Mail-SpamAssassin \
                        x11/gtk+2,-guic
 
 LIB_DEPENDS-main=      ${LIB_DEPENDS} \
                        devel/startup-notification \
+                       print/poppler \
                        textproc/enchant \
                        security/gnutls>=2.2 \
                        security/gpgme \
-                       x11/dbus-glib
+                       x11/dbus-glib \
 
 LIB_DEPENDS-htmlviewer=        ${LIB_DEPENDS} \
                        www/webkit>=2.0.0
 
-LIB_DEPENDS-pdfviewer= ${LIB_DEPENDS} \
-                       print/poppler
+FULLPKGNAME-htmlviewer ?= claws-mail-htmlviewer-${V}
+FULLPKGPATH-htmlviewer ?= ${PKGPATH},htmlviewer
+RUN_DEPENDS-htmlviewer ?= mail/claws-mail
+
 
 #geolocation looks for champlain <= 0.10
 #python tries to dlopen libpython2.7.so
@@ -132,10 +122,6 @@ CONFIGURE_ARGS+=   --disable-compface
 .if ${FLAVOR:Mldap}
 WANTLIB-main+=         roken wind krb5 lber-2.4 ldap-2.4
 WANTLIB-main+=         asn1 com_err graphite2 gssapi heimbase
-WANTLIB-bogofilter+=   ${WANTLIB} asn1 com_err graphite2 gssapi heimbase
-WANTLIB-bogofilter+=   krb5 roken wind
-WANTLIB-spamassassin+= ${WANTLIB} asn1 com_err graphite2 gssapi heimbase
-WANTLIB-spamassassin+= krb5 roken wind
 LIB_DEPENDS-main+=     databases/openldap
 .else
 CONFIGURE_ARGS+=       --disable-ldap
Index: pkg/DESCR-bogofilter
===================================================================
RCS file: /cvs/ports/mail/claws-mail/pkg/DESCR-bogofilter,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR-bogofilter
--- pkg/DESCR-bogofilter        11 Apr 2007 20:48:43 -0000      1.2
+++ pkg/DESCR-bogofilter        2 Oct 2013 02:48:37 -0000
@@ -1 +0,0 @@
-Claws Mail plugin for bogofilter support.
Index: pkg/DESCR-pdfviewer
===================================================================
RCS file: /cvs/ports/mail/claws-mail/pkg/DESCR-pdfviewer,v
retrieving revision 1.1
diff -u -p -r1.1 DESCR-pdfviewer
--- pkg/DESCR-pdfviewer 25 Sep 2013 08:03:17 -0000      1.1
+++ pkg/DESCR-pdfviewer 2 Oct 2013 02:48:37 -0000
@@ -1 +0,0 @@
-Claws Mail plugin for PDF support.
Index: pkg/DESCR-spamassassin
===================================================================
RCS file: /cvs/ports/mail/claws-mail/pkg/DESCR-spamassassin,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR-spamassassin
--- pkg/DESCR-spamassassin      11 Apr 2007 20:48:43 -0000      1.2
+++ pkg/DESCR-spamassassin      2 Oct 2013 02:48:37 -0000
@@ -1 +0,0 @@
-Claws Mail plugin for spamassassin support.
Index: pkg/PLIST-bogofilter
===================================================================
RCS file: /cvs/ports/mail/claws-mail/pkg/PLIST-bogofilter,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-bogofilter
--- pkg/PLIST-bogofilter        9 Oct 2012 16:41:29 -0000       1.5
+++ pkg/PLIST-bogofilter        2 Oct 2013 02:48:37 -0000
@@ -1,4 +0,0 @@
-@comment $OpenBSD: PLIST-bogofilter,v 1.5 2012/10/09 16:41:29 sthen Exp $
-@pkgpath mail/sylpheed-claws,-bogofilter[,compface][,pgpmime][,jpilot][,ldap]
-lib/claws-mail/plugins/bogofilter.la
-lib/claws-mail/plugins/bogofilter.so
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/mail/claws-mail/pkg/PLIST-main,v
retrieving revision 1.28
diff -u -p -r1.28 PLIST-main
--- pkg/PLIST-main      25 Sep 2013 08:03:17 -0000      1.28
+++ pkg/PLIST-main      2 Oct 2013 02:48:37 -0000
@@ -1,11 +1,17 @@
 @comment $OpenBSD: PLIST-main,v 1.28 2013/09/25 08:03:17 landry Exp $
 @conflict claws-mail-attremover-*
+@conflict claws-mail-bogofilter-*
 @conflict claws-mail-notification-*
+@conflict claws-mail-pdfviewer-*
 @conflict claws-mail-rssyl-*
+@conflict claws-mail-spamassassin-*
 @conflict claws-mail-vcalendar-*
 @pkgpath mail/claws-mail-attremover
+@pkgpath mail/claws-mail-bogofilter
 @pkgpath mail/claws-mail-notification
+@pkgpath mail/claws-mail-pdfviewer
 @pkgpath mail/claws-mail-rssyl
+@pkgpath mail/claws-mail-spamassassin
 @pkgpath mail/claws-mail-vcalendar
 @pkgpath mail/sylpheed-claws,-main[,compface][,pgpmime][,jpilot][,ldap]
 @pkgpath mail/sylpheed-claws[,compface][,pgpmime][,jpilot][,ldap]
@@ -270,6 +276,8 @@ lib/claws-mail/plugins/att_remover.la
 lib/claws-mail/plugins/att_remover.so
 lib/claws-mail/plugins/attachwarner.la
 lib/claws-mail/plugins/attachwarner.so
+lib/claws-mail/plugins/bogofilter.la
+lib/claws-mail/plugins/bogofilter.so
 lib/claws-mail/plugins/bsfilter.la
 lib/claws-mail/plugins/bsfilter.so
 lib/claws-mail/plugins/clamd.la
@@ -282,6 +290,8 @@ lib/claws-mail/plugins/newmail.la
 lib/claws-mail/plugins/newmail.so
 lib/claws-mail/plugins/notification.la
 lib/claws-mail/plugins/notification.so
+lib/claws-mail/plugins/pdf_viewer.la
+lib/claws-mail/plugins/pdf_viewer.so
 lib/claws-mail/plugins/perl.la
 lib/claws-mail/plugins/perl.so
 lib/claws-mail/plugins/pgpcore.la
@@ -297,6 +307,8 @@ lib/claws-mail/plugins/rssyl.so
 lib/claws-mail/plugins/smime.deps
 lib/claws-mail/plugins/smime.la
 lib/claws-mail/plugins/smime.so
+lib/claws-mail/plugins/spamassassin.la
+lib/claws-mail/plugins/spamassassin.so
 lib/claws-mail/plugins/spamreport.la
 lib/claws-mail/plugins/spamreport.so
 lib/claws-mail/plugins/tnef_parse.la
Index: pkg/PLIST-pdfviewer
===================================================================
RCS file: /cvs/ports/mail/claws-mail/pkg/PLIST-pdfviewer,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-pdfviewer
--- pkg/PLIST-pdfviewer 25 Sep 2013 08:03:17 -0000      1.1
+++ pkg/PLIST-pdfviewer 2 Oct 2013 02:48:37 -0000
@@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST-pdfviewer,v 1.1 2013/09/25 08:03:17 landry Exp $
-lib/claws-mail/plugins/pdf_viewer.la
-lib/claws-mail/plugins/pdf_viewer.so
Index: pkg/PLIST-spamassassin
===================================================================
RCS file: /cvs/ports/mail/claws-mail/pkg/PLIST-spamassassin,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-spamassassin
--- pkg/PLIST-spamassassin      9 Oct 2012 16:41:29 -0000       1.5
+++ pkg/PLIST-spamassassin      2 Oct 2013 02:48:37 -0000
@@ -1,4 +0,0 @@
-@comment $OpenBSD: PLIST-spamassassin,v 1.5 2012/10/09 16:41:29 sthen Exp $
-@pkgpath mail/sylpheed-claws,-spamassassin[,compface][,pgpmime][,jpilot][,ldap]
-lib/claws-mail/plugins/spamassassin.la
-lib/claws-mail/plugins/spamassassin.so

Reply via email to