Attachment #144589 for bug #191818




# $FreeBSD: head/editors/zoinks/Makefile 360256 2014-07-02 20:22:55Z antoine $

PORTNAME=	zoinks
PORTVERSION=	0.4.1
PORTREVISION=	4
CATEGORIES=	editors
MASTER_SITES=	http://zoinks.mikelockwood.com/download/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	X11 programmer's editor and development environment

LICENSE=	GPLv2 # (or later)
USE_GNOME=	imlib
CONFIGURE_ARGS+=	--enable-imlib
.else
CONFIGURE_ARGS+=	--disable-imlib
.endif

USE_XORG=	xpm
GNU_CONFIGURE=	yes

CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

OPTIONS_DEFINE=		IMLIB NLS
OPTIONS_SUB=		yes

IMLIB_USE=		GNOME=imlib
IMLIB_CONFIGURE_ENABLE=	imlib
NLS_USE=		gettext
NLS_CONFIGURE_ENABLE=	nls
PLIST_SUB+=	NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+=	NLS="@comment "
.endif

pre-everything::
	@${ECHO_MSG} ""
	@${ECHO_MSG} "Zoinks can be built with optional support for calculating image sizes"
	@${ECHO_MSG} "and image thumbnail creation for HTML files."
	@${ECHO_MSG} "These features require the Gnome imlib library."
	@${ECHO_MSG} "Use WITH_IMLIB=yes to enable these features."
	@${ECHO_MSG} ""

post-patch:
	@${REINPLACE_CMD} -e \
		's|^MY_CXXFLAGS|#&|' ${WRKSRC}/configure
	@${FIND} ${WRKSRC} -name *.xpm | ${XARGS} ${REINPLACE_CMD} -e \
		's|^"|(char *)"|g'


Lines 1-2 Link Here

(-)editors/zoinks/distinfo (-2 / +2 lines)
1	SHA256 (zoinks-0.3.7.tar.gz) = a13f852eb97b6679ef5d01dc72b4dd5c0ed28c7792e234babcfa486cceb8e944	1	SHA256 (zoinks-0.4.1.tar.gz) = bd8b229904b2e0aeae4742cc9eda882cd47874c86dcf21df8b3d77c830d301cd
2	SIZE (zoinks-0.3.7.tar.gz) = 326876	2	SIZE (zoinks-0.4.1.tar.gz) = 322009

Lines 1-11 Link Here

