Index: head/mail/deforaos-mailer/Makefile =================================================================== --- head/mail/deforaos-mailer/Makefile (revision 410616) +++ head/mail/deforaos-mailer/Makefile (revision 410617) @@ -1,40 +1,68 @@ # Created by: Olivier Cochard-Labbe # $FreeBSD$ PORTNAME= mailer -PORTVERSION= 0.1.6 -PORTREVISION= 2 +PORTVERSION= 0.1.7 CATEGORIES= mail -MASTER_SITES= http://www.defora.org/os/download/download/4029/ +MASTER_SITES= http://www.defora.org/os/download/download/4426/ PKGNAMEPREFIX= deforaos- DISTNAME= Mailer-${PORTVERSION} MAINTAINER= olivier@FreeBSD.org COMMENT= DeforaOS desktop mail client LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt \ - ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl LIB_DEPENDS= libSystem.so:${PORTSDIR}/devel/deforaos-libsystem \ libDesktop.so:${PORTSDIR}/x11/deforaos-libdesktop USE_GNOME= gtk20 -USES= desktop-file-utils gettext pkgconfig +USES= desktop-file-utils pkgconfig INSTALLS_ICONS= yes USE_LDCONFIG= yes USE_OPENSSL= yes -MAKE_ARGS+= PREFIX=${PREFIX} +MAKE_ARGS+= PREFIX=${PREFIX} MAKE_ENV+= MANDIR=${STAGEDIR}${MANPREFIX}/man MAKE_JOBS_UNSAFE= yes +OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes +NLS_USES= gettext +DOCS_BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt \ + ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl + +.include + +.if defined(WITH_OPENSSL_BASE) +# openssl from base doesn't install a .pc file and pkg-config didn't like it +CONFIGURE_ENV+= libssl_CFLAGS="-I${OPENSSLINC}" libssl_LIBS="-L${OPENSSLLIB} -lssl" +.endif + +post-patch-DOCS-off: + ${REINPLACE_CMD} 's|data doc include|data include|' \ + ${WRKSRC}/Makefile + +post-patch-NLS-off: + ${REINPLACE_CMD} 's|include po src|include src|' \ + ${WRKSRC}/Makefile + post-patch: - @${REINPLACE_CMD} -e 's|/lib/|/libdata/|g' \ + ${REINPLACE_CMD} -e 's|/lib/|/libdata/|g' \ ${WRKSRC}/data/pkgconfig.sh - @${REINPLACE_CMD} 's/-lssl/& -lcrypto/' \ + ${REINPLACE_CMD} 's/-lssl/& -lcrypto/' \ ${WRKSRC}/src/Makefile ${WRKSRC}/src/account/Makefile \ ${WRKSRC}/src/plugins/Makefile ${WRKSRC}/tests/Makefile + ${REINPLACE_CMD} 's|-Wl,-pie||g' \ + ${WRKSRC}/src/Makefile \ + ${WRKSRC}/tests/Makefile -.include +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* \ + ${STAGEDIR}${PREFIX}/lib/Mailer/plugins/* \ + ${STAGEDIR}${PREFIX}/lib/Mailer/account/* \ + ${STAGEDIR}${PREFIX}/lib/libMailer.so.0.0 + +.include Index: head/mail/deforaos-mailer/distinfo =================================================================== --- head/mail/deforaos-mailer/distinfo (revision 410616) +++ head/mail/deforaos-mailer/distinfo (revision 410617) @@ -1,2 +1,2 @@ -SHA256 (Mailer-0.1.6.tar.gz) = 22ad806a556cadd048aa433a1e6c872101a259acf7f16530cd26500d75dd261f -SIZE (Mailer-0.1.6.tar.gz) = 112910 +SHA256 (Mailer-0.1.7.tar.gz) = da272a75ea4b74811f8c25c3b7cf0c5d941f744e8520353f4c643694bf44281c +SIZE (Mailer-0.1.7.tar.gz) = 117673 Index: head/mail/deforaos-mailer/files/patch-doc__Makefile =================================================================== --- head/mail/deforaos-mailer/files/patch-doc__Makefile (revision 410616) +++ head/mail/deforaos-mailer/files/patch-doc__Makefile (nonexistent) @@ -1,29 +0,0 @@ ---- doc/Makefile.orig 2012-12-28 01:37:10.226479405 +0100 -+++ doc/Makefile 2012-12-28 01:37:39.498467834 +0100 -@@ -1,5 +1,5 @@ - SUBDIRS = gtkdoc --TARGETS = compose.1 compose.html gtkdoc/Mailer.types gtkdoc/tmpl.stamp gtkdoc/sgml.stamp gtkdoc/html.stamp mailer.1 mailer.html -+TARGETS = compose.1 mailer.1 - PREFIX = /usr/local - DESTDIR = - RM ?= rm -f -@@ -8,7 +8,7 @@ - INSTALL ?= install - - --all: subdirs $(TARGETS) -+all: $(TARGETS) - - subdirs: - @for i in $(SUBDIRS); do (cd $$i && $(MAKE)) || exit; done -@@ -49,10 +49,7 @@ - install: $(TARGETS) - @for i in $(SUBDIRS); do (cd $$i && $(MAKE) install) || exit; done - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "compose.1" -- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "compose.html" -- ./gtkdoc.sh -P "$(DESTDIR)$(PREFIX)" -i -- "gtkdoc/html.stamp" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "mailer.1" -- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "mailer.html" - - uninstall: - @for i in $(SUBDIRS); do (cd $$i && $(MAKE) uninstall) || exit; done Property changes on: head/mail/deforaos-mailer/files/patch-doc__Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/deforaos-mailer/files/patch-doc_Makefile =================================================================== --- head/mail/deforaos-mailer/files/patch-doc_Makefile (nonexistent) +++ head/mail/deforaos-mailer/files/patch-doc_Makefile (revision 410617) @@ -0,0 +1,13 @@ +--- doc/Makefile.orig 2016-02-20 14:42:07 UTC ++++ doc/Makefile +@@ -79,10 +79,8 @@ install: $(TARGETS) + $(MAKE) OBJDIR="$(OBJDIR)$$i/" install; \ + else $(MAKE) install; fi) || exit; done + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)compose.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)compose.html" + ./gtkdoc.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)gtkdoc/html.stamp" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)mailer.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)mailer.html" + + uninstall: + @for i in $(SUBDIRS); do (cd "$$i" && \ Property changes on: head/mail/deforaos-mailer/files/patch-doc_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/deforaos-mailer/pkg-plist =================================================================== --- head/mail/deforaos-mailer/pkg-plist (revision 410616) +++ head/mail/deforaos-mailer/pkg-plist (revision 410617) @@ -1,40 +1,40 @@ bin/compose bin/mailer include/Desktop/Mailer.h include/Desktop/Mailer/account.h include/Desktop/Mailer/folder.h include/Desktop/Mailer/helper.h include/Desktop/Mailer/mailer.h include/Desktop/Mailer/message.h include/Desktop/Mailer/plugin.h include/Desktop/Mailer/transport.h lib/Mailer/account/imap4.so lib/Mailer/account/mbox.so lib/Mailer/account/pop3.so lib/Mailer/plugins/mailing-lists.so lib/Mailer/plugins/search.so lib/libMailer.a lib/libMailer.so lib/libMailer.so.0 lib/libMailer.so.0.0 libdata/pkgconfig/Mailer.pc -man/man1/compose.1.gz -man/man1/mailer.1.gz -share/applications/mailer.desktop +%%PORTDOCS%%man/man1/compose.1.gz +%%PORTDOCS%%man/man1/mailer.1.gz +share/applications/deforaos-mailer.desktop share/icons/hicolor/16x16/apps/mailer-accounts.png share/icons/hicolor/16x16/apps/mailer-drafts.png share/icons/hicolor/16x16/apps/mailer-inbox.png share/icons/hicolor/16x16/apps/mailer-outbox.png share/icons/hicolor/16x16/apps/mailer-sent.png share/icons/hicolor/16x16/apps/mailer.png share/icons/hicolor/24x24/apps/mailer-accounts.png share/icons/hicolor/24x24/apps/mailer-drafts.png share/icons/hicolor/24x24/apps/mailer-inbox.png share/icons/hicolor/24x24/apps/mailer-outbox.png share/icons/hicolor/24x24/apps/mailer-sent.png share/icons/hicolor/24x24/apps/mailer.png share/icons/hicolor/48x48/apps/mailer-inbox.png share/icons/hicolor/48x48/apps/mailer-outbox.png share/icons/hicolor/48x48/apps/mailer-sent.png share/icons/hicolor/48x48/apps/mailer.png -share/locale/fr/LC_MESSAGES/Mailer.mo +%%NLS%%share/locale/fr/LC_MESSAGES/Mailer.mo