svn commit: r378707 - in head/x11-toolkits/fltk: . files

[Vanilla I. Shu]

Author: vanilla
Date: Mon Feb  9 02:28:38 2015
New Revision: 378707
URL: https://svnweb.freebsd.org/changeset/ports/378707
QAT: https://qat.redports.org/buildarchive/r378707/

Log:
  Update to version 1.3.3
  
  PR:		197463
  Submitted by:	Ports Fury

Deleted:
  head/x11-toolkits/fltk/files/patch-documentation_Makefile
  head/x11-toolkits/fltk/files/patch-fluid_Fl_Type.h
  head/x11-toolkits/fltk/files/patch-src_Fl_x.cxx
Modified:
  head/x11-toolkits/fltk/Makefile
  head/x11-toolkits/fltk/distinfo
  head/x11-toolkits/fltk/files/patch-configure
  head/x11-toolkits/fltk/pkg-plist

Modified: head/x11-toolkits/fltk/Makefile
==============================================================================
--- head/x11-toolkits/fltk/Makefile	Mon Feb  9 02:26:32 2015	(r378706)
+++ head/x11-toolkits/fltk/Makefile	Mon Feb  9 02:28:38 2015	(r378707)
@@ -2,39 +2,51 @@
 # $FreeBSD$
 
 PORTNAME=	fltk
-PORTVERSION=	1.3.2
-PORTREVISION=	2
+PORTVERSION=	1.3.3
+DISTVERSIONSUFFIX=	-source
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://fltk.org/pub/${PORTNAME}/${PORTVERSION}/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-source
+MASTER_SITES=	http://fltk.org/pub/%SUBDIR%/
+MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Cross-platform C++ graphical user interface toolkit
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libpng.so:${PORTSDIR}/graphics/png
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USES=		pkgconfig
 USE_XORG=	xft
 USE_GL=		glu
-USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-shared
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+CONFIGURE_ARGS=	--enable-threads \
+		--enable-shared \
+		--enable-xft
+USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${WRKSRC}/src -L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	prefix="${PREFIX}" ; plength=$$(($${#prefix}+10)) ; \
-	${REINPLACE_CMD} -e "\|/etc/fltk|{s||${PREFIX}&|;s|10|$${plength}|;}" \
-	${WRKSRC}/src/Fl_Preferences.cxx
+	@${REINPLACE_CMD} -e \
+		'/.SILENT/s|^|#| ; \
+		 /echo /s|^|#|' ${WRKSRC}/makeinclude.in
+	@${REINPLACE_CMD} -e \
+		'/cat[13]/s|^|#|' ${WRKSRC}/documentation/Makefile
+	@${REINPLACE_CMD} -e \
+		's|"/etc/fltk/"|"${ETCDIR}/"|' ${WRKSRC}/src/Fl_Preferences.cxx
+
+post-install:
+	@(cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
+		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install)
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fluid
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfltk*.so.[0-9]*
 
 .include <bsd.port.mk>

Modified: head/x11-toolkits/fltk/distinfo
==============================================================================
--- head/x11-toolkits/fltk/distinfo	Mon Feb  9 02:26:32 2015	(r378706)
+++ head/x11-toolkits/fltk/distinfo	Mon Feb  9 02:28:38 2015	(r378707)
@@ -1,2 +1,2 @@
-SHA256 (fltk-1.3.2-source.tar.gz) = 176044df94f31bd53a5806cf5054ca78b180bf9ae27ce47649608833695ee4a4
-SIZE (fltk-1.3.2-source.tar.gz) = 4260874
+SHA256 (fltk-1.3.3-source.tar.gz) = f8398d98d7221d40e77bc7b19e761adaf2f1ef8bb0c30eceb7beb4f2273d0d97
+SIZE (fltk-1.3.3-source.tar.gz) = 4986376

Modified: head/x11-toolkits/fltk/files/patch-configure
==============================================================================
--- head/x11-toolkits/fltk/files/patch-configure	Mon Feb  9 02:26:32 2015	(r378706)
+++ head/x11-toolkits/fltk/files/patch-configure	Mon Feb  9 02:28:38 2015	(r378707)
@@ -1,11 +1,11 @@
 --- configure.orig	2011-08-31 09:14:41.000000000 +0200
 +++ configure	2011-08-31 09:14:54.000000000 +0200
-@@ -11566,7 +11566,7 @@
+@@ -7362,7 +7362,7 @@
  	LIBS="$LIBS -lX11 $X_EXTRA_LIBS"
  	CFLAGS="$CFLAGS $X_CFLAGS"
  	CXXFLAGS="$CXXFLAGS $X_CFLAGS"
 -	LDFLAGS="$X_LIBS $LDFLAGS"
 +	LDFLAGS="$LDFLAGS $X_LIBS"
  	DSOFLAGS="$X_LIBS $DSOFLAGS"
- 	cat >>confdefs.h <<\_ACEOF
- #define USE_X11 1
+ 	$as_echo "#define USE_X11 1" >>confdefs.h
+ 

Modified: head/x11-toolkits/fltk/pkg-plist
==============================================================================
--- head/x11-toolkits/fltk/pkg-plist	Mon Feb  9 02:26:32 2015	(r378706)
+++ head/x11-toolkits/fltk/pkg-plist	Mon Feb  9 02:28:38 2015	(r378707)
@@ -17,6 +17,7 @@ include/FL/Fl_Check_Button.H
 include/FL/Fl_Choice.H
 include/FL/Fl_Clock.H
 include/FL/Fl_Color_Chooser.H
+include/FL/Fl_Copy_Surface.H
 include/FL/Fl_Counter.H
 include/FL/Fl_Device.H
 include/FL/Fl_Dial.H
@@ -43,6 +44,7 @@ include/FL/Fl_Hor_Nice_Slider.H
 include/FL/Fl_Hor_Slider.H
 include/FL/Fl_Hor_Value_Slider.H
 include/FL/Fl_Image.H
+include/FL/Fl_Image_Surface.H
 include/FL/Fl_Input.H
 include/FL/Fl_Input_.H
 include/FL/Fl_Input_Choice.H
@@ -121,7 +123,6 @@ include/FL/Fl_Window.H
 include/FL/Fl_Wizard.H
 include/FL/Fl_XBM_Image.H
 include/FL/Fl_XPM_Image.H
-include/FL/Xutf8.h
 include/FL/dirent.h
 include/FL/filename.H
 include/FL/fl_ask.H