[Midnightbsd-cvs] mports [19314] fltk 1.3.3

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Jun 6 10:52:20 EDT 2015 

Revision: 19314
          http://svnweb.midnightbsd.org/mports/?rev=19314
Author:   laffer1
Date:     2015-06-06 10:52:20 -0400 (Sat, 06 Jun 2015)
Log Message:
-----------
fltk 1.3.3

Modified Paths:
--------------
    trunk/x11-toolkits/fltk/Makefile
    trunk/x11-toolkits/fltk/distinfo
    trunk/x11-toolkits/fltk/files/patch-configure
    trunk/x11-toolkits/fltk/files/patch-documentation_Makefile
    trunk/x11-toolkits/fltk/pkg-descr
    trunk/x11-toolkits/fltk/pkg-plist

Removed Paths:
-------------
    trunk/x11-toolkits/fltk/files/patch-src_Fl_x.cxx

Property Changed:
----------------
    trunk/x11-toolkits/fltk/files/patch-FL_Fl_Check_Browser.H
    trunk/x11-toolkits/fltk/files/patch-configure
    trunk/x11-toolkits/fltk/files/patch-documentation_Makefile
    trunk/x11-toolkits/fltk/files/patch-fltk-config.in
    trunk/x11-toolkits/fltk/files/patch-src_Makefile
    trunk/x11-toolkits/fltk/pkg-descr

Modified: trunk/x11-toolkits/fltk/Makefile
===================================================================
--- trunk/x11-toolkits/fltk/Makefile	2015-06-06 14:49:31 UTC (rev 19313)
+++ trunk/x11-toolkits/fltk/Makefile	2015-06-06 14:52:20 UTC (rev 19314)
@@ -1,47 +1,49 @@
 # $MidnightBSD$
 
 PORTNAME=	fltk
-PORTVERSION=	1.3.2
+PORTVERSION=	1.3.3
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_EASYSW}
-MASTER_SITE_SUBDIR=	fltk/${PORTVERSION}
+MASTER_SITES=	http://fltk.org/pub/${PORTNAME}/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Cross-platform C++ graphical user interface toolkit
+
 LICENSE=	lgpl
 
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
-		jpeg:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg
 
-USE_LDCONFIG=	yes
+USES=		pkgconfig
 USE_XORG=	xft
 USE_GL=		glu
-USE_PKGCONFIG=	build
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--enable-threads \
-		--enable-shared \
-		--enable-xft
+CONFIGURE_ARGS=	--enable-shared
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${WRKSRC}/src -L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+PORTEXAMPLES=	*
 
-PORTDOCS=	*
+OPTIONS_DEFINE=	EXAMPLES
 
