From 4326acdf4c4b74ad397f7c0274b179de90d0eeaf Mon Sep 17 00:00:00 2001 From: Rusmir Dusko Date: Tue, 31 Dec 2013 15:13:19 +0000 Subject: [PATCH] - Update to 1.1.7,1 - Pass maintainership to submitter - Remove leading article from COMMENT - Add license (GPLv3) - Add dependency for textproc/p5-XML-Parser - Support STAGEDIR and add OPTIONS_SUB - Add DOCS - Add DOCS and NLS Options - Simplify Option handling - Remove obsolete REINPLACE_CMD - Use REINPLACE_CMD instead of simple patches - Add patch, fix start in FreeBSD (add g_mutex_trylock) Approved by: pawel / wg (mentors, implicit) --- deskutils/parcellite/Makefile | 38 +++++++++++-------- deskutils/parcellite/distinfo | 4 +- .../parcellite/files/patch-po_Makefile.in.in | 19 ---------- deskutils/parcellite/files/patch-src__main.c | 10 +++++ deskutils/parcellite/pkg-plist | 8 ++-- 5 files changed, 39 insertions(+), 40 deletions(-) delete mode 100644 deskutils/parcellite/files/patch-po_Makefile.in.in create mode 100644 deskutils/parcellite/files/patch-src__main.c diff --git a/deskutils/parcellite/Makefile b/deskutils/parcellite/Makefile index 5eb24c8b55e5..0216347fdce1 100644 --- a/deskutils/parcellite/Makefile +++ b/deskutils/parcellite/Makefile @@ -2,34 +2,40 @@ # $FreeBSD$ PORTNAME= parcellite -PORTVERSION= 1.0.1 -PORTREVISION= 1 +PORTVERSION= 1.1.7 PORTEPOCH= 1 CATEGORIES= deskutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} -MAINTAINER= jrm@ftfl.ca -COMMENT= A lightweight GTK+ clipboard manager +MAINTAINER= nemysis@FreeBSD.org +COMMENT= Lightweight GTK+ clipboard manager + +LICENSE= GPLv3 + +BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser -GNU_CONFIGURE= yes USES= gmake pkgconfig +GNU_CONFIGURE= yes USE_GNOME= gtk20 -NO_STAGE= yes +PORTDOCS= AUTHORS ChangeLog README TODO + +OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes + +NLS_CONFIGURE_ENABLE= nls +NLS_USES= gettext + .include +post-patch: .if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " + @${REINPLACE_CMD} -e 's|$$(DATADIRNAME)/locale|share/locale|' \ + ${WRKSRC}/po/Makefile.in.in .endif -MAN1= parcellite.1 - -post-patch: - @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g'\ - ${WRKSRC}/src/keybinder.h +post-install: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include diff --git a/deskutils/parcellite/distinfo b/deskutils/parcellite/distinfo index 2b3237633e3c..a1a76d3b74c2 100644 --- a/deskutils/parcellite/distinfo +++ b/deskutils/parcellite/distinfo @@ -1,2 +1,2 @@ -SHA256 (parcellite-1.0.1.tar.gz) = a4e7a1bd0616683b7eb4b08350cdaa355b1c9d5c93a4caa0cef4a813cf4cc526 -SIZE (parcellite-1.0.1.tar.gz) = 555184 +SHA256 (parcellite-1.1.7.tar.gz) = 870f3789f247b200a609cb6dbefa42204779b2575a9dafa5b90828d2fce05f5f +SIZE (parcellite-1.1.7.tar.gz) = 723826 diff --git a/deskutils/parcellite/files/patch-po_Makefile.in.in b/deskutils/parcellite/files/patch-po_Makefile.in.in deleted file mode 100644 index 389951be00b2..000000000000 --- a/deskutils/parcellite/files/patch-po_Makefile.in.in +++ /dev/null @@ -1,19 +0,0 @@ -*** po/Makefile.in.in.orig Tue May 5 19:45:52 2009 ---- po/Makefile.in.in Tue May 5 19:46:58 2009 -*************** -*** 34,40 **** - datarootdir = @datarootdir@ - libdir = @libdir@ - DATADIRNAME = @DATADIRNAME@ -! itlocaledir = $(prefix)/$(DATADIRNAME)/locale - subdir = po - install_sh = @install_sh@ - # Automake >= 1.8 provides @mkdir_p@. ---- 34,40 ---- - datarootdir = @datarootdir@ - libdir = @libdir@ - DATADIRNAME = @DATADIRNAME@ -! itlocaledir = $(datarootdir)/locale - subdir = po - install_sh = @install_sh@ - # Automake >= 1.8 provides @mkdir_p@. diff --git a/deskutils/parcellite/files/patch-src__main.c b/deskutils/parcellite/files/patch-src__main.c new file mode 100644 index 000000000000..20cb98a441bd --- /dev/null +++ b/deskutils/parcellite/files/patch-src__main.c @@ -0,0 +1,10 @@ +--- ./src/main.c.orig 2013-10-15 19:39:04.000000000 +0200 ++++ ./src/main.c 2013-12-31 15:12:54.000000000 +0100 +@@ -2097,6 +2097,7 @@ + } + clip_lock= g_mutex_new(); + hist_lock= g_mutex_new(); ++ g_mutex_trylock(clip_lock); + g_mutex_unlock(clip_lock); + + show_icon=!get_pref_int32("no_icon"); diff --git a/deskutils/parcellite/pkg-plist b/deskutils/parcellite/pkg-plist index 705fbb594d2c..16bd6375e859 100644 --- a/deskutils/parcellite/pkg-plist +++ b/deskutils/parcellite/pkg-plist @@ -1,9 +1,8 @@ bin/parcellite etc/xdg/autostart/parcellite-startup.desktop +man/man1/parcellite.1.gz share/applications/parcellite.desktop -share/pixmaps/parcellite.png -share/pixmaps/parcellite.svg -share/pixmaps/parcellite.xpm +%%NLS%%share/locale/ca/LC_MESSAGES/parcellite.mo %%NLS%%share/locale/cs/LC_MESSAGES/parcellite.mo %%NLS%%share/locale/da/LC_MESSAGES/parcellite.mo %%NLS%%share/locale/de/LC_MESSAGES/parcellite.mo @@ -21,5 +20,8 @@ share/pixmaps/parcellite.xpm %%NLS%%share/locale/sv/LC_MESSAGES/parcellite.mo %%NLS%%share/locale/tr/LC_MESSAGES/parcellite.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/parcellite.mo +share/pixmaps/parcellite.png +share/pixmaps/parcellite.svg +share/pixmaps/parcellite.xpm %%NLS%%@dirrmtry share/locale/pl_PL/LC_MESSAGES %%NLS%%@dirrmtry share/locale/pl_PL