- Update to 2.11.0

- Chase support for FOX 1.4

3 files changed, 16 insertions, 31 deletions

diff --git a/x11-toolkits/fxscintilla/Makefile b/x11-toolkits/fxscintilla/Makefile
index 49ce8065342c..0cba47fccaa3 100644
--- a/x11-toolkits/fxscintilla/Makefile
+++ b/x11-toolkits/fxscintilla/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	fxscintilla
-PORTVERSION=	1.71
-PORTREVISION=	15
+PORTVERSION=	2.11.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,30 +14,10 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Fox toolkit reimplementation of Scintilla editing widget
 
-USE_AUTOTOOLS=	libtool:22
-CONFIGURE_ARGS+=	--enable-shared --disable-static \
-			--includedir=${LOCALBASE}/include
-USE_LDCONFIG=	yes
-
-.if !defined(MASTERDIR)
-OPTIONS+=	FOX14 "FOX1.4 support (FOX1.6 by default)" off
-.endif
-
-.include <bsd.port.pre.mk>
+LIB_DEPENDS+=	FOX-1.6:${PORTSDIR}/x11-toolkits/fox16
 
-.if defined(WITH_FOX14)
-FOX_LIB_VER=	1.4
-LIB_DEPENDS+=	FOX-${FOX_LIB_VER}:${PORTSDIR}/x11-toolkits/fox14
-CONFIGURE_ARGS+=	--with-fox-1-4
-.else
-FOX_LIB_VER=	1.6
-LIB_DEPENDS+=	FOX-${FOX_LIB_VER}:${PORTSDIR}/x11-toolkits/fox16
-CONFIGURE_ARGS+=	--with-fox-1-6
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lFOX-${FOX_LIB_VER}|"-lFOX-${FOX_LIB_VER} ${PTHREAD_LIBS}"|' \
-		${WRKSRC}/configure ${WRKSRC}/tests/Makefile.in
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/configure
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-shared
+USE_LDCONFIG=	yes
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/fxscintilla/distinfo b/x11-toolkits/fxscintilla/distinfo
index 63a2d0867306..e361e189049e 100644
--- a/x11-toolkits/fxscintilla/distinfo
+++ b/x11-toolkits/fxscintilla/distinfo
@@ -1,3 +1,3 @@
-MD5 (fxscintilla-1.71.tar.gz) = 302b5a3d54a259e3bfea2ab1f4040d49
-SHA256 (fxscintilla-1.71.tar.gz) = 882c91f025699ee2496d0dfd37ef21dda40e9a7fff796d0f4091c03390716d7d
-SIZE (fxscintilla-1.71.tar.gz) = 887017
+MD5 (fxscintilla-2.11.0.tar.gz) = 728832cd607ffc0554739a5e37c566b4
+SHA256 (fxscintilla-2.11.0.tar.gz) = 27f7f75d28c0537752f14a6d9cd16e3d2a6840570ef267de0dc262c373096020
+SIZE (fxscintilla-2.11.0.tar.gz) = 915641
diff --git a/x11-toolkits/fxscintilla/pkg-plist b/x11-toolkits/fxscintilla/pkg-plist
index 4b4f550dd56f..3009b4ecc128 100644
--- a/x11-toolkits/fxscintilla/pkg-plist
+++ b/x11-toolkits/fxscintilla/pkg-plist
@@ -1,8 +1,14 @@
+include/fxscintilla/Accessor.h
 include/fxscintilla/FXScintilla.h
+include/fxscintilla/KeyWords.h
+include/fxscintilla/Platform.h
+include/fxscintilla/PropSet.h
 include/fxscintilla/SciLexer.h
 include/fxscintilla/Scintilla.h
+include/fxscintilla/ScintillaWidget.h
+include/fxscintilla/WindowAccessor.h
 lib/libfxscintilla.a
 lib/libfxscintilla.la
 lib/libfxscintilla.so
-lib/libfxscintilla.so.19
+lib/libfxscintilla.so.21
 @dirrm include/fxscintilla