pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

fltk-devel: Rebase to git commit abc8f4158f2171884e055a2ca4b234655220c26e

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Wed Apr 10 09:51:44 2019 +0200
Changeset:	a3a0a19476245a4ba95c3bdf4e618001b5604bef

Modified Files:
	fltk14-devel/Makefile
	fltk14-devel/distinfo
	fltk14-devel/patches/patch-Makefile
	fltk14-devel/patches/patch-configure
	fltk14-devel/patches/patch-documentation_Makefile
	fltk14-devel/patches/patch-fluid_Makefile
	fltk14-devel/patches/patch-makeinclude.in
	fltk14-devel/patches/patch-src_Makefile
	fltk14-devel/patches/patch-test_Makefile

Log Message:
fltk-devel: Rebase to git commit abc8f4158f2171884e055a2ca4b234655220c26e

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a3a0a19476245a4ba95c3bdf4e618001b5604bef

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 fltk14-devel/Makefile                             | 18 ++++++------
 fltk14-devel/distinfo                             | 12 ++++----
 fltk14-devel/patches/patch-Makefile               |  2 +-
 fltk14-devel/patches/patch-configure              |  2 +-
 fltk14-devel/patches/patch-documentation_Makefile |  2 +-
 fltk14-devel/patches/patch-fluid_Makefile         | 17 ++++++++---
 fltk14-devel/patches/patch-makeinclude.in         |  2 +-
 fltk14-devel/patches/patch-src_Makefile           |  2 +-
 fltk14-devel/patches/patch-test_Makefile          | 35 +++++++++++++----------
 9 files changed, 53 insertions(+), 39 deletions(-)

diffs:
diff --git a/fltk14-devel/Makefile b/fltk14-devel/Makefile
index 10b0775d7f..c7ee25ca99 100644
--- a/fltk14-devel/Makefile
+++ b/fltk14-devel/Makefile
@@ -1,13 +1,10 @@
 # $NetBSD$
 
-# pkglint complains if PKGNAME is listed first
-FLTK_VERSION=	fltk-1.4.x
-
-DISTNAME=	${FLTK_VERSION}-r13065
-PKGNAME=	${FLTK_VERSION}
+DISTNAME=	fltk-1.4.x
 CATEGORIES=	x11
-MASTER_SITES=	http://fltk.org/pub/fltk/snapshots/
-EXTRACT_SUFX=	.tar.bz2
+GITHUB_TAG=	abc8f4158f2171884e055a2ca4b234655220c26e
+MASTER_SITES=	https://github.com/fltk/
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.fltk.org/
@@ -16,7 +13,7 @@ LICENSE=	gnu-lgpl-v2
 
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake nroff
+USE_TOOLS+=		autoconf gmake nroff
 TEST_TARGET=		test
 
 # ------------------------------------------------------
@@ -42,7 +39,7 @@ CONFIGURE_ARGS+=	--disable-cairo
 .  include "../../graphics/Mesa/buildlink3.mk"
 .endif
 CONFIGURE_ARGS+=	--enable-gl
-PLIST.opengl=	yes
+PLIST.opengl=		yes
 .else
 CONFIGURE_ARGS+=	--disable-gl
 .endif
@@ -72,6 +69,9 @@ CONFIGURE_ARGS+=	--enable-shared
 # Use pkgsrc versions, not package's bundled versions.
 CONFIGURE_ARGS+=	--disable-localjpeg --disable-localzlib --disable-localpng
 
+post-extract:
+	cd ${WRKSRC} && autoconf
+
 pre-configure:
 	cd ${WRKSRC} && ${GMAKE} ${MAKE_FLAGS} clean
 
diff --git a/fltk14-devel/distinfo b/fltk14-devel/distinfo
index b2876980db..bd3a16eabc 100644
--- a/fltk14-devel/distinfo
+++ b/fltk14-devel/distinfo
@@ -1,13 +1,13 @@
 $NetBSD: distinfo,v 1.10 2018/07/13 04:24:39 dbj Exp $
 
-SHA1 (fltk-1.4.x-r13065.tar.bz2) = be3e0a647797b6f8987631e9f6f61b648cec6abc
-RMD160 (fltk-1.4.x-r13065.tar.bz2) = b1fc24d9f8869e116200bd794e6d2f01261059f3
-SHA512 (fltk-1.4.x-r13065.tar.bz2) = 2e56237708119c0803a8d0849d7064d060e59e7e1d8964413e0b361bb8e50c449bf22d7812b4eabb8ca50aad089dc8fd8eea76418531676259c79e47749fb4d2
-Size (fltk-1.4.x-r13065.tar.bz2) = 5405807 bytes
+SHA1 (fltk-1.4.x-abc8f4158f2171884e055a2ca4b234655220c26e.zip) = 5957d8338850e83bb08d4ef3141a52680d3a67e4
+RMD160 (fltk-1.4.x-abc8f4158f2171884e055a2ca4b234655220c26e.zip) = 38badf8fe23800c00abd681b3a89d93fd97e3572
+SHA512 (fltk-1.4.x-abc8f4158f2171884e055a2ca4b234655220c26e.zip) = 900f828e442135e6f9d87b1eea269c9995054bb67b384f2ec477ed7cefece1572967011461b11016b246d0d9d5a97456f1c3a9a1beede9084cc76af884e078b7
+Size (fltk-1.4.x-abc8f4158f2171884e055a2ca4b234655220c26e.zip) = 6645355 bytes
 SHA1 (patch-Makefile) = 7db024b114282797a0b1b20df70f73a487fec0e2
 SHA1 (patch-configure) = 7c0f973352802dedbc38564b18950c10d1829d12
 SHA1 (patch-documentation_Makefile) = ce2872dae289672a8bc603e1c10225df8d06f126
-SHA1 (patch-fluid_Makefile) = 5b566f80f9b7dc9212edabc71b11c50f66c156d7
+SHA1 (patch-fluid_Makefile) = 8a727140bbcea9ca3bd8ce16ec3cb9b37cef3bb4
 SHA1 (patch-makeinclude.in) = b79a32c2d7571f79078f8ec6036a0e41604f6fac
 SHA1 (patch-src_Makefile) = c36f590280da5604ebf949142074db02d0cc327e
-SHA1 (patch-test_Makefile) = d3d67f4053dc6f59cad0988358b3cd5dc38e89e8
+SHA1 (patch-test_Makefile) = 4d1ca36ee11edc923c0b2168c4cf83fb4985d368
diff --git a/fltk14-devel/patches/patch-Makefile b/fltk14-devel/patches/patch-Makefile
index f2e426316a..b8fd18b3af 100644
--- a/fltk14-devel/patches/patch-Makefile
+++ b/fltk14-devel/patches/patch-Makefile
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2018/07/13 04:24:39 dbj Exp $
+$NetBSD$
 
 Remove tests from directory list.
 Added makeinclude as dependency for test target.
diff --git a/fltk14-devel/patches/patch-configure b/fltk14-devel/patches/patch-configure
index ae3006c7b7..4b3e595c6e 100644
--- a/fltk14-devel/patches/patch-configure
+++ b/fltk14-devel/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2018/07/13 04:24:39 dbj Exp $
+$NetBSD$
 
 Modify configure script for "--enable-libtool".
 
diff --git a/fltk14-devel/patches/patch-documentation_Makefile b/fltk14-devel/patches/patch-documentation_Makefile
index ed3e817dec..6276e40f3a 100644
--- a/fltk14-devel/patches/patch-documentation_Makefile
+++ b/fltk14-devel/patches/patch-documentation_Makefile
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2018/07/13 04:24:39 dbj Exp $
+$NetBSD$
 
 Do not install manpages to cat1/cat3 directories.
 
diff --git a/fltk14-devel/patches/patch-fluid_Makefile b/fltk14-devel/patches/patch-fluid_Makefile
index f66e9288e1..96ea54f264 100644
--- a/fltk14-devel/patches/patch-fluid_Makefile
+++ b/fltk14-devel/patches/patch-fluid_Makefile
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2018/07/13 04:24:39 dbj Exp $
+$NetBSD$
 
 Use libtool to link and install fluid.
 
---- fluid/Makefile.orig	2016-07-17 19:51:54.000000000 +0000
+--- fluid/Makefile.orig	2019-04-07 09:24:20.000000000 +0000
 +++ fluid/Makefile
 @@ -57,7 +57,7 @@ all:	$(FLUID) fluid$(EXEEXT)
  fluid$(EXEEXT):		$(OBJECTS) $(LIBNAME) $(FLLIBNAME) \
@@ -10,10 +10,19 @@ Use libtool to link and install fluid.
  	echo Linking $@...
 -	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
 +	${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
+ 	$(OSX_ONLY) $(RM) -r -f fluid.app/Contents/MacOS
+ 	$(OSX_ONLY) mkdir fluid.app/Contents/MacOS
  	$(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
- 
+@@ -65,7 +65,7 @@ fluid$(EXEEXT):		$(OBJECTS) $(LIBNAME) $
  fluid-shared$(EXEEXT):	$(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
-@@ -79,7 +79,7 @@ include makedepend
+ 			../src/$(IMGDSONAME)
+ 	echo Linking $@...
+-	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
++	${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
+ 
+ clean:
+ 	-$(RM) *.o core.* *~ *.bck *.bak
+@@ -85,7 +85,7 @@ include makedepend
  install: all
  	echo "Installing FLUID in $(DESTDIR)$(bindir)..."
  	-$(INSTALL_DIR) $(DESTDIR)$(bindir)
diff --git a/fltk14-devel/patches/patch-makeinclude.in b/fltk14-devel/patches/patch-makeinclude.in
index 77b788af8a..abc2e7fa62 100644
--- a/fltk14-devel/patches/patch-makeinclude.in
+++ b/fltk14-devel/patches/patch-makeinclude.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.3 2018/07/13 04:24:39 dbj Exp $
+$NetBSD$
 
 Use libtool to build and link binaries.
 
diff --git a/fltk14-devel/patches/patch-src_Makefile b/fltk14-devel/patches/patch-src_Makefile
index bf7a1c5e1a..85197a0c87 100644
--- a/fltk14-devel/patches/patch-src_Makefile
+++ b/fltk14-devel/patches/patch-src_Makefile
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.3 2018/07/13 04:24:39 dbj Exp $
+$NetBSD$
 
 Use libtool to link and install binaries.
 
diff --git a/fltk14-devel/patches/patch-test_Makefile b/fltk14-devel/patches/patch-test_Makefile
index 21231d1980..418b30ec9c 100644
--- a/fltk14-devel/patches/patch-test_Makefile
+++ b/fltk14-devel/patches/patch-test_Makefile
@@ -2,23 +2,26 @@ $NetBSD$
 
 Use libtool to link test programs.
 
---- test/Makefile.orig	2017-10-17 00:28:56.000000000 +0000
+--- test/Makefile.orig	2019-04-07 09:24:20.000000000 +0000
 +++ test/Makefile
-@@ -308,19 +308,19 @@ buttons$(EXEEXT): buttons.o
+@@ -333,14 +333,14 @@ buttons$(EXEEXT): buttons.o
  
  blocks$(EXEEXT): blocks.o
  	echo Linking $@...
 -	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) blocks.o -o $@ $(AUDIOLIBS) $(LINKFLTK) $(LDLIBS)
 +	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) blocks.o -o $@ $(AUDIOLIBS) $(LINKFLTK) $(LDLIBS)
+ 	$(OSX_ONLY) $(RM) -f -r blocks.app/Contents/MacOS
+ 	$(OSX_ONLY) mkdir blocks.app/Contents/MacOS
  	$(OSX_ONLY) $(INSTALL_BIN) blocks$(EXEEXT) blocks.app/Contents/MacOS
  
  checkers$(EXEEXT): checkers.o
  	echo Linking $@...
 -	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) checkers.o -o $@ $(LINKFLTK) $(LDLIBS)
 +	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) checkers.o -o $@ $(LINKFLTK) $(LDLIBS)
+ 	$(OSX_ONLY) $(RM) -f -r checkers.app/Contents/MacOS
+ 	$(OSX_ONLY) mkdir checkers.app/Contents/MacOS
  	$(OSX_ONLY) $(INSTALL_BIN) checkers$(EXEEXT) checkers.app/Contents/MacOS
- 
- clock$(EXEEXT): clock.o
+@@ -349,7 +349,7 @@ clock$(EXEEXT): clock.o
  
  colbrowser$(EXEEXT): colbrowser.o
  	echo Linking $@...
@@ -27,7 +30,7 @@ Use libtool to link test programs.
  	$(OSX_ONLY) ../fltk-config --post $@
  	$(OSX_ONLY) mkdir -p colbrowser.app/Contents/Resources
  	$(OSX_ONLY) cp -f rgb.txt colbrowser.app/Contents/Resources/
-@@ -333,21 +333,21 @@ curve$(EXEEXT): curve.o
+@@ -362,21 +362,21 @@ curve$(EXEEXT): curve.o
  
  demo$(EXEEXT): demo.o
  	echo Linking $@...
@@ -52,7 +55,7 @@ Use libtool to link test programs.
  	$(OSX_ONLY) ../fltk-config --post $@
  	$(OSX_ONLY) cp -f editor-Info.plist editor.app/Contents/Info.plist
  
-@@ -356,21 +356,21 @@ fast_slow.cxx:	fast_slow.fl ../fluid/flu
+@@ -385,21 +385,21 @@ fast_slow.cxx:	fast_slow.fl ../fluid/flu
  
  file_chooser$(EXEEXT): file_chooser.o $(IMGLIBNAME)
  	echo Linking $@...
@@ -77,7 +80,7 @@ Use libtool to link test programs.
  	$(OSX_ONLY) ../fltk-config --post $@
  	$(OSX_ONLY) mkdir -p help_dialog.app/Contents/Resources
  	$(OSX_ONLY) cp -f help_dialog.html help_dialog.app/Contents/Resources/
