summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/CHANGES3
-rw-r--r--x11/fltk/Makefile6
-rw-r--r--x11/fltk/buildlink2.mk6
-rw-r--r--x11/fltk/buildlink3.mk4
-rw-r--r--x11/fltk/distinfo6
5 files changed, 13 insertions, 12 deletions
diff --git a/doc/CHANGES b/doc/CHANGES
index c99bbf45ba6..7a1dace4b23 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5562 2004/04/13 09:33:51 xtraeme Exp $
+$NetBSD: CHANGES,v 1.5563 2004/04/13 09:36:17 xtraeme Exp $
Changes to the packages collection and infrastructure in 2004:
@@ -1936,3 +1936,4 @@ Changes to the packages collection and infrastructure in 2004:
Updated ogmtools to 1.3 [salo 2004-04-12]
Added cvs2svn-0.0.0.916 [seb 2004-04-12]
Updated flwm to 1.0.0nb1 [xtraeme 2004-04-12]
+ Updated fltk to 1.1.5rc1 [xtraeme 2004-04-12]
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index 333a367e0a1..00e36ad89c6 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2004/02/18 10:21:15 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2004/04/13 09:36:17 xtraeme Exp $
#
-DISTNAME= fltk-1.1.4-source
+DISTNAME= fltk-1.1.5rc1-source
PKGNAME= ${DISTNAME:S/-source//}
VERS= ${DISTNAME:S/fltk-//:S/-source//}
CATEGORIES= x11
@@ -22,7 +22,7 @@ USE_BUILDLINK3= yes
USE_LANGUAGES= c c++
USE_GNU_TOOLS+= make
USE_LIBTOOL= yes
-USE_X11BASE= yes
+USE_X11= yes
TEST_TARGET= test
GNU_CONFIGURE= yes
diff --git a/x11/fltk/buildlink2.mk b/x11/fltk/buildlink2.mk
index f6d728d2dbb..ce589650306 100644
--- a/x11/fltk/buildlink2.mk
+++ b/x11/fltk/buildlink2.mk
@@ -1,14 +1,14 @@
-# $NetBSD: buildlink2.mk,v 1.5 2004/02/18 05:07:34 ben Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2004/04/13 09:36:17 xtraeme Exp $
.if !defined(FLTK_BUILDLINK2_MK)
FLTK_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= fltk
-BUILDLINK_DEPENDS.fltk?= fltk>=1.0.9
+BUILDLINK_DEPENDS.fltk?= fltk>=1.1.5rc1
BUILDLINK_PKGSRCDIR.fltk?= ../../x11/fltk
EVAL_PREFIX+= BUILDLINK_PREFIX.fltk=fltk
-BUILDLINK_PREFIX.fltk_DEFAULT= ${X11PREFIX}
+BUILDLINK_PREFIX.fltk_DEFAULT= ${LOCALBASE}
BUILDLINK_FILES.fltk= include/FL/*
BUILDLINK_FILES.fltk+= include/Fl/*
BUILDLINK_FILES.fltk+= lib/libfltk*
diff --git a/x11/fltk/buildlink3.mk b/x11/fltk/buildlink3.mk
index 69a1c331dab..e6e13fdd43f 100644
--- a/x11/fltk/buildlink3.mk
+++ b/x11/fltk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:16 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/04/13 09:36:17 xtraeme Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FLTK_BUILDLINK3_MK:= ${FLTK_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfltk}
BUILDLINK_PACKAGES+= fltk
.if !empty(FLTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fltk+= fltk>=1.0.9
+BUILDLINK_DEPENDS.fltk+= fltk>=1.1.5rc1
BUILDLINK_PKGSRCDIR.fltk?= ../../x11/fltk
.endif # FLTK_BUILDLINK3_MK
diff --git a/x11/fltk/distinfo b/x11/fltk/distinfo
index 2f559e929c0..c3a955f82a5 100644
--- a/x11/fltk/distinfo
+++ b/x11/fltk/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2004/02/18 05:07:34 ben Exp $
+$NetBSD: distinfo,v 1.8 2004/04/13 09:36:17 xtraeme Exp $
-SHA1 (fltk-1.1.4-source.tar.bz2) = e42839662bfbbdb8d61eaa2798c8687a629ddc02
-Size (fltk-1.1.4-source.tar.bz2) = 1305766 bytes
+SHA1 (fltk-1.1.5rc1-source.tar.bz2) = 7b05948314474fe485a29ae49f18d19754608935
+Size (fltk-1.1.5rc1-source.tar.bz2) = 1325042 bytes
SHA1 (patch-aa) = d75bb3c9772cb7b5920d2a32513cdc0f40694d8f
SHA1 (patch-ab) = 04323aa95488755351e67c07273063aac18d465b
SHA1 (patch-ac) = cf4b6038b6b72b11f2d3e67ac6c8c7e7e3407eb3