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

[Pietro Cerutti]

Author: gahr
Date: Tue Oct 15 08:24:14 2013
New Revision: 330371
URL: http://svnweb.freebsd.org/changeset/ports/330371

Log:
  - Fix build in C++11 mode [1]
  - Convert to new LIB_DEPENDS format
  - Convert to OPTIONSng (DOCS)
  - STAGE-clean
  
  PR:		182949 [1]
  Submitted by:	dt71 at gmx.com [1]

Added:
  head/x11-toolkits/fltk/files/patch-fluid_Fl_Type.h   (contents, props changed)
Modified:
  head/x11-toolkits/fltk/Makefile
  head/x11-toolkits/fltk/pkg-plist

Modified: head/x11-toolkits/fltk/Makefile
==============================================================================
--- head/x11-toolkits/fltk/Makefile	Tue Oct 15 07:51:18 2013	(r330370)
+++ head/x11-toolkits/fltk/Makefile	Tue Oct 15 08:24:14 2013	(r330371)
@@ -12,8 +12,10 @@ COMMENT=	Cross-platform C++ graphical us
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
-		jpeg.11:${PORTSDIR}/graphics/jpeg
+OPTIONS_DEFINE=	DOCS
+
+LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg
 
 USE_LDCONFIG=	yes
 USE_XORG=	xft
@@ -31,16 +33,14 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVER
 
 PORTDOCS=	*
 
-MAN1=	fltk-config.1 fluid.1
-MAN3=	fltk.3
+.include <bsd.port.options.mk>
 
-NO_STAGE=	yes
 post-patch:
 	prefix="${PREFIX}" ; plength=$$(($${#prefix}+10)) ; \
 	${REINPLACE_CMD} -e "\|/etc/fltk|{s||${PREFIX}&|;s|10|$${plength}|;}" \
 	${WRKSRC}/src/Fl_Preferences.cxx
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
 	cd ${WRKSRC}/documentation && ${MAKE} docinstall
 	cd ${WRKSRC}/test && ${MAKE} install

Added: head/x11-toolkits/fltk/files/patch-fluid_Fl_Type.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-toolkits/fltk/files/patch-fluid_Fl_Type.h	Tue Oct 15 08:24:14 2013	(r330371)
@@ -0,0 +1,16 @@
+--- fluid/Fl_Type.h.orig	2013-10-15 09:58:05.000000000 +0200
++++ fluid/Fl_Type.h	2013-10-15 10:01:26.000000000 +0200
+@@ -33,10 +33,12 @@
+ 
+ void set_modflag(int mf);
+ 
++Fl_Widget *make_type_browser(int,int,int,int,const char *l=0);
++
+ class Fl_Type {
+ 
+   friend class Widget_Browser;
+-  friend Fl_Widget *make_type_browser(int,int,int,int,const char *l=0);
++  friend Fl_Widget *make_type_browser(int,int,int,int,const char *l);
+   friend class Fl_Window_Type;
+   virtual void setlabel(const char *); // virtual part of label(char*)
+ 

Modified: head/x11-toolkits/fltk/pkg-plist
==============================================================================
--- head/x11-toolkits/fltk/pkg-plist	Tue Oct 15 07:51:18 2013	(r330370)
+++ head/x11-toolkits/fltk/pkg-plist	Tue Oct 15 08:24:14 2013	(r330371)
@@ -158,4 +158,7 @@ lib/libfltk_images.a
 lib/libfltk_images.so
 lib/libfltk_images.so.1
 lib/libfltk_images.so.1.3
+man/man1/fltk-config.1.gz
+man/man1/fluid.1.gz
+man/man3/fltk.3.gz
 @dirrm include/FL