Attachment 144239 Details for Bug 188446 – Unbreak staging

[patch] Unbreak staging

mail-notification-staging.diff (text/plain), 1.43 KB, created by mwisnicki+freebsd on 2014-06-29 10:06:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: mwisnicki+freebsd

Created: 2014-06-29 10:06:05 UTC

Size: 1.43 KB

patch

obsolete

>Index: mail/mail-notification/Makefile
>===================================================================
>--- mail/mail-notification/Makefile	(revision 359429)
>+++ mail/mail-notification/Makefile	(working copy)
>@@ -11,8 +11,6 @@
> MAINTAINER=	mwisnicki+freebsd@gmail.com
> COMMENT=	A mail notification for freedesktop.org-compliant system trays
> 
>-BROKEN=		Violates stagedir and fails to package
>-
> LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
> 		libgnome-keyring.so:${PORTSDIR}/security/gnome-keyring \
> 		libnotify.so:${PORTSDIR}/devel/libnotify
>@@ -23,8 +21,8 @@
> USE_GNOME=	gconf2 gnomeprefix gnomevfs2 libglade2 libgnomeui libxml2
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
>-JB_CONF_ARGS=	cc="${CC}" cflags="${CFLAGS}" cppflags="${CPPFLAGS}" ldflags="${LDFLAGS}" prefix="${STAGEDIR}${PREFIX}"
>-JB_CONF_ENV=	jb_cppflags="${CPPFLAGS}" jb_ldflags="${LDFLAGS}"
>+JB_CONF_ARGS=	cc="${CC}" cflags="${CFLAGS}" cppflags="${CPPFLAGS}" ldflags="${LDFLAGS}" prefix="${PREFIX}" destdir="${STAGEDIR}"
>+JB_CONF_ENV=	${MAKE_ENV} jb_cppflags="${CPPFLAGS}" jb_ldflags="${LDFLAGS}"
> GCONF_SCHEMAS=	mail-notification.schemas
> INSTALLS_OMF=	yes
> INSTALLS_ICONS=	yes
>@@ -124,9 +122,9 @@
> 	cd ${WRKSRC} && ${JB_CONF_ENV} ./jb configure ${JB_CONF_ARGS}
> 
> do-build:
>-	cd ${WRKSRC} && ./jb build
>+	cd ${WRKSRC} && ${MAKE_ENV} ./jb build
> 
> do-install:
>-	cd ${WRKSRC} && ./jb install
>+	cd ${WRKSRC} && ${MAKE_ENV} ./jb install
> 
> .include <bsd.port.mk>

Actions: View | Diff

Attachments on bug 188446: 141600 | 144239