Attachment #159216 for bug #201875




# $FreeBSD$

PORTNAME=	parcellite
PORTVERSION=	1.1.9
PORTREVISION=	1
PORTEPOCH=	1
CATEGORIES=	deskutils
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}

COMMENT=	Lightweight GTK+ clipboard manager

LICENSE=	GPLv3
LICENSE_FILE=	${WRKSRC}/COPYING

USES=		pkgconfig

USES=		gettext-tools gmake pkgconfig
GNU_CONFIGURE=	yes
USE_GNOME=	glib20 gtk20 pango
USE_XORG=	x11
CONFIGURE_ARGS+=--disable-appindicator
CPPFLAGS+=	-I${LOCALBASE}/include
LIBS+=		-L${LOCALBASE}/lib

PORTDOCS=	AUTHORS ChangeLog README

OPTIONS_DEFINE=	DOCS NLS
OPTIONS_SUB=	yes

NLS_USES=	gmake gettext
NLS_USE=	GNOME=intltool
NLS_USES_OFF=	autoreconf
NLS_EXTRA_PATCHES_OFF=	${PATCHDIR}/extrapatch-configure.ac

SUB_FILES=	pkg-message


.include <bsd.port.options.mk>

post-patch:
	@${REINPLACE_CMD} -e 's|/proc|/compat/linux/proc|g' \
		s|"/proc"|"/compat/linux/proc"|' \
		${WRKSRC}/src/utils.c
	@${REINPLACE_CMD} -e '/LDADD = /s/GTK_LIBS)/INTLLIBS) -lgio-2.0/' \
		${WRKSRC}/src/Makefile.am \
		${WRKSRC}/src/Makefile.in
.if ${PORT_OPTIONS:MNLS}
	@${REINPLACE_CMD} -e 's|$$(DATADIRNAME)/locale|share/locale|' \
		${WRKSRC}/po/Makefile.in.in
.else
	@${REINPLACE_CMD} -e 's|@INTLTOOL_DESKTOP_RULE@||' \
		${WRKSRC}/data/Makefile.am
	@${REINPLACE_CMD} -e 's|_Name|Name|' -e 's|_Comment|Comment|' \
		${WRKSRC}/data/parcellite-startup.desktop.in \
		${WRKSRC}/data/parcellite.desktop.in
.endif

pre-build:
.if !${PORT_OPTIONS:MNLS}
	@${REINPLACE_CMD} -e '/SUBDIRS = /s| po||' ${WRKSRC}/Makefile
	${MV} ${WRKSRC}/data/parcellite-startup.desktop.in \
		${WRKSRC}/data/parcellite-startup.desktop
	${MV} ${WRKSRC}/data/parcellite.desktop.in \
		${WRKSRC}/data/parcellite.desktop
.endif

post-install:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}

Lines 1-2 Link Here

(-)deskutils/parcellite/distinfo (-2 / +2 lines)
1	SHA256 (parcellite-1.1.7.tar.gz) = 870f3789f247b200a609cb6dbefa42204779b2575a9dafa5b90828d2fce05f5f	1	SHA256 (parcellite-1.1.9.tar.gz) = cba89585082eebbe848ac1c0023cc71a0184c0db24ebc5f8a21039e46d7f11d4
2	SIZE (parcellite-1.1.7.tar.gz) = 723826	2	SIZE (parcellite-1.1.9.tar.gz) = 720177

Line 0 Link Here

(-)deskutils/parcellite/files/extrapatch-configure.ac (+27 lines)
	1	--- configure.ac.orig 2014-10-01 14:43:09 UTC
	2	+++ configure.ac
	3	@@ -19,15 +19,9 @@ GETTEXT_PACKAGE=parcellite
	4	AC_SUBST(GETTEXT_PACKAGE)
	5	AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package])
	6
	7	-ALL_LINGUAS="ca cs da de es fr hu it ja nb pl pl_PL pt_BR ro ru sv tr zh_CN"
	8	-AM_GLIB_GNU_GETTEXT()
	9	-AC_PROG_INTLTOOL([0.23])
	10	-
	11	parcellitelocaledir='${prefix}/${DATADIRNAME}/locale'
	12	AC_SUBST(parcellitelocaledir)
	13
	14	-AM_GNU_GETTEXT([external])
	15	-
	16	# -------------------------------------------------------------------------------
	17	# Main settings.
	18	# -------------------------------------------------------------------------------
	19	@@ -104,7 +98,7 @@ AC_CHECK_LIB([$gtk_libs],gtk_status_icon
	20	# -------------------------------------------------------------------------------
	21	# Checks for header files.
	22	# -------------------------------------------------------------------------------
	23	-AC_CHECK_HEADERS([stdlib.h string.h pthread.h libintl.h])
	24	+AC_CHECK_HEADERS([stdlib.h string.h pthread.h])
	25
	26	# -------------------------------------------------------------------------------
	27	# Checks for typedefs, structures, and compiler characteristics.

Lines 1-10 Link Here

(-)deskutils/parcellite/files/patch-src__main.c (-10 lines)
1	--- ./src/main.c.orig 2013-10-15 19:39:04.000000000 +0200
2	+++ ./src/main.c 2013-12-31 15:12:54.000000000 +0100
3	@@ -2097,6 +2097,7 @@
4	}
5	clip_lock= g_mutex_new();
6	hist_lock= g_mutex_new();
7	+ g_mutex_trylock(clip_lock);
8	g_mutex_unlock(clip_lock);
9
10	show_icon=!get_pref_int32("no_icon");

