Stuart Henderson wrote:
> On 2009/09/28 10:55, Benoit Lecocq wrote:
>> Hi,
>>
>> This diff updates fltk2 to the latest release 2.0.x-r6879.
>> Tested on amd64/sparc64.
>>
>> Comments ? OK ?
>>
>> A update of dillo will follow.
>>
>> Cheers,
>> benoit
>>
>>
>
>> -V= 6483
>> +V= 6879
>> DISTNAME = fltk-2.0.x-r${V}
>> -PKGNAME = fltk2-2.0r${V}p0
>> +PKGNAME = fltk2-2.0r${V}
>
> I think this should be PKGNAME=fltk2-2.0.${V}, pkg_* tools have no
> understanding of the 2.0r## format, and at some point we want them to
> avoid "upgrading" to an older version so they'll need to be able to
> make valid comparisons.
>
> Otherwise looks ok but I don't have time to test at the moment.
>
>
OK thanks.
Index: Makefile
===================================================================
RCS file: /cvs/openbsd/ports/x11/fltk2/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile 6 Sep 2009 10:46:25 -0000 1.4
+++ Makefile 28 Sep 2009 13:16:38 -0000
@@ -2,15 +2,17 @@
COMMENT = fast light toolkit
-V= 6483
-DISTNAME = fltk-2.0.x-r${V}
-PKGNAME = fltk2-2.0r${V}p0
+V= r6879
+DISTNAME = fltk-2.0.x-${V}
+PKGNAME = fltk2-2.0.${V}
CATEGORIES = x11
HOMEPAGE = http://www.fltk.org/
MASTER_SITES = http://ftp.easysw.com/pub/fltk/snapshots/ \
http://ftp2.easysw.com/pub/fltk/snapshots/
+MAINTAINER = Benoit Lecocq <[email protected]>
+
# FLTK/GPLv2
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
@@ -20,8 +22,8 @@
USE_X11 = Yes
USE_GMAKE = Yes
-WANTLIB = X11 Xext Xft Xi Xinerama Xrender c fontconfig m pthread \
- stdc++ z
+WANTLIB = X11 Xcursor Xext Xft Xi Xinerama Xrender c fontconfig m \
+ pthread stdc++ z
LIB_DEPENDS = jpeg.>=62::graphics/jpeg \
png.>=8::graphics/png
Index: distinfo
===================================================================
RCS file: /cvs/openbsd/ports/x11/fltk2/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo 3 Nov 2008 11:02:25 -0000 1.2
+++ distinfo 28 Sep 2009 13:16:38 -0000
@@ -1,5 +1,5 @@
-MD5 (fltk-2.0.x-r6483.tar.gz) = mQiUXDj4vCzYSBTKcIgWlA==
-RMD160 (fltk-2.0.x-r6483.tar.gz) = /heotLVkSyTqSLYHzZME5bOS2IQ=
-SHA1 (fltk-2.0.x-r6483.tar.gz) = /3Ol5BIP4Vk/wYziOypuClr7EF4=
-SHA256 (fltk-2.0.x-r6483.tar.gz) = JG5acq+OrxBfRSYFVI9JdNfEovxB6kiZcDK98fvnY5o=
-SIZE (fltk-2.0.x-r6483.tar.gz) = 3033495
+MD5 (fltk-2.0.x-r6879.tar.gz) = 93ixWK6Q2XoV3yBBcBIqlA==
+RMD160 (fltk-2.0.x-r6879.tar.gz) = gXgzyGBmLZEzaaGhPRatFp4mFvA=
+SHA1 (fltk-2.0.x-r6879.tar.gz) = qunblhJC/1RswnY2taTr2tV9n+A=
+SHA256 (fltk-2.0.x-r6879.tar.gz) = KRMpyd1hZsTD7ESuIAUYPsftI/t2e6mOLRsWW/hYT/U=
+SIZE (fltk-2.0.x-r6879.tar.gz) = 3037362