(-)editors/zoinks/files/patch-fw-TTextView.cpp (-11 lines)
1	--- fw/TTextView.cpp.orig 2007-11-03 00:01:15.000000000 +0100
2	+++ fw/TTextView.cpp 2007-11-03 00:01:40.000000000 +0100
3	@@ -451,7 +451,7 @@
4	{
5	if (offset < fSelectionAnchor)
6	{
7	- selectionStart = selectionStart = fLayout->GetLineOffset(fLayout->OffsetToLine(offset));
8	+ selectionStart = fLayout->GetLineOffset(fLayout->OffsetToLine(offset));
9	selectionEnd = fSelectionAnchorEnd;
10	}
11	else if (offset > fSelectionAnchorEnd)




 		if (xic)
 			fInputContext = new TInputContext(xic);
 			
@@ -657,7 +657,14 @@
 {
 	time = CurrentTime;	// ignore time for now
 
+#if 0
+	Pietro Cerutti <gahr@gahr.ch> 
+	We may not be the active window
+	anymore by this time
+
 	ASSERT(sPointerGrabWindow == this);
+#endif
+	if(sPointerGrabWindow != this) return;
 
 	XUngrabPointer(sDisplay, time);
 	

Lines 1-8 Link Here

(-)editors/zoinks/pkg-descr (-6 / +6 lines)
1	Zoinks is a programmer's editor and development environment for	1	Zoinks is a programmer's editor and development environment for Unix/X11
2	Unix/X11 systems. The editor has features similar to Mac text	2	systems. The editor has features similar to Mac text editors like MPW
3	editors like MPW and CodeWarrior. It also has some features for	3	and CodeWarrior. It also has some features for HTML authoring. Zoinks
4	HTML authoring. Zoinks supports comparing/diffing files and	4	supports comparing/diffing files and directory hierarchies. It also
5	directory hierarchies. It also supports inputting and editing	5	supports inputting and editing multi-byte text (e.g. Japanese and other
6	multi-byte text (e.g. Japanese and other Asian languages).	6	Asian languages).
7		7
8	WWW: http://zoinks.mikelockwood.com/	8	WWW: http://zoinks.mikelockwood.com/

Lines 1-2 Link Here

(-)editors/zoinks/pkg-plist (+1 lines)
1	bin/zoinks	1	bin/zoinks
		2	%%NLS%%share/locale/es/LC_MESSAGES/zoinks.mo
2	%%NLS%%share/locale/ja/LC_MESSAGES/zoinks.mo	3	%%NLS%%share/locale/ja/LC_MESSAGES/zoinks.mo

Return to bug 191818

Lines 2-48 Link Here

(-)editors/zoinks/Makefile (-27 / +12 lines)
2	# $FreeBSD: head/editors/zoinks/Makefile 360256 2014-07-02 20:22:55Z antoine $	2	# $FreeBSD: head/editors/zoinks/Makefile 360256 2014-07-02 20:22:55Z antoine $
3		3
4	PORTNAME= zoinks	4	PORTNAME= zoinks
5	PORTVERSION= 0.3.7	5	PORTVERSION= 0.4.1
6	PORTREVISION= 4
7	CATEGORIES= editors	6	CATEGORIES= editors
8	MASTER_SITES= http://zoinks.mikelockwood.com/download/	7	MASTER_SITES= http://zoinks.mikelockwood.com/download/
9		8
10	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
11	COMMENT= X11 programmer's editor and development environment	10	COMMENT= X11 programmer's editor and development environment
12		11
13	.if defined(WITH_IMLIB)	12	LICENSE= GPLv2 # (or later)
14	USE_GNOME= imlib
15	CONFIGURE_ARGS+= --enable-imlib
16	.else
17	CONFIGURE_ARGS+= --disable-imlib
18	.endif
19		13
20	USE_XORG= xpm	14	USE_XORG= xpm
21	GNU_CONFIGURE= yes	15	GNU_CONFIGURE= yes
22		16
23	NO_STAGE= yes	17	CPPFLAGS+= -I${LOCALBASE}/include
		18	LDFLAGS+= -L${LOCALBASE}/lib
24		19
25	OPTIONS_DEFINE= NLS	20	OPTIONS_DEFINE= IMLIB NLS
		21	OPTIONS_SUB= yes
26		22
27	.include <bsd.port.options.mk>	23	IMLIB_USE= GNOME=imlib
28		24	IMLIB_CONFIGURE_ENABLE= imlib
29	.if ${PORT_OPTIONS:MNLS}	25	NLS_USE= gettext
30	USES+= gettext	26	NLS_CONFIGURE_ENABLE= nls
31	PLIST_SUB+= NLS=""
32	.else
33	CONFIGURE_ARGS+=--disable-nls
34	PLIST_SUB+= NLS="@comment "
35	.endif
36
37	pre-everything::
38	@${ECHO_MSG} ""
39	@${ECHO_MSG} "Zoinks can be built with optional support for calculating image sizes"
40	@${ECHO_MSG} "and image thumbnail creation for HTML files."
41	@${ECHO_MSG} "These features require the Gnome imlib library."
42	@${ECHO_MSG} "Use WITH_IMLIB=yes to enable these features."
43	@${ECHO_MSG} ""
44		27
45	post-patch:	28	post-patch:
		29	@${REINPLACE_CMD} -e \
		30	's\|^MY_CXXFLAGS\|#&\|' ${WRKSRC}/configure
46	@${FIND} ${WRKSRC} -name *.xpm \| ${XARGS} ${REINPLACE_CMD} -e \	31	@${FIND} ${WRKSRC} -name *.xpm \| ${XARGS} ${REINPLACE_CMD} -e \
47	's\|^"\|(char *)"\|g'	32	's\|^"\|(char *)"\|g'
48		33

Lines 24-41 Link Here

(-)editors/zoinks/files/patch-fw-TWindow.cpp (-15 lines)
24	if (xic)	24	if (xic)
25	fInputContext = new TInputContext(xic);	25	fInputContext = new TInputContext(xic);
26		26
27	@@ -657,7 +657,14 @@
28	{
29	time = CurrentTime; // ignore time for now
30
31	+#if 0
32	+ Pietro Cerutti <gahr@gahr.ch>
33	+ We may not be the active window
34	+ anymore by this time
35	+
36	ASSERT(sPointerGrabWindow == this);
37	+#endif
38	+ if(sPointerGrabWindow != this) return;
39
40	XUngrabPointer(sDisplay, time);
41