-@@ -390,14 +390,14 @@ input_choice$(EXEEXT): input_choice.o
+@@ -419,14 +419,14 @@ input_choice$(EXEEXT): input_choice.o
  
  keyboard$(EXEEXT): keyboard_ui.o keyboard.o
  	echo Linking $@...
@@ -94,7 +97,7 @@ Use libtool to link test programs.
  	$(OSX_ONLY) ../fltk-config --post $@
  
  line_style$(EXEEXT): line_style.o
-@@ -406,7 +406,7 @@ list_visuals$(EXEEXT): list_visuals.o
+@@ -435,7 +435,7 @@ list_visuals$(EXEEXT): list_visuals.o
  
  mandelbrot$(EXEEXT): mandelbrot_ui.o mandelbrot.o
  	echo Linking $@...
@@ -103,7 +106,7 @@ Use libtool to link test programs.
  	$(OSX_ONLY) ../fltk-config --post $@
  mandelbrot_ui.o:	mandelbrot_ui.h
  mandelbrot_ui.cxx:	mandelbrot_ui.fl ../fluid/fluid$(EXEEXT)
-@@ -419,7 +419,7 @@ minimum$(EXEEXT): minimum.o
+@@ -448,7 +448,7 @@ minimum$(EXEEXT): minimum.o
  
  native-filechooser$(EXEEXT): native-filechooser.o $(IMGLIBNAME)
  	echo Linking $@...
@@ -112,7 +115,7 @@ Use libtool to link test programs.
  	$(OSX_ONLY) ../fltk-config --post $@
  
  navigation$(EXEEXT): navigation.o
-@@ -428,7 +428,7 @@ offscreen$(EXEEXT): offscreen.o
+@@ -457,7 +457,7 @@ offscreen$(EXEEXT): offscreen.o
  
  output$(EXEEXT): output.o $(FLLIBNAME)
  	echo Linking $@...
@@ -121,7 +124,7 @@ Use libtool to link test programs.
  	$(OSX_ONLY) ../fltk-config --post $@
  
  overlay$(EXEEXT): overlay.o
-@@ -439,7 +439,7 @@ pixmap$(EXEEXT): pixmap.o
+@@ -468,7 +468,7 @@ pixmap$(EXEEXT): pixmap.o
  
  pixmap_browser$(EXEEXT): pixmap_browser.o $(IMGLIBNAME)
  	echo Linking $@...
@@ -130,14 +133,16 @@ Use libtool to link test programs.
  	$(OSX_ONLY) ../fltk-config --post $@
  
  preferences$(EXEEXT):	preferences.o
-@@ -463,13 +463,13 @@ subwindow$(EXEEXT): subwindow.o
+@@ -492,7 +492,7 @@ subwindow$(EXEEXT): subwindow.o
  
  sudoku: sudoku.o
  	echo Linking $@...
 -	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) sudoku.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
 +	$(LIBTOOL) --mode=link $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) sudoku.o -o $@ $(AUDIOLIBS) $(LINKFLTKIMG) $(LDLIBS)
+ 	$(OSX_ONLY) $(RM) -r -f sudoku.app/Contents/MacOS
+ 	$(OSX_ONLY) mkdir sudoku.app/Contents/MacOS
  	$(OSX_ONLY) $(INSTALL_BIN) sudoku$(EXEEXT) sudoku.app/Contents/MacOS
- 
+@@ -500,7 +500,7 @@ sudoku: sudoku.o
  sudoku.exe: sudoku.o sudoku.rc
  	echo Linking $@...
  	$(RC) sudoku.rc sudokures.o
@@ -146,7 +151,7 @@ Use libtool to link test programs.
  
  symbols$(EXEEXT): symbols.o
  
-@@ -501,7 +501,7 @@ $(GLALL): $(LIBNAME) $(GLLIBNAME)
+@@ -532,7 +532,7 @@ $(GLALL): $(LIBNAME) $(GLLIBNAME)
  # OpenGL demos...
  CubeView$(EXEEXT): CubeMain.o CubeView.o CubeViewUI.o
  	echo Linking $@...
@@ -155,7 +160,7 @@ Use libtool to link test programs.
  		CubeMain.o CubeView.o CubeViewUI.o \
  		$(LINKFLTKGL) $(LINKFLTK) $(GLDLIBS)
  	$(OSX_ONLY) ../fltk-config --post $@
-@@ -512,37 +512,37 @@ CubeViewUI.cxx:	CubeViewUI.fl ../fluid/f
+@@ -543,37 +543,37 @@ CubeViewUI.cxx:	CubeViewUI.fl ../fluid/f
  
  cube$(EXEEXT): cube.o
  	echo Linking $@...
Home | Main Index | Thread Index | Old Index