ports/183639: deforaos-mailer staging support

[Olivier Cochard-Labbe]

>Number:         183639
>Category:       ports
>Synopsis:       deforaos-mailer staging support
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 03 23:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Olivier Cochard-Labbe
>Release:        10.0
>Organization:
>Environment:
FreeBSD orange.bsdrp.net 10.0-BETA2 FreeBSD 10.0-BETA2 #0 r257208M: Sun Oct 27 21:28:39 CET 2013     root at orange.bsdrp.net:/usr/obj/usr/local/BSDRP/BSDRP/FreeBSD/src/sys/PROD  amd64

>Description:
Adding staging support.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: mail/deforaos-mailer/Makefile
===================================================================
--- mail/deforaos-mailer/Makefile	(revision 332601)
+++ mail/deforaos-mailer/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mailer
 PORTVERSION=	0.1.6
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.defora.org/os/download/download/4029/
 PKGNAMEPREFIX=	deforaos-
@@ -15,10 +16,10 @@
 
 BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
 		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
-LIB_DEPENDS=	System:${PORTSDIR}/devel/deforaos-libsystem \
-		Desktop:${PORTSDIR}/x11/deforaos-libdesktop
+LIB_DEPENDS=	libSystem.so:${PORTSDIR}/devel/deforaos-libsystem \
+		libDesktop.so:${PORTSDIR}/x11/deforaos-libdesktop
 
-USE_GNOME=	gtk20 desktopfileutils
+USE_GNOME=	gtk20
 USES=		pkgconfig gettext
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
@@ -25,14 +26,10 @@
 USE_OPENSSL=	yes
 MAKE_ARGS+=	PREFIX=${PREFIX}
 
-MAKE_ENV+=	MANDIR=${MANPREFIX}/man
+MAKE_ENV+=	MANDIR=${STAGEDIR}${MANPREFIX}/man
 
 MAKE_JOBS_UNSAFE=	yes
 
-MAN1=		compose.1 \
-		mailer.1
-
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e 's|/lib/|/libdata/|g' \
 		${WRKSRC}/data/pkgconfig.sh
Index: mail/deforaos-mailer/pkg-plist
===================================================================
--- mail/deforaos-mailer/pkg-plist	(revision 332601)
+++ mail/deforaos-mailer/pkg-plist	(working copy)
@@ -18,6 +18,8 @@
 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
 share/icons/hicolor/16x16/apps/mailer-accounts.png
 share/icons/hicolor/16x16/apps/mailer-drafts.png
@@ -37,6 +39,15 @@
 share/icons/hicolor/48x48/apps/mailer.png
 share/locale/fr/LC_MESSAGES/Mailer.mo
 @dirrm include/Desktop/Mailer
+ at dirrmtry include/Desktop
 @dirrm lib/Mailer/account
 @dirrm lib/Mailer/plugins
 @dirrm lib/Mailer
+ at dirrmtry share/icons/hicolor/48x48/apps
+ at dirrmtry share/icons/hicolor/48x48
+ at dirrmtry share/icons/hicolor/24x24/apps
+ at dirrmtry share/icons/hicolor/24x24
+ at dirrmtry share/icons/hicolor/16x16/apps
+ at dirrmtry share/icons/hicolor/16x16
+ at dirrmtry share/icons/hicolor
+ at dirrmtry share/icons


>Release-Note:
>Audit-Trail:
>Unformatted: