svn commit: r447379 - in head/x11-toolkits/fltk: . files
Alexey Dokuchaev
danfe at FreeBSD.org
Fri Aug 4 20:48:26 UTC 2017
Author: danfe
Date: Fri Aug 4 20:48:24 2017
New Revision: 447379
URL: https://svnweb.freebsd.org/changeset/ports/447379
Log:
- Update `x11-toolkits/fltk' to version 1.3.4 (version 1.3.4-1 is available,
but the only difference is fixes for Windows IDE solutions Visual C 2008
and Visual C 2010, so prefer 1.3.4 to avoid dealing with the DISTVERSION)
- Move out .so.1-suffixed symlink creation to `post-install' target rather
than patching `src/Makefile' since the patch tends to get modified with
each update; and drop no longer needed patches that were merged upstream
- Define LICENSE_FILE as it is not just a standard boilerplate
PR: 220649 (modified)
Submitted by: sunpoet
Deleted:
head/x11-toolkits/fltk/files/patch-src_Fl__Tree__Item.cxx
head/x11-toolkits/fltk/files/patch-src_Makefile
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 Fri Aug 4 20:35:33 2017 (r447378)
+++ head/x11-toolkits/fltk/Makefile Fri Aug 4 20:48:24 2017 (r447379)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= fltk
-PORTVERSION= 1.3.3
-PORTREVISION= 5
+PORTVERSION= 1.3.4
CATEGORIES= x11-toolkits
MASTER_SITES= http://fltk.org/pub/${PORTNAME}/${PORTVERSION}/
DISTNAME= ${PORTNAME}-${PORTVERSION}-source
@@ -12,6 +11,7 @@ MAINTAINER= danfe at FreeBSD.org
COMMENT= Cross-platform C++ graphical user interface toolkit
LICENSE= LGPL20
+LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpng.so:graphics/png
@@ -39,9 +39,11 @@ post-patch: .SILENT
${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
+
+post-install:
+.for x in fltk fltk_forms fltk_gl fltk_images
+ ${LN} -sf lib${x}.so.${PORTVERSION:R} \
+ ${STAGEDIR}${PREFIX}/lib/lib${x}.so.1
+.endfor
.include <bsd.port.mk>
Modified: head/x11-toolkits/fltk/distinfo
==============================================================================
--- head/x11-toolkits/fltk/distinfo Fri Aug 4 20:35:33 2017 (r447378)
+++ head/x11-toolkits/fltk/distinfo Fri Aug 4 20:48:24 2017 (r447379)
@@ -1,2 +1,3 @@
-SHA256 (fltk-1.3.3-source.tar.gz) = f8398d98d7221d40e77bc7b19e761adaf2f1ef8bb0c30eceb7beb4f2273d0d97
-SIZE (fltk-1.3.3-source.tar.gz) = 4986376
+TIMESTAMP = 1478880621
+SHA256 (fltk-1.3.4-source.tar.gz) = c8ab01c4e860d53e11d40dc28f98d2fe9c85aaf6dbb5af50fd6e66afec3dc58f
+SIZE (fltk-1.3.4-source.tar.gz) = 5284217
Modified: head/x11-toolkits/fltk/files/patch-configure
==============================================================================
--- head/x11-toolkits/fltk/files/patch-configure Fri Aug 4 20:35:33 2017 (r447378)
+++ head/x11-toolkits/fltk/files/patch-configure Fri Aug 4 20:48:24 2017 (r447379)
@@ -1,6 +1,6 @@
---- configure.orig 2011-08-31 09:14:41.000000000 +0200
-+++ configure 2011-08-31 09:14:54.000000000 +0200
-@@ -7362,7 +7362,7 @@
+--- configure.orig 2016-11-11 16:04:30 UTC
++++ configure
+@@ -7408,7 +7408,7 @@ $as_echo "$as_me: WARNING: Ignoring libraries \"$X_PRE
LIBS="$LIBS -lX11 $X_EXTRA_LIBS"
CFLAGS="$CFLAGS $X_CFLAGS"
CXXFLAGS="$CXXFLAGS $X_CFLAGS"
@@ -9,21 +9,20 @@
DSOFLAGS="$X_LIBS $DSOFLAGS"
$as_echo "#define USE_X11 1" >>confdefs.h
-@@ -8137,17 +8137,10 @@
- # Don't use -fforce-mem, -fforce-addr, or -fcaller-saves.
+@@ -8276,16 +8276,9 @@ if test -n "$GCC"; then
# 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
+ if test "x$with_optim" != x; then
OPTIM="$with_optim $OPTIM"
- else
-- OPTIM="-Os $OPTIM"
+- OPTIM="-Os $OPTIM"
fi
fi
Modified: head/x11-toolkits/fltk/pkg-plist
==============================================================================
--- head/x11-toolkits/fltk/pkg-plist Fri Aug 4 20:35:33 2017 (r447378)
+++ head/x11-toolkits/fltk/pkg-plist Fri Aug 4 20:48:24 2017 (r447379)
@@ -123,6 +123,7 @@ include/FL/Fl_Window.H
include/FL/Fl_Wizard.H
include/FL/Fl_XBM_Image.H
include/FL/Fl_XPM_Image.H
+include/FL/abi-version.h
include/FL/dirent.h
include/FL/filename.H
include/FL/fl_ask.H
More information about the svn-ports-head
mailing list