Return to bug 201875

Lines 2-9 Link Here

(-)deskutils/parcellite/Makefile (-11 / +32 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= parcellite	4	PORTNAME= parcellite
5	PORTVERSION= 1.1.7	5	PORTVERSION= 1.1.9
6	PORTREVISION= 1
7	PORTEPOCH= 1	6	PORTEPOCH= 1
8	CATEGORIES= deskutils	7	CATEGORIES= deskutils
9	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}	8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
Lines 12-31 Link Here
12	COMMENT= Lightweight GTK+ clipboard manager	11	COMMENT= Lightweight GTK+ clipboard manager
13		12
14	LICENSE= GPLv3	13	LICENSE= GPLv3
		14	LICENSE_FILE= ${WRKSRC}/COPYING
15		15
16	BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser	16	USES= pkgconfig
17
18	USES= gettext-tools gmake pkgconfig
19	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
20	USE_GNOME= gtk20	18	USE_GNOME= glib20 gtk20 pango
		19	USE_XORG= x11
		20	CONFIGURE_ARGS+=--disable-appindicator
		21	CPPFLAGS+= -I${LOCALBASE}/include
		22	LIBS+= -L${LOCALBASE}/lib
21		23
22	PORTDOCS= AUTHORS ChangeLog README	24	PORTDOCS= AUTHORS ChangeLog README
23		25
24	OPTIONS_DEFINE= DOCS NLS	26	OPTIONS_DEFINE= DOCS NLS
25	OPTIONS_SUB= yes	27	OPTIONS_SUB= yes
26		28
27	NLS_CONFIGURE_ENABLE= nls	29	NLS_USES= gmake gettext
28	NLS_USES= gettext-runtime	30	NLS_USE= GNOME=intltool
		31	NLS_USES_OFF= autoreconf
		32	NLS_EXTRA_PATCHES_OFF= ${PATCHDIR}/extrapatch-configure.ac
29		33
30	SUB_FILES= pkg-message	34	SUB_FILES= pkg-message
31		35
Lines 32-45 Link Here
32	.include <bsd.port.options.mk>	36	.include <bsd.port.options.mk>
33		37
34	post-patch:	38	post-patch:
35	@${REINPLACE_CMD} -e 's\|"/proc/\|"/compat/linux/proc/\|; \	39	@${REINPLACE_CMD} -e 's\|/proc\|/compat/linux/proc\|g' \
36	s\|"/proc"\|"/compat/linux/proc"\|' \
37	${WRKSRC}/src/utils.c	40	${WRKSRC}/src/utils.c
		41	@${REINPLACE_CMD} -e '/LDADD = /s/GTK_LIBS)/INTLLIBS) -lgio-2.0/' \
		42	${WRKSRC}/src/Makefile.am \
		43	${WRKSRC}/src/Makefile.in
38	.if ${PORT_OPTIONS:MNLS}	44	.if ${PORT_OPTIONS:MNLS}
39	@${REINPLACE_CMD} -e 's\|$$(DATADIRNAME)/locale\|share/locale\|' \	45	@${REINPLACE_CMD} -e 's\|$$(DATADIRNAME)/locale\|share/locale\|' \
40	${WRKSRC}/po/Makefile.in.in	46	${WRKSRC}/po/Makefile.in.in
		47	.else
		48	@${REINPLACE_CMD} -e 's\|@INTLTOOL_DESKTOP_RULE@\|\|' \
		49	${WRKSRC}/data/Makefile.am
		50	@${REINPLACE_CMD} -e 's\|_Name\|Name\|' -e 's\|_Comment\|Comment\|' \
		51	${WRKSRC}/data/parcellite-startup.desktop.in \
		52	${WRKSRC}/data/parcellite.desktop.in
41	.endif	53	.endif
42		54
		55	pre-build:
		56	.if !${PORT_OPTIONS:MNLS}
		57	@${REINPLACE_CMD} -e '/SUBDIRS = /s\| po\|\|' ${WRKSRC}/Makefile
		58	${MV} ${WRKSRC}/data/parcellite-startup.desktop.in \
		59	${WRKSRC}/data/parcellite-startup.desktop
		60	${MV} ${WRKSRC}/data/parcellite.desktop.in \
		61	${WRKSRC}/data/parcellite.desktop
		62	.endif
		63
43	post-install:	64	post-install:
44	@${MKDIR} ${STAGEDIR}${DOCSDIR}	65	@${MKDIR} ${STAGEDIR}${DOCSDIR}
45	${INSTALL_DATA} ${PORTDOCS:S\|^\|${WRKSRC}/\|} ${STAGEDIR}${DOCSDIR}	66	${INSTALL_DATA} ${PORTDOCS:S\|^\|${WRKSRC}/\|} ${STAGEDIR}${DOCSDIR}