Hi,

Below is a diff to update NetSurf (to 2.8) and related libraries.

Near as I can tell, parserutils and hubbub don't add or remove any
functions. As usual, libcss needs a major bump.

The WRKDIST dance is due to a bug in the tarball generation for 2.7.

ok?

Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/www/netsurf/Makefile.inc,v
retrieving revision 1.2
diff -N -u -p Makefile.inc
--- Makefile.inc        18 Jul 2011 20:10:11 -0000      1.2
+++ Makefile.inc        25 Dec 2011 01:54:12 -0000
@@ -10,6 +10,8 @@ DISTNAME ?=   ${NETSURF_PROJECT}-${NETSURF_VERSION}-src
 HOMEPAGE ?=    http://www.netsurf-browser.org/projects/${NETSURF_PROJECT}/
 MASTER_SITES ?=        http://www.netsurf-browser.org/projects/releases/
 
+WRKDIST ?=     ${WRKDIR}/${DISTNAME:S/-src//}
+
 # MIT for libs / GPLv2 for netsurf
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=    Yes
Index: browser/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/browser/Makefile,v
retrieving revision 1.9
diff -N -u -p browser/Makefile
--- browser/Makefile    16 Sep 2011 12:00:07 -0000      1.9
+++ browser/Makefile    25 Dec 2011 01:54:12 -0000
@@ -3,8 +3,7 @@
 COMMENT =              lightweight web browser
 
 NETSURF_PROJECT =      netsurf
-NETSURF_VERSION =      2.7
-REVISION=      0
+NETSURF_VERSION =      2.8
 
 CATEGORIES=            www
 
Index: browser/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/browser/distinfo,v
retrieving revision 1.3
diff -N -u -p browser/distinfo
--- browser/distinfo    18 Jul 2011 20:10:11 -0000      1.3
+++ browser/distinfo    25 Dec 2011 01:54:12 -0000
@@ -1,5 +1,5 @@
-MD5 (netsurf-2.7-src.tar.gz) = UpOfLiMZJp19dY7GZfbLjg==
-RMD160 (netsurf-2.7-src.tar.gz) = AHzxyHVNYSlq02cAjB7QntRb5Qw=
-SHA1 (netsurf-2.7-src.tar.gz) = o+KBZob8Lj2Tzcdycd1MM9wOUwA=
-SHA256 (netsurf-2.7-src.tar.gz) = VPhyz5SPl7do39Bi5E8Ui/JjSDZg98tgTsB8g15LDAc=
-SIZE (netsurf-2.7-src.tar.gz) = 2446099
+MD5 (netsurf-2.8-src.tar.gz) = ScQfKB8+nKKKJNpQX60uOg==
+RMD160 (netsurf-2.8-src.tar.gz) = UtmzKvSMJf3dbDJkoMXh7cfzAQ4=
+SHA1 (netsurf-2.8-src.tar.gz) = QWTp3bioibo2XarbxaV9u3eBnGc=
+SHA256 (netsurf-2.8-src.tar.gz) = CfOqOPJiSKQQSBqvElgR1q9MhTVyW+yVDnWvN8zQqtI=
+SIZE (netsurf-2.8-src.tar.gz) = 2532212
Index: hubbub/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/hubbub/Makefile,v
retrieving revision 1.5
diff -N -u -p hubbub/Makefile
--- hubbub/Makefile     18 Jul 2011 20:05:47 -0000      1.5
+++ hubbub/Makefile     25 Dec 2011 01:54:12 -0000
@@ -3,10 +3,10 @@
 COMMENT =              HTML parser
 
 NETSURF_PROJECT =      hubbub
-NETSURF_VERSION =      0.1.0
+NETSURF_VERSION =      0.1.1
 
 CATEGORIES =           www
-SHARED_LIBS =          hubbub 1.0 #0.1.0
+SHARED_LIBS =          hubbub 1.0 #0.1.1
 
 LIB_DEPENDS =          www/netsurf/libparserutils
 WANTLIB =              parserutils
Index: hubbub/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/hubbub/distinfo,v
retrieving revision 1.2
diff -N -u -p hubbub/distinfo
--- hubbub/distinfo     18 Jul 2011 20:05:47 -0000      1.2
+++ hubbub/distinfo     25 Dec 2011 01:54:12 -0000
@@ -1,5 +1,5 @@
-MD5 (hubbub-0.1.0-src.tar.gz) = nXuyh71fmTkCxXfONQP21Q==
-RMD160 (hubbub-0.1.0-src.tar.gz) = tIIR5KcDZhZPOaOoOyygMT3DhHw=
-SHA1 (hubbub-0.1.0-src.tar.gz) = xCDEDghoZseEJ9zAepuW2iclzrc=
-SHA256 (hubbub-0.1.0-src.tar.gz) = 6LfofHQUMX648a1KfiAsBwjQzuFFWMZtTTOm9UZcZks=
-SIZE (hubbub-0.1.0-src.tar.gz) = 812540
+MD5 (hubbub-0.1.1-src.tar.gz) = mPSb5Y4igBDIg4G8OfOeGQ==
+RMD160 (hubbub-0.1.1-src.tar.gz) = tRWvV9++cCd+xIeVUoLLHKaApZ0=
+SHA1 (hubbub-0.1.1-src.tar.gz) = ZGi8IWJyJQrpEUaeJMVLV8AKS9c=
+SHA256 (hubbub-0.1.1-src.tar.gz) = Nj8azxyjszYruE/I7ZVEsiB+fLcGrBdkd60A3A1WeCs=
+SIZE (hubbub-0.1.1-src.tar.gz) = 812211
Index: libcss/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libcss/Makefile,v
retrieving revision 1.5
diff -N -u -p libcss/Makefile
--- libcss/Makefile     18 Jul 2011 20:01:01 -0000      1.5
+++ libcss/Makefile     25 Dec 2011 01:54:12 -0000
@@ -3,10 +3,10 @@
 COMMENT =              CSS parser and selection engine
 
 NETSURF_PROJECT =      libcss
-NETSURF_VERSION =      0.1.0
+NETSURF_VERSION =      0.1.1
 
 CATEGORIES =           www
-SHARED_LIBS =          css 1.0 #0.1.0
+SHARED_LIBS =          css 2.0 #0.1.1
 
 WANTLIB =              parserutils wapcaplet
 LIB_DEPENDS =          www/netsurf/libparserutils \
Index: libcss/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/libcss/distinfo,v
retrieving revision 1.3
diff -N -u -p libcss/distinfo
--- libcss/distinfo     18 Jul 2011 20:01:01 -0000      1.3
+++ libcss/distinfo     25 Dec 2011 01:54:12 -0000
@@ -1,5 +1,5 @@
-MD5 (libcss-0.1.0-src.tar.gz) = R7m7pg//4W7OvrpXjIn9QA==
-RMD160 (libcss-0.1.0-src.tar.gz) = OrKYhe3+X8kBWsfxfT2WikwoFDo=
-SHA1 (libcss-0.1.0-src.tar.gz) = tqCV3LqaqhWjTlQm51CWRZmwtug=
-SHA256 (libcss-0.1.0-src.tar.gz) = +uS4SU+EN3JCePWeIwtaGT11zjeenX5fPlfHqmx3CpA=
-SIZE (libcss-0.1.0-src.tar.gz) = 455852
+MD5 (libcss-0.1.1-src.tar.gz) = YAdT8shFL0LwosdEmGO9eg==
+RMD160 (libcss-0.1.1-src.tar.gz) = WMis4Qq9DckEQYvaPZMOtlNc9Ag=
+SHA1 (libcss-0.1.1-src.tar.gz) = C8QBTdRyAiXM4+14uggQsrBCdPo=
+SHA256 (libcss-0.1.1-src.tar.gz) = ODxCTB9xNL5n4ip6Yz4x1HumuHq6g1pOc+yok6oBwKA=
+SIZE (libcss-0.1.1-src.tar.gz) = 457668
Index: libnsbmp/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libnsbmp/Makefile,v
retrieving revision 1.2
diff -N -u -p libnsbmp/Makefile
--- libnsbmp/Makefile   18 Jul 2011 20:01:33 -0000      1.2
+++ libnsbmp/Makefile   25 Dec 2011 01:54:12 -0000
@@ -5,6 +5,8 @@ COMMENT =               BMP/ICO decoding library
 NETSURF_PROJECT =      libnsbmp
 NETSURF_VERSION =      0.0.3
 
+WRKDIST =              ${WRKDIR}/${DISTNAME}
+
 CATEGORIES =           graphics
 SHARED_LIBS =          nsbmp 0.0 #0.0.3
 
Index: libnsgif/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libnsgif/Makefile,v
retrieving revision 1.2
diff -N -u -p libnsgif/Makefile
--- libnsgif/Makefile   18 Jul 2011 20:02:20 -0000      1.2
+++ libnsgif/Makefile   25 Dec 2011 01:54:12 -0000
@@ -5,6 +5,8 @@ COMMENT =               GIF decoding library
 NETSURF_PROJECT =      libnsgif
 NETSURF_VERSION =      0.0.3
 
+WRKDIST =              ${WRKDIR}/${DISTNAME}
+
 CATEGORIES =           graphics
 SHARED_LIBS =          nsgif 0.0 #0.0.3
 
Index: libparserutils/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libparserutils/Makefile,v
retrieving revision 1.2
diff -N -u -p libparserutils/Makefile
--- libparserutils/Makefile     18 Jul 2011 20:02:54 -0000      1.2
+++ libparserutils/Makefile     25 Dec 2011 01:54:12 -0000
@@ -3,10 +3,12 @@
 COMMENT =              utility library for parser building
 
 NETSURF_PROJECT =      libparserutils
-NETSURF_VERSION =      0.1.0
+NETSURF_VERSION =      0.1.1
 
 CATEGORIES =           devel
-SHARED_LIBS =          parserutils 1.0 #0.1.0
+SHARED_LIBS =          parserutils 1.0 #0.1.1
+
+CFLAGS +=              -I${LOCALBASE}/include
 
 pre-build:
        echo "CFLAGS += -DWITH_ICONV_FILTER" \
Index: libparserutils/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/libparserutils/distinfo,v
retrieving revision 1.2
diff -N -u -p libparserutils/distinfo
--- libparserutils/distinfo     18 Jul 2011 20:02:54 -0000      1.2
+++ libparserutils/distinfo     25 Dec 2011 01:54:12 -0000
@@ -1,5 +1,5 @@
-MD5 (libparserutils-0.1.0-src.tar.gz) = 60FTF5JaD7EqT/j4SdL+kg==
-RMD160 (libparserutils-0.1.0-src.tar.gz) = tVogPLErX9JyR5BbzhHOV87tdfo=
-SHA1 (libparserutils-0.1.0-src.tar.gz) = JW99YmDHACb4hSR4ph6xuMwEYBQ=
-SHA256 (libparserutils-0.1.0-src.tar.gz) = 
AWtlSJ10PwWEZbKxh1fDZ7w1Qksn3DF8ccFT34D0CO8=
-SIZE (libparserutils-0.1.0-src.tar.gz) = 87857
+MD5 (libparserutils-0.1.1-src.tar.gz) = TyKFFoY94z8z9/QlgxWGfg==
+RMD160 (libparserutils-0.1.1-src.tar.gz) = TPjabZDMA8JKWOu9c8hGLg0Tk14=
+SHA1 (libparserutils-0.1.1-src.tar.gz) = pvWB09g5HQ86rEKkiXYL08YfHOQ=
+SHA256 (libparserutils-0.1.1-src.tar.gz) = 
i3m6WNb6Y/qcdLcUgtk/LFssIrrax3Jl88xH8/YD+H0=
+SIZE (libparserutils-0.1.1-src.tar.gz) = 87868
Index: libwapcaplet/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libwapcaplet/Makefile,v
retrieving revision 1.3
diff -N -u -p libwapcaplet/Makefile
--- libwapcaplet/Makefile       18 Jul 2011 20:03:50 -0000      1.3
+++ libwapcaplet/Makefile       25 Dec 2011 01:54:12 -0000
@@ -5,6 +5,8 @@ COMMENT =               string internment library
 NETSURF_PROJECT =      libwapcaplet
 NETSURF_VERSION =      0.1.0
 
+WRKDIST =              ${WRKDIR}/${DISTNAME}
+
 CATEGORIES=            devel
 SHARED_LIBS =          wapcaplet 1.0 #0.1.0
 

Reply via email to