On 24/05/2014 12:27, Tijl Coosemans wrote:
On Sat, 24 May 2014 07:28:07 +0100 Alan Hicks wrote:
Can you please close ports/184033 and ports/189749 as they have been
superseded by Revision 354447.
Alas I forgot to include [patch] in the subject or that I had tested
under poudriere so they understandably got missed.
The gmime2 and gmime24 parts of those patches are still valid. I'll
have a look at them.
deskutils/tomboy appears to be the only port using gmime24-sharp and is
not yet staged, mail/gmime2-sharp is marked ignore so maybe they should
just fall unless someone is still using them?
mail/gmime26 and mail/gmime26-sharp are the current active ports.
Upgrading deskutils/tomboy
I'm getting the following error when trying to upgrade deskutils/tomboy
to the latest 1.15.4 that uses mail/gmime26-sharp any clues?
Error: Filesystem touched during stage (files must install to
${STAGEDIR}):
extra: root/.gconf
It's an empty directory created during stageing, alas the cause is
eluding me.
diff -ur /usr/ports/deskutils/tomboy/Makefile tomboy/Makefile
--- /usr/ports/deskutils/tomboy/Makefile 2013-12-11 18:28:10.0 +
+++ tomboy/Makefile 2014-05-26 16:25:29.0 +0100
@@ -2,7 +2,7 @@
# $FreeBSD: head/deskutils/tomboy/Makefile 336190 2013-12-11 18:28:10Z bapt $
PORTNAME= tomboy
-PORTVERSION= 1.12.2
+PORTVERSION= 1.15.4
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -11,16 +11,15 @@
COMMENT= Personal note taking system for the GNOME desktop
LIB_DEPENDS= libgtkspell.so:${PORTSDIR}/textproc/gtkspell
-BUILD_DEPENDS= ${LOCALBASE}/lib/mono/gmime-sharp-2.4/gmime-sharp.dll:${PORTSDIR}/mail/gmime24-sharp \
+BUILD_DEPENDS= ${LOCALBASE}/lib/mono/gmime-sharp-2.6/gmime-sharp.dll:${PORTSDIR}/mail/gmime26-sharp \
${LOCALBASE}/libdata/pkgconfig/dbus-sharp-glib-1.0.pc:${PORTSDIR}/devel/dbus-sharp-glib \
mautil:${PORTSDIR}/devel/mono-addins
-RUN_DEPENDS= ${LOCALBASE}/lib/mono/gmime-sharp-2.4/gmime-sharp.dll:${PORTSDIR}/mail/gmime24-sharp \
+RUN_DEPENDS= ${LOCALBASE}/lib/mono/gmime-sharp-2.6/gmime-sharp.dll:${PORTSDIR}/mail/gmime26-sharp \
${LOCALBASE}/libdata/pkgconfig/dbus-sharp-glib-1.0.pc:${PORTSDIR}/devel/dbus-sharp-glib \
mautil:${PORTSDIR}/devel/mono-addins
-USE_XZ= yes
-USES= gettext gmake pkgconfig
-USE_GNOME= gnomehack intlhack gnomeprefix gnomedesktopsharp20
+USES= gettext gmake libtool pathfix pkgconfig shared-mime-info tar:xz
+USE_GNOME= intlhack gnomeprefix gnomedesktopsharp20
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
INSTALLS_OMF= yes
@@ -30,23 +29,19 @@
CONFIGURE_ARGS+=--enable-evolution=yes
-MAN1= tomboy.1
-GCONF_SCHEMAS= tomboy.schemas
-
OPTIONS_DEFINE= APPLET
APPLET_DESC= Enable GNOME panel applet
# Restrict to stable (even) versions, indicated by the second component.
PORTSCOUT= limitw:1,even
-NO_STAGE= yes
.include bsd.port.pre.mk
.if ${PORT_OPTIONS:MAPPLET}
-CONFIGURE_ARGS+=--enable-panel-applet
+CONFIGURE_ARGS+=--enable-panel-applet=yes
PLIST_SUB+= APPLET=
.else
-CONFIGURE_ARGS+=--disable-panel-applet
+CONFIGURE_ARGS+=--enable-panel-applet=no
PLIST_SUB+= APPLET=@comment
.endif
@@ -57,8 +52,9 @@
${WRKSRC}/configure
@${REINPLACE_CMD} 's|/bin/bash|/bin/sh|g' \
${WRKSRC}/Tomboy/tomboy*.in
- @${REINPLACE_CMD} 's|gmime-sharp|gmime-sharp-2.4|g' \
- ${WRKSRC}/configure
+
+post-install:
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/tomboy/libtomboy.so
.include ${PORTSDIR}/lang/mono/bsd.mono.mk
.include bsd.port.post.mk
diff -ur /usr/ports/deskutils/tomboy/distinfo tomboy/distinfo
--- /usr/ports/deskutils/tomboy/distinfo 2014-01-22 15:30:13.0 +
+++ tomboy/distinfo 2014-05-25 16:51:45.0 +0100
@@ -1,2 +1,2 @@
-SHA256 (gnome2/tomboy-1.12.2.tar.xz) = ebcb23efb8eedc949eb84d4b5c9919ddaacc97198384f79ed08e97092c46e55e
-SIZE (gnome2/tomboy-1.12.2.tar.xz) = 6671548
+SHA256 (gnome2/tomboy-1.15.4.tar.xz) = 1429790dbe7475850e753e9ac10bb1ea9f184f2142826c389da75930c093968b
+SIZE (gnome2/tomboy-1.15.4.tar.xz) = 6652156
diff -ur /usr/ports/deskutils/tomboy/pkg-plist tomboy/pkg-plist
--- /usr/ports/deskutils/tomboy/pkg-plist 2014-01-22 15:16:56.0 +
+++ tomboy/pkg-plist 2014-05-26 16:22:31.0 +0100
@@ -1,5 +1,6 @@
bin/tomboy
%%APPLET%%bin/tomboy-panel
+%%APPLET%%etc/gconf/schemas/tomboy.schemas
lib/tomboy/Tomboy.exe
lib/tomboy/Tomboy.exe.config
lib/tomboy/Tomboy.exe.mdb
@@ -38,18 +39,26 @@
lib/tomboy/addins/WebDavSyncService.dll.mdb
lib/tomboy/addins/WebSyncServiceAddin.dll
lib/tomboy/addins/WebSyncServiceAddin.dll.mdb
-lib/tomboy/libtomboy.la
lib/tomboy/libtomboy.so
%%APPLET%%libdata/bonobo/servers/GNOME_TomboyApplet.server
libdata/pkgconfig/tomboy-addins.pc
+man/man1/tomboy.1.gz
share/applications/tomboy.desktop
share/dbus-1/services/org.gnome.Tomboy.service
-share/gnome/help/tomboy/C/addins-desktop.page
-share/gnome/help/tomboy/C/addins-formatting.page
-share/gnome/help/tomboy/C/addins-sync.page
-share/gnome/help/tomboy/C/addins-tools.page
+share/gnome/help/tomboy/C
