fltk2: Repair package

[Michael Baeuerle <micha%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Fri Jul 17 14:11:20 2020 +0200
Changeset:	318012d8cac565c005863c5879976210b0913756

Modified Files:
	fltk2/Makefile
	fltk2/buildlink3.mk
	fltk2/distinfo
Removed Files:
	fltk2/TODO

Log Message:
fltk2: Repair package

- Distfile was moved/renamed
- bl3 file modified
  Now points to wip instead of x11
  Syntax for "empty()" changed as suggested by pkglint
- TODO file removed

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

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

diffstat:
 fltk2/Makefile      |  6 +++---
 fltk2/TODO          | 25 -------------------------
 fltk2/buildlink3.mk |  4 ++--
 fltk2/distinfo      |  8 ++++----
 4 files changed, 9 insertions(+), 34 deletions(-)

diffs:
diff --git a/fltk2/Makefile b/fltk2/Makefile
index 4436ee08e5..9ac7b984a1 100644
--- a/fltk2/Makefile
+++ b/fltk2/Makefile
@@ -1,12 +1,12 @@
 # $NetBSD: Makefile$
 
-DISTNAME=	fltk-legacy-2.0
+DISTNAME=	branch-2.0
 # Last distribution snapshot was 6129. New version should be higher.
 # FLTK library itself defines version 2.1.0 in headerfile (use that).
 PKGNAME=	fltk2-2.1git
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_GITHUB:=fltk/}
-GITHUB_TAG=	branch-2.0
+MASTER_SITES=	${MASTER_SITE_GITHUB:=fltk/fltk-legacy/archive/}
+DIST_SUBDIR=	${PKGNAME_NOREV}
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	micha%NetBSD.org@localhost
diff --git a/fltk2/TODO b/fltk2/TODO
deleted file mode 100644
index 331a63f4af..0000000000
--- a/fltk2/TODO
+++ /dev/null
@@ -1,25 +0,0 @@
-[X] Include MesaLib conditionally (opengl option)
-[X] Declare License in Makefile
-[X] Remove MASTER_SITES no longer working
-    Snapshots for FLTK 2.0 branch are no longer provided.
-    FLTK homepage recommends to use Git.
-    => Use Git
-[X] FL_MINOR_VERSION is defined to 1
-    => Use Version 2.1 for package
-    => Patch fltk2-config script to report version 2.1.0
-[X] Generate (no longer shipped) configure script via autoconf
-    => Add autoconf to USE_TOOLS
-[X] Rework patches
-    - patch-ac removed
-      Git release has no configure script (we generate it via autoconf)
-      => patch-ab is therefore sufficient.
-    - patch-ad reduced
-    - patch-ae removed (now uses DESTDIR out-of-the-box)
-    - patch-ag reduced (setjmp() part already merged)
-    - patch-ah reduced (the HP-UX and DragonFly mappings are now catched by
-      the POSIX check)
-    => Rebuild patches and add comments
-[X] Update PLIST
-    => Add "include/fltk/WidgetAssociation.h"
-[X] Remove test target
-    => There is no test rule in top level Makefile
diff --git a/fltk2/buildlink3.mk b/fltk2/buildlink3.mk
index ef7877600e..e1ce693bf8 100644
--- a/fltk2/buildlink3.mk
+++ b/fltk2/buildlink3.mk
@@ -8,12 +8,12 @@ FLTK2_BUILDLINK3_MK:=
 BUILDLINK_DEPMETHOD.fltk2?=	build
 BUILDLINK_API_DEPENDS.fltk2+=	fltk2>=2.1git
 BUILDLINK_ABI_DEPENDS.fltk2+=	fltk2>=2.1git
-BUILDLINK_PKGSRCDIR.fltk2?=	../../x11/fltk2
+BUILDLINK_PKGSRCDIR.fltk2?=	../../wip/fltk2
 
 pkgbase := fltk2
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.fltk2:Mopengl)
+.if ${PKG_BUILD_OPTIONS.fltk2:Mopengl}
 .  include "../../graphics/MesaLib/buildlink3.mk"
 .  include "../../graphics/glu/buildlink3.mk"
 .endif
diff --git a/fltk2/distinfo b/fltk2/distinfo
index 76ebf2535d..6cb5b6aabd 100644
--- a/fltk2/distinfo
+++ b/fltk2/distinfo
@@ -1,9 +1,9 @@
 $NetBSD$
 
-SHA1 (fltk-legacy-2.0.zip) = 04c517a89309e72fc229a43cdfc3c5d591c46148
-RMD160 (fltk-legacy-2.0.zip) = 1f38753d10c58433d9d8a33c62dd144d13445dce
-SHA512 (fltk-legacy-2.0.zip) = e8e1c05d95b8817b5ce716558422f79bc8232c03f7d103be4c9b743d5c2890fc9e283b23d761e239a3e0adc8041d67d6d11a17166eecce1743a310537784875e
-Size (fltk-legacy-2.0.zip) = 3852183 bytes
+SHA1 (fltk2-2.1git/branch-2.0.zip) = 04c517a89309e72fc229a43cdfc3c5d591c46148
+RMD160 (fltk2-2.1git/branch-2.0.zip) = 1f38753d10c58433d9d8a33c62dd144d13445dce
+SHA512 (fltk2-2.1git/branch-2.0.zip) = e8e1c05d95b8817b5ce716558422f79bc8232c03f7d103be4c9b743d5c2890fc9e283b23d761e239a3e0adc8041d67d6d11a17166eecce1743a310537784875e
+Size (fltk2-2.1git/branch-2.0.zip) = 3852183 bytes
 SHA1 (patch-configure.in) = e480f0b540bd28354bf4865b121fdfa0b3ec94d3
 SHA1 (patch-fltk2-config.in) = 51619aaec73e3800ce7668eed0c067a610199f21
 SHA1 (patch-fltk_string.h) = f9adba4ec0fc1b5fcf70c4e9ea4b6eeea1d0c5ea