From b44e07cf403ff12bac882e519c465678e613d96e Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Sat, 2 Jul 2011 16:09:22 +0000 Subject: - Update to 3.0.3 PR: 158489 Submitted by: Ports Fury --- deskutils/drivel/Makefile | 48 +++++++------- deskutils/drivel/distinfo | 4 +- deskutils/drivel/files/patch-Makefile-am | 11 ---- deskutils/drivel/files/patch-src-Makefile-am | 12 ---- deskutils/drivel/pkg-descr | 2 +- deskutils/drivel/pkg-plist | 98 +++++++++++++++------------- 6 files changed, 83 insertions(+), 92 deletions(-) delete mode 100644 deskutils/drivel/files/patch-Makefile-am delete mode 100644 deskutils/drivel/files/patch-src-Makefile-am (limited to 'deskutils/drivel') diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile index 88647584363a..b429d28dab2a 100644 --- a/deskutils/drivel/Makefile +++ b/deskutils/drivel/Makefile @@ -6,42 +6,46 @@ # PORTNAME= drivel -PORTVERSION= 3.0.2 -PORTREVISION= 1 +PORTVERSION= 3.0.3 CATEGORIES= deskutils gnome MASTER_SITES= SF/${PORTNAME}/Drivel%20%28stable%29/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Blog editor for GNOME -LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl +LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup + +OPTIONS= GTKSPELL "Enable GtkSpell support" On + +LICENSE= GPLv2 GPLv3 +LICENSE_COMB= dual -INSTALLS_ICONS= yes -USE_BZIP2= yes -USE_GNOME= glib20 gtk20 gconf2 gnomevfs2 gtksourceview2 libxml2 gnomedocutils -USE_GSTREAMER= soup USE_BZIP2= yes -USE_GMAKE= yes +USE_GNOME= gconf2 gnomedocutils gnomevfs2 gtksourceview2 USE_GETTEXT= yes +USE_GMAKE= yes +USE_AUTOTOOLS= libtool +CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" +INSTALLS_ICONS= yes INSTALLS_OMF= yes -USE_AUTOTOOLS= libtool autoconf:env automake:env -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +MAKE_JOBS_SAFE= yes GCONF_SCHEMAS= drivel.schemas -.ifndef(WITHOUT_GTKSPELL) -LIB_DEPENDS+= gtkspell.0:${PORTSDIR}/textproc/gtkspell -.else +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib + +.include + +.if defined(WITHOUT_GTKSPELL) CONFIGURE_ARGS+= --without-gtkspell +.else +LIB_DEPENDS+= gtkspell.0:${PORTSDIR}/textproc/gtkspell .endif -pre-everything:: - @${ECHO_MSG} "" - @${ECHO_MSG} "Define WITHOUT_GTKSPELL=yes to disable gtkspell" - @${ECHO_MSG} "" - -pre-configure: - ( cd ${WRKSRC} ; ${AUTORECONF} ) +post-patch: + @${REINPLACE_CMD} -e '/-g2/s|^|#|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|make -C|$$(MAKE) -C|g' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e '/-ldl/s|^|#|g' ${WRKSRC}/src/Makefile.in -.include +.include diff --git a/deskutils/drivel/distinfo b/deskutils/drivel/distinfo index 3b063ec48b99..827e45365b15 100644 --- a/deskutils/drivel/distinfo +++ b/deskutils/drivel/distinfo @@ -1,2 +1,2 @@ -SHA256 (drivel-3.0.2.tar.bz2) = 5194cef7d93d3ec87499c66e85957fee5b0556432296e338be5397a52f0136b2 -SIZE (drivel-3.0.2.tar.bz2) = 690570 +SHA256 (drivel-3.0.3.tar.bz2) = 73f66b7fe20c077cde06e164169e795ab65b38362b82e89dae3207c0d18f6404 +SIZE (drivel-3.0.3.tar.bz2) = 700272 diff --git a/deskutils/drivel/files/patch-Makefile-am b/deskutils/drivel/files/patch-Makefile-am deleted file mode 100644 index 8228a2e88c88..000000000000 --- a/deskutils/drivel/files/patch-Makefile-am +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.am.orig 2010-08-29 00:53:06.632333365 -0400 -+++ Makefile.am 2010-08-29 00:53:13.143217679 -0400 -@@ -9,7 +9,7 @@ - distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper' - - all-local: Makefile -- make -C po $(PACKAGE).pot -+ gmake -C po $(PACKAGE).pot - - clean-local: Makefile - find . -name '*~' -delete diff --git a/deskutils/drivel/files/patch-src-Makefile-am b/deskutils/drivel/files/patch-src-Makefile-am deleted file mode 100644 index dc055e8c1f0f..000000000000 --- a/deskutils/drivel/files/patch-src-Makefile-am +++ /dev/null @@ -1,12 +0,0 @@ ---- src/Makefile.am.orig 2010-08-29 00:47:37.560980649 -0400 -+++ src/Makefile.am 2010-08-29 00:47:43.680408814 -0400 -@@ -61,8 +61,7 @@ - - drivel_LDADD = \ - $(DRIVEL_LIBS) \ -- $(INTLLIBS) \ -- -ldl -+ $(INTLLIBS) - - gladedir = $(pkgdatadir)/glade - glade_DATA = drivel-gtk.glade diff --git a/deskutils/drivel/pkg-descr b/deskutils/drivel/pkg-descr index b2d3713f5d9c..9666de313c1e 100644 --- a/deskutils/drivel/pkg-descr +++ b/deskutils/drivel/pkg-descr @@ -12,4 +12,4 @@ many powerful features, including: * Journal system extensions, including LiveJournal security groups and MovableType categories -WWW: http://www.dropline.net/drivel/ +WWW: http://drivel.sourceforge.net/ diff --git a/deskutils/drivel/pkg-plist b/deskutils/drivel/pkg-plist index c8c4daa6d334..3022348699e2 100644 --- a/deskutils/drivel/pkg-plist +++ b/deskutils/drivel/pkg-plist @@ -1,6 +1,33 @@ bin/drivel +etc/gconf/schemas/drivel.schemas share/application-registry/drivel.applications share/applications/gnome-drivel.desktop +%%DATADIR%%/glade/advogato.png +%%DATADIR%%/glade/atom.png +%%DATADIR%%/glade/blogger.png +%%DATADIR%%/glade/checkbutton.xpm +%%DATADIR%%/glade/combobox.xpm +%%DATADIR%%/glade/community.png +%%DATADIR%%/glade/doublearrow.png +%%DATADIR%%/glade/drivel-24.png +%%DATADIR%%/glade/drivel-gtk.glade +%%DATADIR%%/glade/drivel_splash.png +%%DATADIR%%/glade/entry.xpm +%%DATADIR%%/glade/feed.png +%%DATADIR%%/glade/hscale.xpm +%%DATADIR%%/glade/insert_image.png +%%DATADIR%%/glade/insert_object.png +%%DATADIR%%/glade/leftarrow.png +%%DATADIR%%/glade/livejournal.png +%%DATADIR%%/glade/mt.png +%%DATADIR%%/glade/private.png +%%DATADIR%%/glade/protected.png +%%DATADIR%%/glade/public.png +%%DATADIR%%/glade/radiobutton.xpm +%%DATADIR%%/glade/rightarrow.png +%%DATADIR%%/glade/tray_livejournal.png +%%DATADIR%%/glade/user.png +%%DATADIR%%/glade/xmms.xpm share/gnome/help/drivel/C/drivel.xml share/gnome/help/drivel/C/legal.xml share/gnome/help/drivel/cs/drivel.xml @@ -54,55 +81,38 @@ share/omf/drivel/drivel-cs.omf share/omf/drivel/drivel-de.omf share/omf/drivel/drivel-pt.omf share/pixmaps/drivel-48.png -%%DATADIR%%/glade/atom.png -%%DATADIR%%/glade/advogato.png -%%DATADIR%%/glade/blogger.png -%%DATADIR%%/glade/checkbutton.xpm -%%DATADIR%%/glade/combobox.xpm -%%DATADIR%%/glade/community.png -%%DATADIR%%/glade/doublearrow.png -%%DATADIR%%/glade/drivel-24.png -%%DATADIR%%/glade/drivel_splash.png -%%DATADIR%%/glade/entry.xpm -%%DATADIR%%/glade/feed.png -%%DATADIR%%/glade/hscale.xpm -%%DATADIR%%/glade/insert_image.png -%%DATADIR%%/glade/insert_object.png -%%DATADIR%%/glade/leftarrow.png -%%DATADIR%%/glade/livejournal.png -%%DATADIR%%/glade/mt.png -%%DATADIR%%/glade/private.png -%%DATADIR%%/glade/protected.png -%%DATADIR%%/glade/public.png -%%DATADIR%%/glade/radiobutton.xpm -%%DATADIR%%/glade/rightarrow.png -%%DATADIR%%/glade/tray_livejournal.png -%%DATADIR%%/glade/user.png -%%DATADIR%%/glade/xmms.xpm -%%DATADIR%%/glade/drivel-gtk.glade -@unexec /bin/rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/rw 2>/dev/null || /usr/bin/true -@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime -@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime +@dirrm share/omf/drivel +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz @dirrmtry share/icons/gnome/48x48/mimetypes @dirrmtry share/icons/gnome/48x48 -@dirrmtry share/gnome/help/drivel/C -@dirrmtry share/gnome/help/drivel/cs -@dirrmtry share/gnome/help/drivel/de -@dirrmtry share/gnome/help/drivel/pt -@dirrmtry share/gnome/help/drivel -@dirrmtry share/icons/gnome/16x16/mimetypes -@dirrmtry share/icons/gnome/16x16 -@dirrmtry share/icons/gnome/22x22/mimetypes -@dirrmtry share/icons/gnome/22x22 -@dirrmtry share/icons/gnome/24x24/mimetypes -@dirrmtry share/icons/gnome/24x24 @dirrmtry share/icons/gnome/32x32/mimetypes @dirrmtry share/icons/gnome/32x32 +@dirrmtry share/icons/gnome/24x24/mimetypes +@dirrmtry share/icons/gnome/24x24 +@dirrmtry share/icons/gnome/22x22/mimetypes +@dirrmtry share/icons/gnome/22x22 +@dirrmtry share/icons/gnome/16x16/mimetypes +@dirrmtry share/icons/gnome/16x16 @dirrmtry share/icons/gnome -@dirrmtry share/omf/drivel +@dirrmtry share/icons +@dirrmtry share/gnome/help/drivel/pt +@dirrmtry share/gnome/help/drivel/de +@dirrmtry share/gnome/help/drivel/cs +@dirrmtry share/gnome/help/drivel/C +@dirrmtry share/gnome/help/drivel @dirrmtry %%DATADIR%%/glade @dirrmtry %%DATADIR%% -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw @dirrmtry share/applications +@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime +@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime +@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -- cgit v1.2.3