cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Install schemas from both subpackages into the same directory

Browse Source 
(${SCHEMAS_INSTDIR}). Granted this take one or two more seconds to
install the -plugins subpackage but it allows us to use the generic
gconf-2 goo in PLIST-plugins.

While here, regen wantlib and lib_depends.

ok jasper@
This commit is contained in:
ajacoutot 2009-06-10 13:31:56 +00:00
parent 15b5c16fe6
commit ef8d38b17e
2 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
mail/evolution/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.76 2009/06/08 16:58:15 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.77 2009/06/10 13:31:56 ajacoutot Exp $
# XXX TODO: the mail-account-disable plugin is not loaded by default:
# it makes right-clicking on a folder very long (the first time)
@ -11,8 +11,8 @@ COMMENT-plugins= additionnal plugins for evolution
GNOME_PROJECT= evolution
GNOME_VERSION= 2.24.5
PKGNAME-main= ${DISTNAME}p11
PKGNAME-plugins= evolution-plugins-${GNOME_VERSION}p5
PKGNAME-main= ${DISTNAME}p12
PKGNAME-plugins= evolution-plugins-${GNOME_VERSION}p6
CATEGORIES= mail
@ -41,17 +41,17 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \
Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr \
Xrender art_lgpl_2 asn1 atk-1.0 bonobo-2 \
bonobo-activation bonoboui-2 c cairo com_err crypto \
bonobo-activation bonoboui-2 cairo com_err crypto \
db dbus-1 dbus-glib-1 enchant expat fontconfig freetype \
gailutil gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 \
glade-2.0 glib-2.0 glitz gmodule-2.0 gnome-2 gnome-keyring \
gnomecanvas-2 gnomeui-2 gnomevfs-2 gnutls gobject-2.0 \
gpg-error gssapi gthread-2.0 gtk-x11-2.0 krb5 m nspr4 \
pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 \
plc4 plds4 png popt pthread sqlite3 ssl ssl3 stdc++ tasn1 \
util xml2 z
plc4 plds4 png popt sqlite3 ssl ssl3 stdc++ tasn1 \
util xml2 z avahi-client avahi-common avahi-glib
WANTLIB-main= ${WANTLIB} sasl2
WANTLIB-main= ${WANTLIB} c pthread sasl2
WANTLIB-plugins= ${WANTLIB} \
camel-1.2 camel-provider-1.2 ebackend-1.2 ebook-1.2 \
@ -73,17 +73,17 @@ BUILD_DEPENDS= ::devel/bison \
RUN_DEPENDS-main= ${RUN_DEPENDS} \
::x11/hicolor-icon-theme \
::x11/gnome/icon-theme
LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \
camel-1.2,camel-provider-1.2,ebackend-1.2,ebook-1.2,ecal-1.2,edataserver-1.2,edataserverui-1.2,egroupwise-1.2,exchange-storage-1.2,gdata-1.2,gdata-google-1.2:evolution-data-server->=2.24.3:databases/evolution-data-server \
LIB_DEPENDS-main= ${LIB_DEPENDS} \
camel-1.2,camel-provider-1.2,ebackend-1.2,ebook-1.2,ecal-1.2,edataserver-1.2,edataserverui-1.2,exchange-storage-1.2,gdata-1.2,gdata-google-1.2:evolution-data-server->=2.24.3:databases/evolution-data-server \
lber.>=7,ldap.>=7::databases/openldap \
notify.>=2::devel/libnotify \
soup-2.4::devel/libsoup \
nss3.>=19,smime3.>=19,softokn3.>=19,ssl3.>=19:nss->=3.11.4p1:security/nss \
gtkhtml-3.14.>=1.0,gtkhtml-editor::www/gtkhtml3
LIB_DEPENDS-plugins= ${MODGETTEXT_LIB_DEPENDS} \
LIB_DEPENDS-plugins= ${LIB_DEPENDS} \
gstreamer-0.10::multimedia/gstreamer-0.10/core \
lib/evolution/${R}/eabutil.>=4,lib/evolution/${R}/econtacteditor,lib/evolution/${R}/econtactlisteditor,lib/evolution/${R}/efilterbar,lib/evolution/${R}/emiscwidgets,lib/evolution/${R}/eshell,lib/evolution/${R}/essmime,lib/evolution/${R}/etable,lib/evolution/${R}/etext,lib/evolution/${R}/eutil,lib/evolution/${R}/evolution-a11y,lib/evolution/${R}/evolution-mail-importers,lib/evolution/${R}/evolution-widgets-a11y,lib/evolution/${R}/filter,lib/evolution/${R}/menus:${PKGNAME-main}:mail/evolution,-main
lib/evolution/${R}/eabutil.>=4,lib/evolution/${R}/econtacteditor,lib/evolution/${R}/econtactlisteditor,lib/evolution/${R}/efilterbar,lib/evolution/${R}/emiscwidgets,lib/evolution/${R}/eshell,lib/evolution/${R}/essmime,lib/evolution/${R}/etable,lib/evolution/${R}/etext,lib/evolution/${R}/eutil,lib/evolution/${R}/evolution-a11y,lib/evolution/${R}/evolution-mail-importers,lib/evolution/${R}/evolution-widgets-a11y,lib/evolution/${R}/filter,lib/evolution/${R}/menus,lib/evolution/${R}/evolution-smime:${PKGNAME-main}:mail/evolution,-main
# needed for the audio-inline plugin
RUN_DEPENDS-plugins= ::multimedia/gstreamer-0.10/plugins-good
@ -114,21 +114,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
R= ${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
SUBST_VARS= R
SCHEMAS-plugins= apps-evolution-attachment-reminder \
apps-evolution-mail-notification \
apps-evolution-mail-prompts-checkdefault \
apps-evolution-template-placeholders \
apps_evolution_email_custom_header
pre-configure:
${SUBST_CMD} ${WRKSRC}/plugins/bogo-junk-plugin/bf-junk-filter.c \
${WRKSRC}/plugins/sa-junk-plugin/em-junk-filter.c
post-install:
find ${PREFIX}/share/evolution/${R}/default -perm 444 -exec chmod 644 {} \;
${INSTALL_DATA_DIR} ${PREFIX}/${SCHEMAS_INSTDIR}-plugins/
for i in ${SCHEMAS-plugins} ; do \
mv ${PREFIX}/${SCHEMAS_INSTDIR}/$$i.schemas \
${PREFIX}/${SCHEMAS_INSTDIR}-plugins/ ; done
.include <bsd.port.mk>

17
mail/evolution/pkg/PLIST-plugins
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-plugins,v 1.3 2009/06/08 09:43:47 ajacoutot Exp $
@comment $OpenBSD: PLIST-plugins,v 1.4 2009/06/10 13:31:56 ajacoutot Exp $
%%SHARED%%
lib/evolution/${R}/plugins/attachment-reminder.glade
lib/evolution/${R}/plugins/liborg-gnome-audio-inline.a
@ -67,11 +67,10 @@ share/evolution/${R}/errors/org-gnome-face.errors.xml
share/evolution/${R}/errors/org-gnome-mailing-list-actions.error
share/evolution/${R}/glade/email-custom-header.glade
share/evolution/${R}/glade/org-gnome-email-custom-header.glade
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}-plugins/*.schemas > /dev/null
${SCHEMAS_INSTDIR}-plugins/
${SCHEMAS_INSTDIR}-plugins/apps-evolution-attachment-reminder.schemas
${SCHEMAS_INSTDIR}-plugins/apps-evolution-mail-notification.schemas
${SCHEMAS_INSTDIR}-plugins/apps-evolution-mail-prompts-checkdefault.schemas
${SCHEMAS_INSTDIR}-plugins/apps-evolution-template-placeholders.schemas
${SCHEMAS_INSTDIR}-plugins/apps_evolution_email_custom_header.schemas
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}-plugins/*.schemas > /dev/null
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
${SCHEMAS_INSTDIR}/apps-evolution-attachment-reminder.schemas
${SCHEMAS_INSTDIR}/apps-evolution-mail-notification.schemas
${SCHEMAS_INSTDIR}/apps-evolution-mail-prompts-checkdefault.schemas
${SCHEMAS_INSTDIR}/apps-evolution-template-placeholders.schemas
${SCHEMAS_INSTDIR}/apps_evolution_email_custom_header.schemas
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null