-MAN1=	fltk-config.1 fluid.1
-MAN3=	fltk.3
-
-post-patch:
+post-patch: .SILENT
 	prefix="${PREFIX}" ; plength=$$(($${#prefix}+10)) ; \
 	${REINPLACE_CMD} -e "\|/etc/fltk|{s||${PREFIX}&|;s|10|$${plength}|;}" \
-	${WRKSRC}/src/Fl_Preferences.cxx
+		${WRKSRC}/src/Fl_Preferences.cxx
+	${REINPLACE_CMD} -e 's,$$(docdir)/examples,${EXAMPLESDIR},' \
+		${WRKSRC}/test/Makefile
+	${REINPLACE_CMD} -e '/^INSTALL_BIN/s,-m,${STRIP} &, ; \
+		s,^\.SILENT,#&,' ${WRKSRC}/makeinclude.in
+	${REINPLACE_CMD} -E \
+		's,(.*)LDFLAGS(.*)LINKSHARED(.*),\1LINKSHARED\2LDFLAGS\3,' \
+			${WRKSRC}/fluid/Makefile
+	${REINPLACE_CMD} -e '/Fl_XFont_On_Demand/s,class,& FL_EXPORT,' \
+		${WRKSRC}/FL/x.H
+	${REINPLACE_CMD} -e 's,result = 0;,fl_open_display(); &,' \
+		${WRKSRC}/src/Fl_x.cxx
 
-.if !defined(NOPORTDOCS)
-post-install:
-	cd ${WRKSRC}/documentation && ${MAKE} ${FAKE_MAKEARGS} docinstall
-	cd ${WRKSRC}/test && ${MAKE} ${FAKE_MAKEARGS} install
-.endif
-
 .include <bsd.port.mk>

Modified: trunk/x11-toolkits/fltk/distinfo
===================================================================
--- trunk/x11-toolkits/fltk/distinfo	2015-06-06 14:49:31 UTC (rev 19313)
+++ trunk/x11-toolkits/fltk/distinfo	2015-06-06 14:52:20 UTC (rev 19314)
@@ -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

Index: trunk/x11-toolkits/fltk/files/patch-FL_Fl_Check_Browser.H
===================================================================
--- trunk/x11-toolkits/fltk/files/patch-FL_Fl_Check_Browser.H	2015-06-06 14:49:31 UTC (rev 19313)
+++ trunk/x11-toolkits/fltk/files/patch-FL_Fl_Check_Browser.H	2015-06-06 14:52:20 UTC (rev 19314)

Property changes on: trunk/x11-toolkits/fltk/files/patch-FL_Fl_Check_Browser.H
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/x11-toolkits/fltk/files/patch-configure
===================================================================
--- trunk/x11-toolkits/fltk/files/patch-configure	2015-06-06 14:49:31 UTC (rev 19313)
+++ trunk/x11-toolkits/fltk/files/patch-configure	2015-06-06 14:52:20 UTC (rev 19314)
@@ -1,6 +1,6 @@
 --- 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"
@@ -7,5 +7,23 @@
 -	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
+ 
+@@ -8137,17 +8137,10 @@
+ 	#       Don't use -fforce-mem, -fforce-addr, or -fcaller-saves.
+ 	#       They all seem to make either no difference or enlarge
+ 	#       the code by a few hundred bytes.
+-        #
+-	#       "-Os" seems to be the best compromise between speed and
+-	#       code size.  "-O3" and higher seem to make no effective
+-	#       difference in the speed of the code, but does bloat the
+-	#       library 10+%.
+ 	#
+ 
+         if test "x$with_optim" != x; then
+ 	    OPTIM="$with_optim $OPTIM"
+-	else
+-            OPTIM="-Os $OPTIM"
+ 	fi
+     fi
+ 


Property changes on: trunk/x11-toolkits/fltk/files/patch-configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/x11-toolkits/fltk/files/patch-documentation_Makefile
===================================================================
--- trunk/x11-toolkits/fltk/files/patch-documentation_Makefile	2015-06-06 14:49:31 UTC (rev 19313)
+++ trunk/x11-toolkits/fltk/files/patch-documentation_Makefile	2015-06-06 14:52:20 UTC (rev 19314)
@@ -1,19 +1,17 @@
 --- documentation/Makefile.orig	2011-08-27 01:33:42.000000000 +0000
 +++ documentation/Makefile	2011-08-27 01:39:59.000000000 +0000
-@@ -80,6 +80,7 @@
- depend:
+@@ -73,7 +73,7 @@
  
  install: $(MANPAGES)
-+docinstall:
  	echo "Installing documentation files in $(DESTDIR)$(docdir) ..."
- 	-$(INSTALL_DIR) $(DESTDIR)$(docdir)
+-	-$(INSTALL_DIR) $(DESTDIR)$(docdir)
++#	-$(INSTALL_DIR) $(DESTDIR)$(docdir)
  	if test -f html/index.html ; then \
-@@ -91,12 +92,9 @@
- 	  echo "Installing fltk.pdf in $(DESTDIR)$(docdir) ..."; \
+ 	  for file in html/* ; do \
+ 		$(INSTALL_DATA) $$file $(DESTDIR)$(docdir); \
+@@ -84,11 +84,6 @@
  	  $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \
  	fi
-+
-+install: $(MANPAGES)
  	echo "Installing man pages in $(DESTDIR)$(mandir) ..."
 -	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1
 -	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1


Property changes on: trunk/x11-toolkits/fltk/files/patch-documentation_Makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/x11-toolkits/fltk/files/patch-fltk-config.in
===================================================================
--- trunk/x11-toolkits/fltk/files/patch-fltk-config.in	2015-06-06 14:49:31 UTC (rev 19313)
+++ trunk/x11-toolkits/fltk/files/patch-fltk-config.in	2015-06-06 14:52:20 UTC (rev 19314)

Property changes on: trunk/x11-toolkits/fltk/files/patch-fltk-config.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/x11-toolkits/fltk/files/patch-src_Fl_x.cxx
===================================================================
--- trunk/x11-toolkits/fltk/files/patch-src_Fl_x.cxx	2015-06-06 14:49:31 UTC (rev 19313)
+++ trunk/x11-toolkits/fltk/files/patch-src_Fl_x.cxx	2015-06-06 14:52:20 UTC (rev 19314)
@@ -1,30 +0,0 @@
-Index: src/Fl_x.cxx
-===================================================================
---- src/Fl_x.cxx	(revision 9749)
-+++ src/Fl_x.cxx	(working copy)
-@@ -1873,7 +1873,7 @@
-   // since we do not want save_under, do not want to turn off the
-   // border, and cannot grab without an existing window. Besides, 
-   // there is no clear_override(). 
--  if (win->flags() & Fl_Widget::FULLSCREEN && !Fl_X::ewmh_supported()) {
-+  if (win->fullscreen_active() && !Fl_X::ewmh_supported()) {
-     attr.override_redirect = 1;
-     mask |= CWOverrideRedirect;
-     Fl::screen_xywh(X, Y, W, H, X, Y, W, H);
-@@ -1940,7 +1940,7 @@
-     }
- 
-     // If asked for, create fullscreen
--    if (win->flags() & Fl_Widget::FULLSCREEN && Fl_X::ewmh_supported()) {
-+    if (win->fullscreen_active() && Fl_X::ewmh_supported()) {
-       XChangeProperty (fl_display, xp->xid, fl_NET_WM_STATE, XA_ATOM, 32,
-                        PropModeAppend, (unsigned char*) &fl_NET_WM_STATE_FULLSCREEN, 1);
-     }
-@@ -1984,7 +1984,7 @@
-   }
- 
-   // non-EWMH fullscreen case, need grab
--  if (win->flags() & Fl_Widget::FULLSCREEN && !Fl_X::ewmh_supported()) {
-+  if (win->fullscreen_active() && !Fl_X::ewmh_supported()) {
-     XGrabKeyboard(fl_display, xp->xid, 1, GrabModeAsync, GrabModeAsync, fl_event_time);
-   }

Index: trunk/x11-toolkits/fltk/files/patch-src_Makefile
===================================================================
--- trunk/x11-toolkits/fltk/files/patch-src_Makefile	2015-06-06 14:49:31 UTC (rev 19313)
+++ trunk/x11-toolkits/fltk/files/patch-src_Makefile	2015-06-06 14:52:20 UTC (rev 19314)

Property changes on: trunk/x11-toolkits/fltk/files/patch-src_Makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/x11-toolkits/fltk/pkg-descr
===================================================================
--- trunk/x11-toolkits/fltk/pkg-descr	2015-06-06 14:49:31 UTC (rev 19313)
+++ trunk/x11-toolkits/fltk/pkg-descr	2015-06-06 14:52:20 UTC (rev 19314)
@@ -1,6 +1,11 @@
 The Fast Light ToolKit ("FLTK", pronounced "fulltick") is a LGPL'd C++
-graphical user interface for X.
+graphical user interface for X11.
+
 FLTK provides modern GUI functionality without the bloat and supports
 3D graphics via OpenGL and its built-in GLUT emulation.
 
+FLTK is designed to be small and modular enough to be statically linked,
+but works fine as a shared library.  FLTK also includes an excellent UI
+builder called FLUID that can be used to create applications in minutes.
+
 WWW: http://www.fltk.org/


Property changes on: trunk/x11-toolkits/fltk/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/x11-toolkits/fltk/pkg-plist
===================================================================
--- trunk/x11-toolkits/fltk/pkg-plist	2015-06-06 14:49:31 UTC (rev 19313)
+++ trunk/x11-toolkits/fltk/pkg-plist	2015-06-06 14:52:20 UTC (rev 19314)
@@ -17,6 +17,7 @@
 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_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_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
@@ -158,4 +159,6 @@
 lib/libfltk_images.so
 lib/libfltk_images.so.1
 lib/libfltk_images.so.1.3
- at dirrm include/FL
+man/man1/fltk-config.1.gz
+man/man1/fluid.1.gz
+man/man3/fltk.3.gz

More information about the Midnightbsd-cvs mailing list