svn commit: r338324 - in head/deskutils/parcellite: . files

[Rusmir Dusko]

Author: nemysis
Date: Tue Dec 31 15:13:19 2013
New Revision: 338324
URL: http://svnweb.freebsd.org/changeset/ports/338324

Log:
  - 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)

Added:
  head/deskutils/parcellite/files/patch-src__main.c   (contents, props changed)
Deleted:
  head/deskutils/parcellite/files/patch-po_Makefile.in.in
Modified:
  head/deskutils/parcellite/Makefile
  head/deskutils/parcellite/distinfo
  head/deskutils/parcellite/pkg-plist

Modified: head/deskutils/parcellite/Makefile
==============================================================================
--- head/deskutils/parcellite/Makefile	Tue Dec 31 15:00:36 2013	(r338323)
+++ head/deskutils/parcellite/Makefile	Tue Dec 31 15:13:19 2013	(r338324)
@@ -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 at ftfl.ca
-COMMENT=	A lightweight GTK+ clipboard manager
+MAINTAINER=	nemysis at 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 <bsd.port.options.mk>
 
+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 <bsd.port.mk>

Modified: head/deskutils/parcellite/distinfo
==============================================================================
--- head/deskutils/parcellite/distinfo	Tue Dec 31 15:00:36 2013	(r338323)
+++ head/deskutils/parcellite/distinfo	Tue Dec 31 15:13:19 2013	(r338324)
@@ -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

Added: head/deskutils/parcellite/files/patch-src__main.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/deskutils/parcellite/files/patch-src__main.c	Tue Dec 31 15:13:19 2013	(r338324)
@@ -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");

Modified: head/deskutils/parcellite/pkg-plist
==============================================================================
--- head/deskutils/parcellite/pkg-plist	Tue Dec 31 15:00:36 2013	(r338323)
+++ head/deskutils/parcellite/pkg-plist	Tue Dec 31 15:13:19 2013	(r338324)
@@ -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