Index: head/editors/zoinks/Makefile =================================================================== --- head/editors/zoinks/Makefile (revision 363624) +++ head/editors/zoinks/Makefile (revision 363625) @@ -1,49 +1,34 @@ # Created by: Mike Lockwood # $FreeBSD$ PORTNAME= zoinks -PORTVERSION= 0.3.7 -PORTREVISION= 4 +PORTVERSION= 0.4.1 CATEGORIES= editors MASTER_SITES= http://zoinks.mikelockwood.com/download/ MAINTAINER= ports@FreeBSD.org COMMENT= X11 programmer's editor and development environment -.if defined(WITH_IMLIB) -USE_GNOME= imlib -CONFIGURE_ARGS+= --enable-imlib -.else -CONFIGURE_ARGS+= --disable-imlib -.endif +LICENSE= GPLv2 # (or later) USE_XORG= xpm GNU_CONFIGURE= yes -NO_STAGE= yes +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= NLS +OPTIONS_DEFINE= IMLIB NLS +OPTIONS_SUB= yes -.include +IMLIB_USE= GNOME=imlib +IMLIB_CONFIGURE_ENABLE= imlib +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -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' .include Index: head/editors/zoinks/distinfo =================================================================== --- head/editors/zoinks/distinfo (revision 363624) +++ head/editors/zoinks/distinfo (revision 363625) @@ -1,2 +1,2 @@ -SHA256 (zoinks-0.3.7.tar.gz) = a13f852eb97b6679ef5d01dc72b4dd5c0ed28c7792e234babcfa486cceb8e944 -SIZE (zoinks-0.3.7.tar.gz) = 326876 +SHA256 (zoinks-0.4.1.tar.gz) = bd8b229904b2e0aeae4742cc9eda882cd47874c86dcf21df8b3d77c830d301cd +SIZE (zoinks-0.4.1.tar.gz) = 322009 Index: head/editors/zoinks/files/patch-fw-TTextView.cpp =================================================================== --- head/editors/zoinks/files/patch-fw-TTextView.cpp (revision 363624) +++ head/editors/zoinks/files/patch-fw-TTextView.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- fw/TTextView.cpp.orig 2007-11-03 00:01:15.000000000 +0100 -+++ fw/TTextView.cpp 2007-11-03 00:01:40.000000000 +0100 -@@ -451,7 +451,7 @@ - { - if (offset < fSelectionAnchor) - { -- selectionStart = selectionStart = fLayout->GetLineOffset(fLayout->OffsetToLine(offset)); -+ selectionStart = fLayout->GetLineOffset(fLayout->OffsetToLine(offset)); - selectionEnd = fSelectionAnchorEnd; - } - else if (offset > fSelectionAnchorEnd) Property changes on: head/editors/zoinks/files/patch-fw-TTextView.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/zoinks/files/patch-fw-TWindow.cpp =================================================================== --- head/editors/zoinks/files/patch-fw-TWindow.cpp (revision 363624) +++ head/editors/zoinks/files/patch-fw-TWindow.cpp (revision 363625) @@ -1,41 +1,26 @@ --- fw/TWindow.cpp.orig 2003-04-16 21:38:57.000000000 +0200 +++ fw/TWindow.cpp 2007-11-04 22:35:45.000000000 +0100 @@ -502,7 +502,7 @@ return false; XIMStyles* supportedStyles; - XGetIMValues(xim, XNQueryInputStyle, &supportedStyles, NULL, NULL); + XGetIMValues(xim, XNQueryInputStyle, &supportedStyles, (char *)NULL); if (!supportedStyles || supportedStyles->count_styles == 0) return false; @@ -542,12 +542,12 @@ TFont* font = GetFont(); ASSERT(font && font->GetFontSet()); - XVaNestedList preeditAttributes = XVaCreateNestedList(0, XNFontSet, font->GetFontSet(), XNSpotLocation, &point, XNArea, &rect, NULL); + XVaNestedList preeditAttributes = XVaCreateNestedList(0, XNFontSet, font->GetFontSet(), XNSpotLocation, &point, XNArea, &rect, (char *)NULL); ASSERT(preeditAttributes); // XVaNestedList statusAttributes = XVaCreateNestedList(0, XNFontSet, font->GetFontSet(), NULL); // ASSERT(statusAttributes); - XIC xic = XCreateIC(xim, XNInputStyle, style, XNClientWindow, fWindow, XNFocusWindow, fWindow, XNPreeditAttributes, preeditAttributes, /*XNStatusAttributes, statusAttributes, */ NULL); + XIC xic = XCreateIC(xim, XNInputStyle, style, XNClientWindow, fWindow, XNFocusWindow, fWindow, XNPreeditAttributes, preeditAttributes, /*XNStatusAttributes, statusAttributes, */ (char *)NULL); if (xic) fInputContext = new TInputContext(xic); -@@ -657,7 +657,14 @@ - { - time = CurrentTime; // ignore time for now - -+#if 0 -+ Pietro Cerutti -+ We may not be the active window -+ anymore by this time -+ - ASSERT(sPointerGrabWindow == this); -+#endif -+ if(sPointerGrabWindow != this) return; - - XUngrabPointer(sDisplay, time); - Index: head/editors/zoinks/pkg-descr =================================================================== --- head/editors/zoinks/pkg-descr (revision 363624) +++ head/editors/zoinks/pkg-descr (revision 363625) @@ -1,8 +1,8 @@ -Zoinks is a programmer's editor and development environment for -Unix/X11 systems. The editor has features similar to Mac text -editors like MPW and CodeWarrior. It also has some features for -HTML authoring. Zoinks supports comparing/diffing files and -directory hierarchies. It also supports inputting and editing -multi-byte text (e.g. Japanese and other Asian languages). +Zoinks is a programmer's editor and development environment for Unix/X11 +systems. The editor has features similar to Mac text editors like MPW +and CodeWarrior. It also has some features for HTML authoring. Zoinks +supports comparing/diffing files and directory hierarchies. It also +supports inputting and editing multi-byte text (e.g. Japanese and other +Asian languages). WWW: http://zoinks.mikelockwood.com/ Index: head/editors/zoinks/pkg-plist =================================================================== --- head/editors/zoinks/pkg-plist (revision 363624) +++ head/editors/zoinks/pkg-plist (revision 363625) @@ -1,2 +1,3 @@ bin/zoinks +%%NLS%%share/locale/es/LC_MESSAGES/zoinks.mo %%NLS%%share/locale/ja/LC_MESSAGES/zoinks.mo