diff options
| -rw-r--r-- | x11-toolkits/Makefile | 1 | ||||
| -rw-r--r-- | x11-toolkits/fxscintilla-fox10/Makefile | 13 | ||||
| -rw-r--r-- | x11-toolkits/fxscintilla/Makefile | 26 | ||||
| -rw-r--r-- | x11-toolkits/fxscintilla/distinfo | 4 | ||||
| -rw-r--r-- | x11-toolkits/fxscintilla/pkg-plist | 3 | ||||
| -rw-r--r-- | x11-toolkits/ruby-fox/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/ruby-fox10/Makefile | 2 |
7 files changed, 40 insertions, 11 deletions
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index b13e7f7edaa..a11824369b0 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -23,6 +23,7 @@ SUBDIR += fox-devel SUBDIR += freeglut SUBDIR += fxscintilla + SUBDIR += fxscintilla-fox10 SUBDIR += gai SUBDIR += gal SUBDIR += gal2 diff --git a/x11-toolkits/fxscintilla-fox10/Makefile b/x11-toolkits/fxscintilla-fox10/Makefile new file mode 100644 index 00000000000..92c4839e0f9 --- /dev/null +++ b/x11-toolkits/fxscintilla-fox10/Makefile @@ -0,0 +1,13 @@ +# New ports collection makefile for: fxscintilla-fox10 +# Date created: 18 Dec 2004 +# Whom: Pav Lucistnik <pav@FreeBSD.org> +# +# $FreeBSD$ + +PKGNAMESUFFIX= -fox10 + +WITH_FOX10= yes + +MASTERDIR= ${.CURDIR}/../fxscintilla + +.include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/fxscintilla/Makefile b/x11-toolkits/fxscintilla/Makefile index 41b2be1d8f9..87c8b41dc1d 100644 --- a/x11-toolkits/fxscintilla/Makefile +++ b/x11-toolkits/fxscintilla/Makefile @@ -6,7 +6,7 @@ # PORTNAME= fxscintilla -PORTVERSION= 1.57 +PORTVERSION= 1.62 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -14,10 +14,26 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= alecn2002@yandex.ru COMMENT= A Fox toolkit reimplementation of Scintilla editing widget -LIB_DEPENDS= FOX-1.0.0:${PORTSDIR}/x11-toolkits/fox +GNU_CONFIGURE= yes -USE_INC_LIBTOOL_VER= 15 -CONFIGURE_ARGS= --enable-shared +USE_LIBTOOL_VER= 15 +USE_REINPLACE= yes +CONFIGURE_ARGS+= --enable-shared --disable-static INSTALLS_SHLIB= yes -.include <bsd.port.mk> +OPTIONS= FOX10 "FOX1.0 support (FOX1.2 by default)" off + +.include <bsd.port.pre.mk> + +.if defined(WITH_FOX10) +LIB_DEPENDS+= FOX-1.0.0:${PORTSDIR}/x11-toolkits/fox +CONFIGURE_ARGS= --with-fox-1-0 +.else +LIB_DEPENDS+= FOX-1.2:${PORTSDIR}/x11-toolkits/fox-devel +.endif + +post-patch: + @${REINPLACE_CMD} -e 's|-lFOX-1.2|"-lFOX-1.2 ${PTHREAD_LIBS}"|' \ + ${WRKSRC}/configure ${WRKSRC}/tests/Makefile.in + +.include <bsd.port.post.mk> diff --git a/x11-toolkits/fxscintilla/distinfo b/x11-toolkits/fxscintilla/distinfo index 394961253c5..ad548595d67 100644 --- a/x11-toolkits/fxscintilla/distinfo +++ b/x11-toolkits/fxscintilla/distinfo @@ -1,2 +1,2 @@ -MD5 (fxscintilla-1.57.tar.gz) = 68aa25d2b8d626b6455736e611a3993f -SIZE (fxscintilla-1.57.tar.gz) = 798115 +MD5 (fxscintilla-1.62.tar.gz) = c4cb1b9d954b92e1e1fdcb75597662c6 +SIZE (fxscintilla-1.62.tar.gz) = 833249 diff --git a/x11-toolkits/fxscintilla/pkg-plist b/x11-toolkits/fxscintilla/pkg-plist index bd373718fac..43057d2b1ac 100644 --- a/x11-toolkits/fxscintilla/pkg-plist +++ b/x11-toolkits/fxscintilla/pkg-plist @@ -2,7 +2,6 @@ include/fxscintilla/FXScintilla.h include/fxscintilla/SciLexer.h include/fxscintilla/Scintilla.h lib/libfxscintilla.a -lib/libfxscintilla.la lib/libfxscintilla.so -lib/libfxscintilla.so.11 +lib/libfxscintilla.so.16 @dirrm include/fxscintilla diff --git a/x11-toolkits/ruby-fox/Makefile b/x11-toolkits/ruby-fox/Makefile index 225652878c4..393a61b25c9 100644 --- a/x11-toolkits/ruby-fox/Makefile +++ b/x11-toolkits/ruby-fox/Makefile @@ -21,7 +21,7 @@ COMMENT= Ruby extension module to use FOX, aka FXRuby LIB_DEPENDS= FOX-1.0.0:${PORTSDIR}/x11-toolkits/fox \ png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ - fxscintilla.11:${PORTSDIR}/x11-toolkits/fxscintilla + fxscintilla.16:${PORTSDIR}/x11-toolkits/fxscintilla-fox10 USE_RUBY= yes USE_RUBY_SETUP= yes diff --git a/x11-toolkits/ruby-fox10/Makefile b/x11-toolkits/ruby-fox10/Makefile index 225652878c4..393a61b25c9 100644 --- a/x11-toolkits/ruby-fox10/Makefile +++ b/x11-toolkits/ruby-fox10/Makefile @@ -21,7 +21,7 @@ COMMENT= Ruby extension module to use FOX, aka FXRuby LIB_DEPENDS= FOX-1.0.0:${PORTSDIR}/x11-toolkits/fox \ png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ - fxscintilla.11:${PORTSDIR}/x11-toolkits/fxscintilla + fxscintilla.16:${PORTSDIR}/x11-toolkits/fxscintilla-fox10 USE_RUBY= yes USE_RUBY_SETUP= yes |