From 1f9b14fba570cb8f0790aa2ffa8c1b355f0f50ae Mon Sep 17 00:00:00 2001 From: alek Date: Sat, 5 Mar 2005 20:47:05 +0000 Subject: [PATCH] - Update to 1.0; contains fixes for two security issues - Remove sasl and gmail FLAVORs From Thomas Delaet (MAINTAINER) --- mail/mail-notification/Makefile | 34 ++++++++++++-------------------- mail/mail-notification/distinfo | 8 ++++---- mail/mail-notification/pkg/PLIST | 26 +++++++++++++++--------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile index fab0cd7aff1..956ba7331fa 100644 --- a/mail/mail-notification/Makefile +++ b/mail/mail-notification/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.2 2004/11/13 10:29:32 sturm Exp $ +# $OpenBSD: Makefile,v 1.3 2005/03/05 20:47:05 alek Exp $ COMMENT= "mail notification for freedesktop.org-compliant system trays" -DISTNAME= mail-notification-0.6.2 +DISTNAME= mail-notification-1.0 CATEGORIES= mail HOMEPAGE= http://www.nongnu.org/mailnotify/ @@ -16,19 +16,19 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://savannah.nongnu.org/download/mailnotify/ -MODULES= gettext +MODULES= devel/gettext BUILD_DEPENDS+= :pkgconfig-*:devel/pkgconfig \ :scrollkeeper-*:textproc/scrollkeeper \ :p5-XML-Parser-*:textproc/p5-XML-Parser RUN_DEPENDS+= :scrollkeeper-*:textproc/scrollkeeper \ :gnome-icon-theme-*:x11/gnome/icon-theme LIB_DEPENDS+= eel-2::x11/gnome/eel -USE_X11= Yes USE_GMAKE= Yes CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --sysconfdir="${CONFDIR}" CONFIGURE_ARGS+= --disable-schemas-install \ - --with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/mail-notification + --with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/mail-notification \ + --disable-mime --disable-sasl --disable-gmail CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" @@ -36,22 +36,14 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFDIR= ${SYSCONFDIR}/gnome SUBST_VARS= CONFDIR -FLAVORS= gmail sasl -FLAVOR?= - -.if ${FLAVOR:L:Msasl} -CONFIGURE_ARGS+= --enable-sasl -LIB_DEPENDS+= sasl2::security/cyrus-sasl2 -.else -CONFIGURE_ARGS+= --disable-sasl -.endif - -.if ${FLAVOR:L:Mgmail} -CONFIGURE_ARGS+= --enable-gmail -LIB_DEPENDS+= soup-2.2.0.0::devel/libsoup -.else -CONFIGURE_ARGS+= --disable-gmail -.endif +WANTLIB= pthread Xrender ICE Xinerama c z xml2 X11 \ + SM Xext popt fontconfig crypto freetype ssl m Xft Xcursor \ + art_lgpl_2 atk-1.0.0.0 bonobo-2 bonobo-activation bonoboui-2 \ + gconf-2 gdk-x11-2.0.0.0 ORBit-2 gailutil gnomeui-2 \ + gdk_pixbuf-2.0.0.0 glade-2.0.0.0 glib-2.0.0.0 \ + gmodule-2.0.0.0 gnome-2 gnomecanvas-2 gnomevfs-2 \ + gobject-2.0.0.0 gthread-2.0.0.0 gtk-x11-2.0.0.0 \ + pango-1.0.0.0 pangoft2-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 post-patch: @ln -s /usr/bin/true ${WRKDIR}/bin/scrollkeeper-update diff --git a/mail/mail-notification/distinfo b/mail/mail-notification/distinfo index 8176177c964..aa08fef03ae 100644 --- a/mail/mail-notification/distinfo +++ b/mail/mail-notification/distinfo @@ -1,4 +1,4 @@ -MD5 (mail-notification-0.6.2.tar.gz) = f6e65da8d72e87271682d405ab03b868 -RMD160 (mail-notification-0.6.2.tar.gz) = 93dbe35b515471468763cb09d8e6dbe89c9e4f0d -SHA1 (mail-notification-0.6.2.tar.gz) = d5086aac1ea0f9d4e3fb63d0ffb18a02cc64b997 -SIZE (mail-notification-0.6.2.tar.gz) = 406317 +MD5 (mail-notification-1.0.tar.gz) = 9f458da2a222490330ed93d3298ced75 +RMD160 (mail-notification-1.0.tar.gz) = 1bd740d3949c045052154ef7dd043001c9a83467 +SHA1 (mail-notification-1.0.tar.gz) = 8b6fd3863621023b3763958736bff668b21ae798 +SIZE (mail-notification-1.0.tar.gz) = 622289 diff --git a/mail/mail-notification/pkg/PLIST b/mail/mail-notification/pkg/PLIST index 558291e50a1..4f8cf9a7769 100644 --- a/mail/mail-notification/pkg/PLIST +++ b/mail/mail-notification/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2005/01/30 15:38:15 naddy Exp $ +@comment $OpenBSD: PLIST,v 1.3 2005/03/05 20:47:05 alek Exp $ bin/mail-notification lib/bonobo/ lib/bonobo/servers/ @@ -14,25 +14,33 @@ share/control-center-2.0/capplets/mail-notification-properties.desktop share/examples/mail-notification/ share/examples/mail-notification.soundlist @sample ${CONFDIR}/sound/events/mail-notification.soundlist -share/help/ -share/help/mail-notification/ -share/help/mail-notification/C/ -share/help/mail-notification/C/documentation-license.xml -share/help/mail-notification/C/figures/ -share/help/mail-notification/C/figures/mail.png -share/help/mail-notification/C/mail-notification.xml -share/help/mail-notification/C/software-license.xml +share/gnome/ +share/gnome/help/ +share/gnome/help/mail-notification/ +share/gnome/help/mail-notification/C/ +share/gnome/help/mail-notification/C/documentation-license.xml +share/gnome/help/mail-notification/C/figures/ +share/gnome/help/mail-notification/C/figures/mail.png +share/gnome/help/mail-notification/C/mail-notification.xml +share/gnome/help/mail-notification/C/software-license.xml +share/locale/bg/LC_MESSAGES/mail-notification.mo share/locale/de/LC_MESSAGES/mail-notification.mo share/locale/fr/LC_MESSAGES/mail-notification.mo +share/locale/pl/LC_MESSAGES/mail-notification.mo share/locale/pt/LC_MESSAGES/mail-notification.mo share/locale/ru/LC_MESSAGES/mail-notification.mo +share/locale/sr/LC_MESSAGES/mail-notification.mo +share/locale/sr@Latn/LC_MESSAGES/mail-notification.mo share/mail-notification/ share/mail-notification/ui/ +share/mail-notification/ui/authentication.glade share/mail-notification/ui/gmail.png share/mail-notification/ui/logo.png share/mail-notification/ui/mail-notification.png share/mail-notification/ui/mailbox-properties.glade share/mail-notification/ui/properties.glade +share/mail-notification/ui/summary-dialog.glade +share/mail-notification/ui/summary-popup.glade share/mail-notification/ui/unsupported.png share/mail-notification/ui/welcome.glade share/omf/mail-notification/