Stuart Henderson writes:
> On 2013/04/29 09:46, Stuart Henderson wrote:
> > On 2013/04/28 19:05, Anthony J. Bentley wrote:
> > > - LANG needs to be set properly in your environment (e.g., "LANG=en netsu
> rf")
> > > or menus will not have correct names.
> >
> > That really needs fixing for ports - upstream committed something to
> > try to fix this:
> >
> > http://source.netsurf-browser.org/netsurf.git/commit/?id=d2ffd402b32ccc6c7a
> c8a4fab0821dcaee9f3f6b
> > http://source.netsurf-browser.org/netsurf.git/commit/?id=8df67ca8010a6e321f
> a3447dc4e306bbe460a2e3
> >
> > it doesn't work :( but gives enough of a hint for a workaround.
> > Add this to Makefile and regen PLIST:
> >
> > post-install:
> > ln -s en ${PREFIX}/share/netsurf/C
> >
> > then it's OK with me.
> >
>
> ah - run into a few problems with a bit more testing.
>
> 1. if ccache is installed, build tries to pick it up and use it; if USE_CCACH
> E
> is not set, browser ends up with an error when it tries to write to
> /netsurf-3.0_writes_to_HOME/.ccache, and other ports have this
>
> /usr/local/share/netsurf-buildsystem/makefiles/Makefile.tools:514: *** Unable
> to detect toolchain. Stop.
Here is an updated patch that handles default LANG and USE_CCACHE=No.
? buildsystem
? libdom
? nsgenbind
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile 29 Jun 2010 20:11:13 -0000 1.1.1.1
+++ Makefile 30 Apr 2013 02:27:35 -0000
@@ -1,8 +1,10 @@
# $OpenBSD: Makefile,v 1.1.1.1 2010/06/29 20:11:13 landry Exp $
SUBDIR += browser
+ SUBDIR += buildsystem
SUBDIR += hubbub
SUBDIR += libcss
+ SUBDIR += libdom
SUBDIR += libnsbmp
SUBDIR += libnsgif
SUBDIR += libparserutils
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/www/netsurf/Makefile.inc,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile.inc
--- Makefile.inc 11 Mar 2013 12:27:54 -0000 1.6
+++ Makefile.inc 30 Apr 2013 02:27:35 -0000
@@ -4,12 +4,12 @@ CATEGORIES += www/netsurf
# child ports MUST define NETSURF_{PROJECT,VERSION}
-PKGNAME ?= ${DISTNAME:S/-src//}
+PKGNAME ?= ${NETSURF_PROJECT}-${NETSURF_VERSION}
DISTNAME ?= ${NETSURF_PROJECT}-${NETSURF_VERSION}-src
MAINTAINER ?= Anthony J. Bentley <anth...@cathet.us>
HOMEPAGE ?= http://www.netsurf-browser.org/projects/${NETSURF_PROJECT}/
-MASTER_SITES ?= http://www.netsurf-browser.org/projects/releases/
+MASTER_SITES ?= http://download.netsurf-browser.org/libs/releases/
WRKDIST ?= ${WRKDIR}/${DISTNAME:S/-src//}
@@ -24,5 +24,15 @@ USE_GMAKE = Yes
# not used for browser
.for _l _v in ${SHARED_LIBS}
MAKE_FLAGS += COMPONENT_TYPE=lib-shared \
- LIB${_l}_VERSION=${_v}
+ NS_LIB_VERSION=${_v}
.endfor
+
+.if ${NETSURF_PROJECT} != "buildsystem"
+BUILD_DEPENDS += www/netsurf/buildsystem
+MAKE_FLAGS += Q= \
+ VQ= \
+ CCOPT= \
+ CXXOPT= \
+ CCACHE= \
+ NSSHARED=${LOCALBASE}/share/netsurf-buildsystem
+.endif
Index: browser/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/browser/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- browser/Makefile 5 Mar 2013 08:02:35 -0000 1.12
+++ browser/Makefile 30 Apr 2013 02:27:35 -0000
@@ -3,45 +3,42 @@
COMMENT = lightweight web browser
NETSURF_PROJECT = netsurf
-NETSURF_VERSION = 2.9
-REVISION = 0
+NETSURF_VERSION = 3.0
CATEGORIES= www
HOMEPAGE= http://www.netsurf-browser.org/
-MASTER_SITES = ${HOMEPAGE}downloads/releases/
+MASTER_SITES =
http://download.netsurf-browser.org/netsurf/releases/source/
MODULES = devel/gettext
-LIB_DEPENDS = www/netsurf/hubbub>=0.1.0 \
- www/netsurf/libcss>=0.1.0 \
- www/netsurf/libnsgif>=0.0.3 \
- www/netsurf/libnsbmp>=0.0.3 \
+LIB_DEPENDS = www/netsurf/hubbub>=0.2.0 \
+ www/netsurf/libcss>=0.2.0 \
+ www/netsurf/libnsgif>=0.1.0 \
+ www/netsurf/libnsbmp>=0.1.0 \
+ www/netsurf/libdom \
graphics/libmng \
graphics/libwebp \
x11/gtk+2 \
- devel/libglade2 \
x11/gnome/librsvg \
net/curl
-WANTLIB += atk-1.0 cairo gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += gthread-2.0 jpeg lcms pango-1.0 pangocairo-1.0 pcre
-WANTLIB += pangoft2-1.0 parserutils png wapcaplet xml2 webp
-WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
-WANTLIB += Xi Xinerama Xrandr Xrender c crypto expat fontconfig
-WANTLIB += freetype m pixman-1 pthread pthread-stubs ssl xcb
-WANTLIB += xcb-render z gdk_pixbuf-2.0 GL Xxf86vm drm
-WANTLIB += hubbub css nsgif nsbmp mng gdk-x11-2.0 gtk-x11-2.0
-WANTLIB += glade-2.0 rsvg-2 curl xcb-shm
-
-WRKDIST = ${WRKDIR}/netsurf
-
-do-configure:
- @echo "NETSURF_USE_HARU_PDF := NO\n" \
- "NETSURF_USE_LIBICONV_PLUG := NO\n" \
- "NETSURF_USE_RSVG := YES\n" \
- "NETSURF_USE_NSSVG := NO\n" \
- "NETSURF_USE_ROSPRITE := NO\n" \
- "NETSURF_USE_WEBP := YES" > ${WRKSRC}/Makefile.config
+WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender atk-1.0 c cairo crypto css curl dom
+WANTLIB += expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
+WANTLIB += gtk-x11-2.0 hubbub jpeg lcms m mng nsbmp nsgif pango-1.0
+WANTLIB += pangocairo-1.0 pangoft2-1.0 parserutils png pthread
+WANTLIB += rsvg-2 ssl wapcaplet webp z
+
+MAKE_FLAGS += NETSURF_USE_HARU_PDF=NO \
+ NETSURF_USE_LIBICONV_PLUG=NO \
+ NETSURF_USE_RSVG=YES \
+ NETSURF_USE_NSSVG=NO \
+ NETSURF_USE_ROSPRITE=NO \
+ NETSURF_USE_WEBP=YES
+
+post-install:
+ ln -s en ${PREFIX}/share/netsurf/C
.include <bsd.port.mk>
Index: browser/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/browser/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- browser/distinfo 30 Apr 2012 07:11:58 -0000 1.5
+++ browser/distinfo 30 Apr 2013 02:27:35 -0000
@@ -1,5 +1,2 @@
-MD5 (netsurf-2.9-src.tar.gz) = fl76tpC7Rz5822k2IC9flQ==
-RMD160 (netsurf-2.9-src.tar.gz) = W1qY+sLxansTPBcf+TzhLiwwGQY=
-SHA1 (netsurf-2.9-src.tar.gz) = 4w29cltVE/EFQJM6zEKWod0TE7M=
-SHA256 (netsurf-2.9-src.tar.gz) = 90dnFh/X8xhuSDtDihg/LqPK4WACCtXdY8daTXj1x5c=
-SIZE (netsurf-2.9-src.tar.gz) = 2575417
+SHA256 (netsurf-3.0-src.tar.gz) = fGpI08w+mj46UbUy3fYPdpfpe/i2Gm07LO0aLon7zMY=
+SIZE (netsurf-3.0-src.tar.gz) = 2950260
Index: browser/patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/browser/patches/patch-Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-Makefile
--- browser/patches/patch-Makefile 18 Jul 2011 20:10:11 -0000 1.4
+++ browser/patches/patch-Makefile 30 Apr 2013 02:27:35 -0000
@@ -1,27 +1,12 @@
-$OpenBSD: patch-Makefile,v 1.4 2011/07/18 20:10:11 landry Exp $
-
-XXX make it compile with gtk+2 2.22 (*_DISABLE_DEPRECATED)
-gtk/gtk_tabs.c:41: error: expected declaration specifiers or '...' before
'GtkNotebookPage'
-
---- Makefile.orig Sun Jun 19 00:34:29 2011
-+++ Makefile Sun Jun 19 00:35:34 2011
-@@ -128,8 +128,8 @@ ifneq ($(TARGET),riscos)
- endif
- endif
-
--Q=@
--VQ=@
-+Q=
-+VQ=
- PERL=perl
- MKDIR=mkdir
- TOUCH=touch
-@@ -318,7 +318,7 @@ endef
+$OpenBSD$
+--- Makefile.orig Fri Apr 19 14:27:45 2013
++++ Makefile Thu Apr 25 01:11:09 2013
+@@ -404,7 +404,7 @@ endef
# Set up the WARNFLAGS here so that they can be overridden in the
Makefile.config
WARNFLAGS = -W -Wall -Wundef -Wpointer-arith \
-Wcast-align -Wwrite-strings -Wstrict-prototypes \
- -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls \
+ -Wmissing-prototypes -Wmissing-declarations \
- -Wnested-externs
- ifneq ($(GCCVER),2)
+ -Wnested-externs -Wuninitialized
+ ifneq ($(CC_MAJOR),2)
WARNFLAGS += -Wno-unused-parameter
Index: browser/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/netsurf/browser/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- browser/pkg/PLIST 12 Jan 2012 03:17:08 -0000 1.4
+++ browser/pkg/PLIST 30 Apr 2013 02:27:35 -0000
@@ -1,29 +1,33 @@
-@comment $OpenBSD: PLIST,v 1.4 2012/01/12 03:17:08 bentley Exp $
+@comment $OpenBSD$
@bin bin/netsurf
share/netsurf/
-share/netsurf/C/
-share/netsurf/C/Messages
+share/netsurf/C
share/netsurf/SearchEngines
share/netsurf/adblock.css
share/netsurf/arrow_down_8x32.png
-share/netsurf/blankpage
share/netsurf/ca-bundle.txt
-share/netsurf/cookies.glade
+share/netsurf/cookies.gtk2.ui
+share/netsurf/cookies.gtk3.ui
share/netsurf/de/
share/netsurf/de/Messages
+share/netsurf/de/welcome.html
share/netsurf/default.css
share/netsurf/default.ico
-share/netsurf/downloads.glade
+share/netsurf/downloads.gtk2.ui
+share/netsurf/downloads.gtk3.ui
share/netsurf/en/
share/netsurf/en/Messages
share/netsurf/en/credits.html
share/netsurf/en/licence.html
+share/netsurf/en/welcome.html
share/netsurf/favicon.png
share/netsurf/fr/
share/netsurf/fr/Messages
share/netsurf/gtkdefault.css
-share/netsurf/history.glade
-share/netsurf/hotlist.glade
+share/netsurf/history.gtk2.ui
+share/netsurf/history.gtk3.ui
+share/netsurf/hotlist.gtk2.ui
+share/netsurf/hotlist.gtk3.ui
share/netsurf/icons/
share/netsurf/icons/content.png
share/netsurf/icons/directory.png
@@ -31,20 +35,33 @@ share/netsurf/icons/search.png
share/netsurf/internal.css
share/netsurf/it/
share/netsurf/it/Messages
+share/netsurf/it/credits.html
+share/netsurf/it/licence.html
+share/netsurf/it/welcome.html
+share/netsurf/ja/
+share/netsurf/ja/welcome.html
share/netsurf/languages
share/netsurf/license
-share/netsurf/login.glade
+share/netsurf/login.gtk2.ui
+share/netsurf/login.gtk3.ui
share/netsurf/netsurf-16x16.xpm
-share/netsurf/netsurf.glade
+share/netsurf/netsurf.gtk2.ui
+share/netsurf/netsurf.gtk3.ui
share/netsurf/netsurf.png
share/netsurf/netsurf.xpm
share/netsurf/nl/
share/netsurf/nl/Messages
-share/netsurf/options.glade
-share/netsurf/password.glade
+share/netsurf/options.gtk2.ui
+share/netsurf/options.gtk3.ui
+share/netsurf/password.gtk2.ui
+share/netsurf/password.gtk3.ui
share/netsurf/quirks.css
-share/netsurf/source.glade
-share/netsurf/ssl.glade
+share/netsurf/source.gtk2.ui
+share/netsurf/source.gtk3.ui
+share/netsurf/ssl.gtk2.ui
+share/netsurf/ssl.gtk3.ui
+share/netsurf/tabcontents.gtk2.ui
+share/netsurf/tabcontents.gtk3.ui
share/netsurf/themelist
share/netsurf/themes/
share/netsurf/themes/Alpha.png
@@ -88,6 +105,8 @@ share/netsurf/throbber/throbber5.png
share/netsurf/throbber/throbber6.png
share/netsurf/throbber/throbber7.png
share/netsurf/throbber/throbber8.png
-share/netsurf/toolbar.glade
+share/netsurf/toolbar.gtk2.ui
+share/netsurf/toolbar.gtk3.ui
share/netsurf/toolbarIndices
-share/netsurf/warning.glade
+share/netsurf/warning.gtk2.ui
+share/netsurf/warning.gtk3.ui
Index: hubbub/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/hubbub/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- hubbub/Makefile 11 Mar 2013 11:44:43 -0000 1.9
+++ hubbub/Makefile 30 Apr 2013 02:27:35 -0000
@@ -2,18 +2,21 @@
COMMENT = HTML parser
-NETSURF_PROJECT = hubbub
-NETSURF_VERSION = 0.1.2
-REVISION = 0
+NETSURF_PROJECT = libhubbub
+NETSURF_VERSION = 0.2.0
+PKGNAME = hubbub-${NETSURF_VERSION}
+HOMEPAGE = http://www.netsurf-browser.org/projects/hubbub/
CATEGORIES = www
-SHARED_LIBS = hubbub 1.0 #0.1.2
+SHARED_LIBS = hubbub 1.1 #0.2.0
-LIB_DEPENDS = www/netsurf/libparserutils
-WANTLIB = parserutils
+LIB_DEPENDS = www/netsurf/libparserutils>=0.1.2
+WANTLIB += iconv parserutils
-# test broken - needs an old version of json-c
-# TEST_DEPENDS = devel/json-c
-NO_TEST = Yes
+TEST_DEPENDS = devel/json-c>=0.10
+
+pre-build:
+ echo "CFLAGS += -I${LOCALBASE}/include" \
+ > ${WRKSRC}/Makefile.config.override
.include <bsd.port.mk>
Index: hubbub/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/hubbub/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- hubbub/distinfo 30 Apr 2012 07:11:58 -0000 1.4
+++ hubbub/distinfo 30 Apr 2013 02:27:35 -0000
@@ -1,5 +1,2 @@
-MD5 (hubbub-0.1.2-src.tar.gz) = lOKBmEPx5nXczNLlacmgog==
-RMD160 (hubbub-0.1.2-src.tar.gz) = aOxGS2b/obDppM55Zfuj+bSvOIA=
-SHA1 (hubbub-0.1.2-src.tar.gz) = F6yfBRaETekxU0zQ+0k+nbjxCGs=
-SHA256 (hubbub-0.1.2-src.tar.gz) = laHVpxBVsoqOTOTchRa48O1pHF7gNSW/c2AElWV/G1I=
-SIZE (hubbub-0.1.2-src.tar.gz) = 812684
+SHA256 (libhubbub-0.2.0-src.tar.gz) =
kckJZf27+5E3x4gbM3NqA/yAvRb1zXgI4e//PWMADq8=
+SIZE (libhubbub-0.2.0-src.tar.gz) = 792718
Index: hubbub/patches/patch-build_makefiles_Makefile_top
===================================================================
RCS file: hubbub/patches/patch-build_makefiles_Makefile_top
diff -N hubbub/patches/patch-build_makefiles_Makefile_top
--- hubbub/patches/patch-build_makefiles_Makefile_top 18 Jul 2011 20:05:48
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,58 +0,0 @@
-$OpenBSD: patch-build_makefiles_Makefile_top,v 1.2 2011/07/18 20:05:48 landry
Exp $
---- build/makefiles/Makefile.top.orig Sun Mar 13 04:30:18 2011
-+++ build/makefiles/Makefile.top Sun Jun 19 00:18:27 2011
-@@ -92,8 +92,8 @@ endif
- # Makefile variables
- ##############################################################################
-
--Q ?= @
--VQ ?= @
-+Q ?=
-+VQ ?=
-
- ##############################################################################
- # Exported variables (also OUTPUT, further down)
-@@ -185,8 +185,8 @@ endif
- ifeq ($(findstring lib,$(COMPONENT_TYPE)),lib)
- ifeq ($(findstring lib-shared,$(COMPONENT_TYPE)),lib-shared)
- SHAREDLIBNAME := lib$(COMPONENT)$(LIBEXT)
-- SONAME := $(SHAREDLIBNAME).$(major-version)
-- OUTPUT := $(BUILDDIR)/$(SHAREDLIBNAME).$(COMPONENT_VERSION)
-+ SONAME := $(SHAREDLIBNAME).$(LIBhubbub_VERSION)
-+ OUTPUT := $(BUILDDIR)/$(SHAREDLIBNAME).$(LIBhubbub_VERSION)
- else
- OUTPUT := $(BUILDDIR)/lib$(COMPONENT)$(LIBEXT)
- endif
-@@ -201,14 +201,6 @@ endif
- .PHONY: all test coverage profile docs clean distclean install uninstall \
- __default __precov __partial_clean __postshared
-
--ifeq ($(COMPONENT_TYPE),lib-shared)
-- POST_TARGETS := __postshared $(POST_TARGETS)
--
--__postshared:
-- $(Q)$(LN) $(LNFLAGS) -f -s $(notdir $(OUTPUT)) $(BUILDDIR)/$(SONAME)
-- $(Q)$(LN) $(LNFLAGS) -f -s $(notdir $(OUTPUT))
$(BUILDDIR)/$(SHAREDLIBNAME)
--endif
--
- # Default target
- all: $(PRE_TARGETS) $(OUTPUT) $(POST_TARGETS)
-
-@@ -269,7 +261,7 @@ __required = $(if $(REQUIRED_PKGS),Requires: $(subst $
- define install_pkgconfig
- $(Q)$(ECHO) $(ECHOFLAGS) "sed -e... $1 >$(BUILDDIR)/$(1:.in=)"
- $(Q)$(SED) \
-- -e 's#PREFIX#$(PREFIX)#' \
-+ -e 's#PREFIX#$(TRUEPREFIX)#' \
- -e 's#MAJOR#$(major-version)#' \
- -e 's#MINOR#$(minor-version)#' \
- -e 's#PATCH#$(patch-version)#' \
-@@ -284,8 +276,6 @@ endef
- # TODO: Is this scheme portable?
- define install_shared_lib
- $(INSTALL) $(INSTALLFLAGS) -m 755 $1 $2/$(notdir $1)
-- $(LN) $(LNFLAGS) -f -s $(notdir $1) $2/$(SONAME)
-- $(LN) $(LNFLAGS) -f -s $(notdir $1) $2/$(SHAREDLIBNAME)
- endef
-
- # Install a file ($1) to the specified location ($2)
Index: hubbub/patches/patch-test_parser_c
===================================================================
RCS file: hubbub/patches/patch-test_parser_c
diff -N hubbub/patches/patch-test_parser_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ hubbub/patches/patch-test_parser_c 30 Apr 2013 02:27:35 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- test/parser.c.orig Thu Apr 25 14:30:21 2013
++++ test/parser.c Thu Apr 25 14:33:04 2013
+@@ -25,7 +25,7 @@ static int run_test(int argc, char **argv, unsigned in
+ hubbub_parser_optparams params;
+ FILE *fp;
+ size_t len, origlen;
+- uint8_t *buf = alloca(CHUNK_SIZE);
++ uint8_t *buf = malloc(CHUNK_SIZE);
+ const char *charset;
+ hubbub_charset_source cssource;
+
+@@ -64,6 +64,8 @@ static int run_test(int argc, char **argv, unsigned in
+ assert(len == 0);
+
+ fclose(fp);
++
++ free(buf);
+
+ charset = hubbub_parser_read_charset(parser, &cssource);
+
Index: hubbub/patches/patch-test_tokeniser2_c
===================================================================
RCS file: hubbub/patches/patch-test_tokeniser2_c
diff -N hubbub/patches/patch-test_tokeniser2_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ hubbub/patches/patch-test_tokeniser2_c 30 Apr 2013 02:27:35 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- test/tokeniser2.c.orig Thu Apr 25 14:31:15 2013
++++ test/tokeniser2.c Thu Apr 25 14:31:39 2013
+@@ -143,7 +143,7 @@ void run_test(context *ctx)
+ if (ctx->last_start_tag != NULL) {
+ /* Fake up a start tag, in PCDATA state */
+ size_t len = strlen(ctx->last_start_tag) + 3;
+- uint8_t *buf = alloca(len);
++ uint8_t *buf = malloc(len);
+
+ snprintf((char *) buf, len, "<%s>",
+ ctx->last_start_tag);
+@@ -152,6 +152,8 @@ void run_test(context *ctx)
+ buf, len - 1) == HUBBUB_OK);
+
+ assert(hubbub_tokeniser_run(tok) == HUBBUB_OK);
++
++ free(buf);
+ }
+
+ if (ctx->process_cdata) {
Index: hubbub/patches/patch-test_tokeniser3_c
===================================================================
RCS file: hubbub/patches/patch-test_tokeniser3_c
diff -N hubbub/patches/patch-test_tokeniser3_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ hubbub/patches/patch-test_tokeniser3_c 30 Apr 2013 02:27:35 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- test/tokeniser3.c.orig Thu Apr 25 14:31:47 2013
++++ test/tokeniser3.c Thu Apr 25 14:32:25 2013
+@@ -141,7 +141,7 @@ void run_test(context *ctx)
+ if (ctx->last_start_tag != NULL) {
+ /* Fake up a start tag, in PCDATA state */
+ size_t len = strlen(ctx->last_start_tag) + 3;
+- uint8_t *buf = alloca(len);
++ uint8_t *buf = malloc(len);
+
+ snprintf((char *) buf, len, "<%s>",
+ ctx->last_start_tag);
+@@ -150,6 +150,8 @@ void run_test(context *ctx)
+ buf, len - 1) == HUBBUB_OK);
+
+ assert(hubbub_tokeniser_run(tok) == HUBBUB_OK);
++
++ free(buf);
+ }
+
+ if (ctx->process_cdata) {
Index: hubbub/patches/patch-test_tree_c
===================================================================
RCS file: hubbub/patches/patch-test_tree_c
diff -N hubbub/patches/patch-test_tree_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ hubbub/patches/patch-test_tree_c 30 Apr 2013 02:27:35 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- test/tree.c.orig Thu Apr 25 14:32:39 2013
++++ test/tree.c Thu Apr 25 14:33:36 2013
+@@ -91,7 +91,7 @@ static int run_test(int argc, char **argv, unsigned in
+ hubbub_parser_optparams params;
+ FILE *fp;
+ size_t len, origlen;
+- uint8_t *buf = alloca(CHUNK_SIZE);
++ uint8_t *buf = malloc(CHUNK_SIZE);
+ const char *charset;
+ hubbub_charset_source cssource;
+ bool passed = true;
+@@ -143,6 +143,8 @@ static int run_test(int argc, char **argv, unsigned in
+ assert(len == 0);
+
+ fclose(fp);
++
++ free(buf);
+
+ charset = hubbub_parser_read_charset(parser, &cssource);
+
Index: hubbub/pkg/PFRAG.shared
===================================================================
RCS file: hubbub/pkg/PFRAG.shared
diff -N hubbub/pkg/PFRAG.shared
--- hubbub/pkg/PFRAG.shared 29 Jun 2010 20:11:13 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2010/06/29 20:11:13 landry Exp $
-@lib lib/libhubbub.so.${LIBhubbub_VERSION}
Index: hubbub/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/netsurf/hubbub/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- hubbub/pkg/PLIST 29 Jun 2010 20:11:13 -0000 1.1.1.1
+++ hubbub/pkg/PLIST 30 Apr 2013 02:27:35 -0000
@@ -1,5 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2010/06/29 20:11:13 landry Exp $
-%%SHARED%%
+@comment $OpenBSD$
include/hubbub/
include/hubbub/errors.h
include/hubbub/functypes.h
@@ -7,5 +6,6 @@ include/hubbub/hubbub.h
include/hubbub/parser.h
include/hubbub/tree.h
include/hubbub/types.h
+@lib lib/libhubbub.so.${LIBhubbub_VERSION}
lib/pkgconfig/
lib/pkgconfig/libhubbub.pc
Index: libcss/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libcss/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- libcss/Makefile 5 Mar 2013 08:02:35 -0000 1.8
+++ libcss/Makefile 30 Apr 2013 02:27:35 -0000
@@ -3,14 +3,13 @@
COMMENT = CSS parser and selection engine
NETSURF_PROJECT = libcss
-NETSURF_VERSION = 0.1.2
-REVISION = 0
+NETSURF_VERSION = 0.2.0
CATEGORIES = www
-SHARED_LIBS = css 2.1 #0.1.2
+SHARED_LIBS = css 2.2 #0.2.0
-WANTLIB = parserutils wapcaplet
-LIB_DEPENDS = www/netsurf/libparserutils \
- www/netsurf/libwapcaplet
+LIB_DEPENDS = www/netsurf/libparserutils>=0.1.2 \
+ www/netsurf/libwapcaplet>=0.2.0
+WANTLIB += iconv parserutils wapcaplet
.include <bsd.port.mk>
Index: libcss/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/libcss/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- libcss/distinfo 30 Apr 2012 07:11:58 -0000 1.5
+++ libcss/distinfo 30 Apr 2013 02:27:35 -0000
@@ -1,5 +1,2 @@
-MD5 (libcss-0.1.2-src.tar.gz) = bp3X7VMRP8QvodILPSAkdQ==
-RMD160 (libcss-0.1.2-src.tar.gz) = AcPulqPdV3TnoDi7p6H09GEZxJY=
-SHA1 (libcss-0.1.2-src.tar.gz) = BSlnchxS++vA+rzVIeXbxF8K5bc=
-SHA256 (libcss-0.1.2-src.tar.gz) = ksESoFm8WuSQOSQ5QBAFtHylwnD4kfYxe2SqxziuH14=
-SIZE (libcss-0.1.2-src.tar.gz) = 474621
+SHA256 (libcss-0.2.0-src.tar.gz) = MbCPbyJZNmzK2LRVRA82TcM+fceM2wz0kF2lbVNy9hM=
+SIZE (libcss-0.2.0-src.tar.gz) = 460004
Index: libcss/patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libcss/patches/patch-Makefile,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-Makefile
--- libcss/patches/patch-Makefile 16 Sep 2011 13:35:49 -0000 1.1
+++ libcss/patches/patch-Makefile 30 Apr 2013 02:27:35 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-Makefile,v 1.1 2011/09/1
gcc3 throws a spurious warning that a variable might be used uninitialized.
---- Makefile.orig Fri Sep 16 15:08:28 2011
-+++ Makefile Fri Sep 16 15:12:11 2011
-@@ -16,7 +16,9 @@ WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-a
+--- Makefile.orig Thu Apr 25 01:21:19 2013
++++ Makefile Thu Apr 25 01:21:22 2013
+@@ -18,7 +18,9 @@ WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-a
# BeOS/Haiku/AmigaOS4 standard library headers create warnings
ifneq ($(TARGET),beos)
ifneq ($(TARGET),amiga)
Index: libcss/patches/patch-build_makefiles_Makefile_tools
===================================================================
RCS file: libcss/patches/patch-build_makefiles_Makefile_tools
diff -N libcss/patches/patch-build_makefiles_Makefile_tools
--- libcss/patches/patch-build_makefiles_Makefile_tools 16 Sep 2011 13:35:49
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-build_makefiles_Makefile_tools,v 1.1 2011/09/16 13:35:49 naddy
Exp $
-
-Don't override CFLAGS.
-
---- build/makefiles/Makefile.tools.orig Fri Sep 16 15:12:43 2011
-+++ build/makefiles/Makefile.tools Fri Sep 16 15:13:42 2011
-@@ -420,8 +420,8 @@ include build/makefiles/Makefile.$(toolchain)
-
###############################################################################
-
- ifeq ($(BUILD),release)
-- OPTCFLAGS ?= $(CCDEF)NDEBUG $(CCOPT)
-- OPTCXXFLAGS ?= $(CXXDEF)NDEBUG $(CXXOPT)
-+ OPTCFLAGS ?= $(CCDEF)NDEBUG # $(CCOPT)
-+ OPTCXXFLAGS ?= $(CXXDEF)NDEBUG # $(CXXOPT)
- else
- OPTCFLAGS ?= $(CCDBG) $(CCNOOPT) $(CCDEF)DEBUG
- OPTCXXFLAGS ?= $(CXXDBG) $(CXXNOOPT) $(CXXDEF)DEBUG
Index: libcss/patches/patch-build_makefiles_Makefile_top
===================================================================
RCS file: libcss/patches/patch-build_makefiles_Makefile_top
diff -N libcss/patches/patch-build_makefiles_Makefile_top
--- libcss/patches/patch-build_makefiles_Makefile_top 18 Jul 2011 20:01:01
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,58 +0,0 @@
-$OpenBSD: patch-build_makefiles_Makefile_top,v 1.2 2011/07/18 20:01:01 landry
Exp $
---- build/makefiles/Makefile.top.orig Sun Mar 13 04:30:18 2011
-+++ build/makefiles/Makefile.top Sun Jun 19 00:27:57 2011
-@@ -92,8 +92,8 @@ endif
- # Makefile variables
- ##############################################################################
-
--Q ?= @
--VQ ?= @
-+Q ?=
-+VQ ?=
-
- ##############################################################################
- # Exported variables (also OUTPUT, further down)
-@@ -185,8 +185,8 @@ endif
- ifeq ($(findstring lib,$(COMPONENT_TYPE)),lib)
- ifeq ($(findstring lib-shared,$(COMPONENT_TYPE)),lib-shared)
- SHAREDLIBNAME := lib$(COMPONENT)$(LIBEXT)
-- SONAME := $(SHAREDLIBNAME).$(major-version)
-- OUTPUT := $(BUILDDIR)/$(SHAREDLIBNAME).$(COMPONENT_VERSION)
-+ SONAME := $(SHAREDLIBNAME).$(LIBcss_VERSION)
-+ OUTPUT := $(BUILDDIR)/$(SHAREDLIBNAME).$(LIBcss_VERSION)
- else
- OUTPUT := $(BUILDDIR)/lib$(COMPONENT)$(LIBEXT)
- endif
-@@ -201,14 +201,6 @@ endif
- .PHONY: all test coverage profile docs clean distclean install uninstall \
- __default __precov __partial_clean __postshared
-
--ifeq ($(COMPONENT_TYPE),lib-shared)
-- POST_TARGETS := __postshared $(POST_TARGETS)
--
--__postshared:
-- $(Q)$(LN) $(LNFLAGS) -f -s $(notdir $(OUTPUT)) $(BUILDDIR)/$(SONAME)
-- $(Q)$(LN) $(LNFLAGS) -f -s $(notdir $(OUTPUT))
$(BUILDDIR)/$(SHAREDLIBNAME)
--endif
--
- # Default target
- all: $(PRE_TARGETS) $(OUTPUT) $(POST_TARGETS)
-
-@@ -269,7 +261,7 @@ __required = $(if $(REQUIRED_PKGS),Requires: $(subst $
- define install_pkgconfig
- $(Q)$(ECHO) $(ECHOFLAGS) "sed -e... $1 >$(BUILDDIR)/$(1:.in=)"
- $(Q)$(SED) \
-- -e 's#PREFIX#$(PREFIX)#' \
-+ -e 's#PREFIX#$(TRUEPREFIX)#' \
- -e 's#MAJOR#$(major-version)#' \
- -e 's#MINOR#$(minor-version)#' \
- -e 's#PATCH#$(patch-version)#' \
-@@ -284,8 +276,6 @@ endef
- # TODO: Is this scheme portable?
- define install_shared_lib
- $(INSTALL) $(INSTALLFLAGS) -m 755 $1 $2/$(notdir $1)
-- $(LN) $(LNFLAGS) -f -s $(notdir $1) $2/$(SONAME)
-- $(LN) $(LNFLAGS) -f -s $(notdir $1) $2/$(SHAREDLIBNAME)
- endef
-
- # Install a file ($1) to the specified location ($2)
Index: libcss/patches/patch-test_css21_c
===================================================================
RCS file: libcss/patches/patch-test_css21_c
diff -N libcss/patches/patch-test_css21_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ libcss/patches/patch-test_css21_c 30 Apr 2013 02:27:35 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- test/css21.c.orig Thu Apr 25 14:35:19 2013
++++ test/css21.c Thu Apr 25 14:36:04 2013
+@@ -115,7 +115,7 @@ int main(int argc, char **argv)
+
+ if (error == CSS_OK) {
+ css_stylesheet *import;
+- char *buf = alloca(lwc_string_length(url) + 1);
++ char *buf = malloc(lwc_string_length(url) + 1);
+
+ memcpy(buf, lwc_string_data(url),
+ lwc_string_length(url));
+@@ -135,6 +135,8 @@ int main(int argc, char **argv)
+ css_stylesheet_destroy(import);
+
+ error = CSS_IMPORTS_PENDING;
++
++ free(buf);
+ }
+ }
+
Index: libcss/patches/patch-test_parse-auto_c
===================================================================
RCS file: libcss/patches/patch-test_parse-auto_c
diff -N libcss/patches/patch-test_parse-auto_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ libcss/patches/patch-test_parse-auto_c 30 Apr 2013 02:27:35 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- test/parse-auto.c.orig Thu Apr 25 14:36:19 2013
++++ test/parse-auto.c Thu Apr 25 14:36:43 2013
+@@ -409,7 +409,7 @@ void run_test(const uint8_t *data, size_t len, exp_ent
+
+ if (error == CSS_OK) {
+ css_stylesheet *import;
+- char *buf = alloca(lwc_string_length(url) + 1);
++ char *buf = malloc(lwc_string_length(url) + 1);
+
+ memcpy(buf, lwc_string_data(url),
+ lwc_string_length(url));
+@@ -425,6 +425,8 @@ void run_test(const uint8_t *data, size_t len, exp_ent
+
+ error = CSS_IMPORTS_PENDING;
+ lwc_string_unref(url);
++
++ free(buf);
+ }
+ }
+
Index: libcss/pkg/PFRAG.shared
===================================================================
RCS file: libcss/pkg/PFRAG.shared
diff -N libcss/pkg/PFRAG.shared
--- libcss/pkg/PFRAG.shared 29 Jun 2010 20:11:13 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2010/06/29 20:11:13 landry Exp $
-@lib lib/libcss.so.${LIBcss_VERSION}
Index: libcss/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/netsurf/libcss/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- libcss/pkg/PLIST 30 Apr 2012 07:11:58 -0000 1.2
+++ libcss/pkg/PLIST 30 Apr 2013 02:27:35 -0000
@@ -1,5 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2012/04/30 07:11:58 bentley Exp $
-%%SHARED%%
+@comment $OpenBSD$
include/libcss/
include/libcss/computed.h
include/libcss/errors.h
@@ -12,5 +11,6 @@ include/libcss/properties.h
include/libcss/select.h
include/libcss/stylesheet.h
include/libcss/types.h
+@lib lib/libcss.so.${LIBcss_VERSION}
lib/pkgconfig/
lib/pkgconfig/libcss.pc
Index: libnsbmp/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libnsbmp/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- libnsbmp/Makefile 5 Mar 2013 08:02:35 -0000 1.4
+++ libnsbmp/Makefile 30 Apr 2013 02:27:35 -0000
@@ -3,12 +3,9 @@
COMMENT = BMP/ICO decoding library
NETSURF_PROJECT = libnsbmp
-NETSURF_VERSION = 0.0.3
-REVISION = 0
-
-WRKDIST = ${WRKDIR}/${DISTNAME}
+NETSURF_VERSION = 0.1.0
CATEGORIES = graphics
-SHARED_LIBS = nsbmp 0.0 #0.0.3
+SHARED_LIBS = nsbmp 1.0 #0.1.0
.include <bsd.port.mk>
Index: libnsbmp/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/libnsbmp/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- libnsbmp/distinfo 18 Jul 2011 20:01:33 -0000 1.2
+++ libnsbmp/distinfo 30 Apr 2013 02:27:35 -0000
@@ -1,5 +1,2 @@
-MD5 (libnsbmp-0.0.3-src.tar.gz) = Uu75QHE6TIp6+7aIhYMFfA==
-RMD160 (libnsbmp-0.0.3-src.tar.gz) = 9AMZeO9GTXhwfmQaZSqGHxXvttE=
-SHA1 (libnsbmp-0.0.3-src.tar.gz) = 1dbQjj8dmd0/bzn8PXlCRTHHpqc=
-SHA256 (libnsbmp-0.0.3-src.tar.gz) =
4Mz4Ub9tyTmLWH8bP5GXc6SdfS6wgrmatYmCF9c+R6I=
-SIZE (libnsbmp-0.0.3-src.tar.gz) = 219808
+SHA256 (libnsbmp-0.1.0-src.tar.gz) =
+1dq9r1NAtNibVwgkrwGyAsqgAiaFN7PQMgT2eyA3cA=
+SIZE (libnsbmp-0.1.0-src.tar.gz) = 202252
Index: libnsbmp/patches/patch-build_makefiles_Makefile_top
===================================================================
RCS file: libnsbmp/patches/patch-build_makefiles_Makefile_top
diff -N libnsbmp/patches/patch-build_makefiles_Makefile_top
--- libnsbmp/patches/patch-build_makefiles_Makefile_top 29 Jun 2010 20:11:13
-0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,58 +0,0 @@
-$OpenBSD: patch-build_makefiles_Makefile_top,v 1.1.1.1 2010/06/29 20:11:13
landry Exp $
---- build/makefiles/Makefile.top.orig Fri Jun 25 18:29:19 2010
-+++ build/makefiles/Makefile.top Fri Jun 25 18:31:05 2010
-@@ -94,8 +94,8 @@ endif
- # Makefile variables
- ##############################################################################
-
--Q ?= @
--VQ ?= @
-+Q ?=
-+VQ ?=
-
- ##############################################################################
- # Exported variables (also OUTPUT, further down)
-@@ -188,8 +188,8 @@ endif
- ifeq ($(findstring lib,$(COMPONENT_TYPE)),lib)
- ifeq ($(findstring lib-shared,$(COMPONENT_TYPE)),lib-shared)
- SHAREDLIBNAME := lib$(COMPONENT)$(LIBEXT)
-- SONAME := $(SHAREDLIBNAME).$(major-version)
-- OUTPUT := $(BUILDDIR)/$(SHAREDLIBNAME).$(COMPONENT_VERSION)
-+ SONAME := $(SHAREDLIBNAME).$(LIBnsbmp_VERSION)
-+ OUTPUT := $(BUILDDIR)/$(SHAREDLIBNAME).$(LIBnsbmp_VERSION)
- else
- OUTPUT := $(BUILDDIR)/lib$(COMPONENT)$(LIBEXT)
- endif
-@@ -204,14 +204,6 @@ endif
- .PHONY: all test coverage profile docs clean distclean install uninstall \
- __default __precov __partial_clean __postshared
-
--ifeq ($(COMPONENT_TYPE),lib-shared)
-- POST_TARGETS := __postshared $(POST_TARGETS)
--
--__postshared:
-- $(Q)$(LN) $(LNFLAGS) -f -s $(notdir $(OUTPUT)) $(BUILDDIR)/$(SONAME)
-- $(Q)$(LN) $(LNFLAGS) -f -s $(notdir $(OUTPUT))
$(BUILDDIR)/$(SHAREDLIBNAME)
--endif
--
- # Default target
- all: $(PRE_TARGETS) $(OUTPUT) $(POST_TARGETS)
-
-@@ -272,7 +264,7 @@ __required = $(if $(REQUIRED_PKGS), \
- # Install a pkg-config control file ($1) to the specified location ($2)
- define install_pkgconfig
- $(Q)$(SED) \
-- -e 's#PREFIX#$(PREFIX)#' \
-+ -e 's#PREFIX#$(TRUEPREFIX)#' \
- -e 's#MAJOR#$(major-version)#' \
- -e 's#MINOR#$(minor-version)#' \
- -e 's#PATCH#$(patch-version)#' \
-@@ -287,8 +279,6 @@ endef
- # TODO: Is this scheme portable?
- define install_shared_lib
- $(INSTALL) $(INSTALLFLAGS) -m 755 $1 $2/$(notdir $1)
-- $(LN) $(LNFLAGS) -f -s $(notdir $1) $2/$(SONAME)
-- $(LN) $(LNFLAGS) -f -s $(notdir $1) $2/$(SHAREDLIBNAME)
- endef
-
- # Install a file ($1) to the specified location ($2)
Index: libnsbmp/pkg/PFRAG.shared
===================================================================
RCS file: libnsbmp/pkg/PFRAG.shared
diff -N libnsbmp/pkg/PFRAG.shared
--- libnsbmp/pkg/PFRAG.shared 29 Jun 2010 20:11:13 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2010/06/29 20:11:13 landry Exp $
-@lib lib/libnsbmp.so.${LIBnsbmp_VERSION}
Index: libnsbmp/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/netsurf/libnsbmp/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- libnsbmp/pkg/PLIST 29 Jun 2010 20:11:13 -0000 1.1.1.1
+++ libnsbmp/pkg/PLIST 30 Apr 2013 02:27:35 -0000
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2010/06/29 20:11:13 landry Exp $
-%%SHARED%%
+@comment $OpenBSD$
include/libnsbmp.h
+@lib lib/libnsbmp.so.${LIBnsbmp_VERSION}
lib/pkgconfig/
lib/pkgconfig/libnsbmp.pc
Index: libnsgif/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libnsgif/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- libnsgif/Makefile 5 Mar 2013 08:02:35 -0000 1.4
+++ libnsgif/Makefile 30 Apr 2013 02:27:35 -0000
@@ -3,12 +3,9 @@
COMMENT = GIF decoding library
NETSURF_PROJECT = libnsgif
-NETSURF_VERSION = 0.0.3
-REVISION = 0
-
-WRKDIST = ${WRKDIR}/${DISTNAME}
+NETSURF_VERSION = 0.1.0
CATEGORIES = graphics
-SHARED_LIBS = nsgif 0.0 #0.0.3
+SHARED_LIBS = nsgif 0.0 #0.1.0
.include <bsd.port.mk>
Index: libnsgif/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/libnsgif/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- libnsgif/distinfo 18 Jul 2011 20:02:20 -0000 1.2
+++ libnsgif/distinfo 30 Apr 2013 02:27:35 -0000
@@ -1,5 +1,2 @@
-MD5 (libnsgif-0.0.3-src.tar.gz) = 1PqWeZOemxskN5nWoGI87A==
-RMD160 (libnsgif-0.0.3-src.tar.gz) = R9bWCnHlHnzuQ6RFfH3Kbbgbgtg=
-SHA1 (libnsgif-0.0.3-src.tar.gz) = PtSPKiCQIXF/wuzUhU2hU+TVzSo=
-SHA256 (libnsgif-0.0.3-src.tar.gz) =
H1O7bMRJw7EI12U86HbsWHRfGE1aZnWpXx+oyTffxtU=
-SIZE (libnsgif-0.0.3-src.tar.gz) = 212109
+SHA256 (libnsgif-0.1.0-src.tar.gz) =
59x+6If+/Bnnx5hcWisFeHDg+j3Q3Pwf206Y2h82WTw=
+SIZE (libnsgif-0.1.0-src.tar.gz) = 202604
Index: libnsgif/patches/patch-build_makefiles_Makefile_top
===================================================================
RCS file: libnsgif/patches/patch-build_makefiles_Makefile_top
diff -N libnsgif/patches/patch-build_makefiles_Makefile_top
--- libnsgif/patches/patch-build_makefiles_Makefile_top 18 Jul 2011 20:02:20
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,58 +0,0 @@
-$OpenBSD: patch-build_makefiles_Makefile_top,v 1.2 2011/07/18 20:02:20 landry
Exp $
---- build/makefiles/Makefile.top.orig Sun Mar 13 04:30:18 2011
-+++ build/makefiles/Makefile.top Sun Jun 19 00:31:40 2011
-@@ -92,8 +92,8 @@ endif
- # Makefile variables
- ##############################################################################
-
--Q ?= @
--VQ ?= @
-+Q ?=
-+VQ ?=
-
- ##############################################################################
- # Exported variables (also OUTPUT, further down)
-@@ -185,8 +185,8 @@ endif
- ifeq ($(findstring lib,$(COMPONENT_TYPE)),lib)
- ifeq ($(findstring lib-shared,$(COMPONENT_TYPE)),lib-shared)
- SHAREDLIBNAME := lib$(COMPONENT)$(LIBEXT)
-- SONAME := $(SHAREDLIBNAME).$(major-version)
-- OUTPUT := $(BUILDDIR)/$(SHAREDLIBNAME).$(COMPONENT_VERSION)
-+ SONAME := $(SHAREDLIBNAME).$(LIBnsgif_VERSION)
-+ OUTPUT := $(BUILDDIR)/$(SHAREDLIBNAME).$(LIBnsgif_VERSION)
- else
- OUTPUT := $(BUILDDIR)/lib$(COMPONENT)$(LIBEXT)
- endif
-@@ -201,14 +201,6 @@ endif
- .PHONY: all test coverage profile docs clean distclean install uninstall \
- __default __precov __partial_clean __postshared
-
--ifeq ($(COMPONENT_TYPE),lib-shared)
-- POST_TARGETS := __postshared $(POST_TARGETS)
--
--__postshared:
-- $(Q)$(LN) $(LNFLAGS) -f -s $(notdir $(OUTPUT)) $(BUILDDIR)/$(SONAME)
-- $(Q)$(LN) $(LNFLAGS) -f -s $(notdir $(OUTPUT))
$(BUILDDIR)/$(SHAREDLIBNAME)
--endif
--
- # Default target
- all: $(PRE_TARGETS) $(OUTPUT) $(POST_TARGETS)
-
-@@ -269,7 +261,7 @@ __required = $(if $(REQUIRED_PKGS),Requires: $(subst $
- define install_pkgconfig
- $(Q)$(ECHO) $(ECHOFLAGS) "sed -e... $1 >$(BUILDDIR)/$(1:.in=)"
- $(Q)$(SED) \
-- -e 's#PREFIX#$(PREFIX)#' \
-+ -e 's#PREFIX#$(TRUEPREFIX)#' \
- -e 's#MAJOR#$(major-version)#' \
- -e 's#MINOR#$(minor-version)#' \
- -e 's#PATCH#$(patch-version)#' \
-@@ -284,8 +276,6 @@ endef
- # TODO: Is this scheme portable?
- define install_shared_lib
- $(INSTALL) $(INSTALLFLAGS) -m 755 $1 $2/$(notdir $1)
-- $(LN) $(LNFLAGS) -f -s $(notdir $1) $2/$(SONAME)
-- $(LN) $(LNFLAGS) -f -s $(notdir $1) $2/$(SHAREDLIBNAME)
- endef
-
- # Install a file ($1) to the specified location ($2)
Index: libnsgif/pkg/PFRAG.shared
===================================================================
RCS file: libnsgif/pkg/PFRAG.shared
diff -N libnsgif/pkg/PFRAG.shared
--- libnsgif/pkg/PFRAG.shared 29 Jun 2010 20:11:13 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2010/06/29 20:11:13 landry Exp $
-@lib lib/libnsgif.so.${LIBnsgif_VERSION}
Index: libnsgif/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/netsurf/libnsgif/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- libnsgif/pkg/PLIST 29 Jun 2010 20:11:13 -0000 1.1.1.1
+++ libnsgif/pkg/PLIST 30 Apr 2013 02:27:35 -0000
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2010/06/29 20:11:13 landry Exp $
-%%SHARED%%
+@comment $OpenBSD$
include/libnsgif.h
+@lib lib/libnsgif.so.${LIBnsgif_VERSION}
lib/pkgconfig/
lib/pkgconfig/libnsgif.pc
Index: libparserutils/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libparserutils/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- libparserutils/Makefile 5 Mar 2013 08:02:35 -0000 1.4
+++ libparserutils/Makefile 30 Apr 2013 02:27:35 -0000
@@ -3,11 +3,14 @@
COMMENT = utility library for parser building
NETSURF_PROJECT = libparserutils
-NETSURF_VERSION = 0.1.1
-REVISION = 0
+NETSURF_VERSION = 0.1.2
CATEGORIES = devel
-SHARED_LIBS = parserutils 1.0 #0.1.1
+SHARED_LIBS = parserutils 1.0 #0.1.2
+
+MODULES = converters/libiconv
+
+MAKE_FLAGS += LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv"
pre-build:
echo "CFLAGS += -I${LOCALBASE}/include" \
Index: libparserutils/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/libparserutils/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- libparserutils/distinfo 12 Jan 2012 03:17:08 -0000 1.3
+++ libparserutils/distinfo 30 Apr 2013 02:27:35 -0000
@@ -1,5 +1,2 @@
-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
+SHA256 (libparserutils-0.1.2-src.tar.gz) =
CiHv04gsGZZfVxYcTs2oWjY6cdvgkAMN+mn5rs0hYKo=
+SIZE (libparserutils-0.1.2-src.tar.gz) = 74663
Index: libparserutils/patches/patch-build_makefiles_Makefile_top
===================================================================
RCS file: libparserutils/patches/patch-build_makefiles_Makefile_top
diff -N libparserutils/patches/patch-build_makefiles_Makefile_top
--- libparserutils/patches/patch-build_makefiles_Makefile_top 18 Jul 2011
20:02:54 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,58 +0,0 @@
-$OpenBSD: patch-build_makefiles_Makefile_top,v 1.2 2011/07/18 20:02:54 landry
Exp $
---- build/makefiles/Makefile.top.orig Sun Jun 19 00:12:45 2011
-+++ build/makefiles/Makefile.top Sun Jun 19 00:14:39 2011
-@@ -92,8 +92,8 @@ endif
- # Makefile variables
- ##############################################################################
-
--Q ?= @
--VQ ?= @
-+Q ?=
-+VQ ?=
-
- ##############################################################################
- # Exported variables (also OUTPUT, further down)
-@@ -185,8 +185,8 @@ endif
- ifeq ($(findstring lib,$(COMPONENT_TYPE)),lib)
- ifeq ($(findstring lib-shared,$(COMPONENT_TYPE)),lib-shared)
- SHAREDLIBNAME := lib$(COMPONENT)$(LIBEXT)
-- SONAME := $(SHAREDLIBNAME).$(major-version)
-- OUTPUT := $(BUILDDIR)/$(SHAREDLIBNAME).$(COMPONENT_VERSION)
-+ SONAME := $(SHAREDLIBNAME).$(LIBparserutils_VERSION)
-+ OUTPUT := $(BUILDDIR)/$(SHAREDLIBNAME).$(LIBparserutils_VERSION)
- else
- OUTPUT := $(BUILDDIR)/lib$(COMPONENT)$(LIBEXT)
- endif
-@@ -201,14 +201,6 @@ endif
- .PHONY: all test coverage profile docs clean distclean install uninstall \
- __default __precov __partial_clean __postshared
-
--ifeq ($(COMPONENT_TYPE),lib-shared)
-- POST_TARGETS := __postshared $(POST_TARGETS)
--
--__postshared:
-- $(Q)$(LN) $(LNFLAGS) -f -s $(notdir $(OUTPUT)) $(BUILDDIR)/$(SONAME)
-- $(Q)$(LN) $(LNFLAGS) -f -s $(notdir $(OUTPUT))
$(BUILDDIR)/$(SHAREDLIBNAME)
--endif
--
- # Default target
- all: $(PRE_TARGETS) $(OUTPUT) $(POST_TARGETS)
-
-@@ -269,7 +261,7 @@ __required = $(if $(REQUIRED_PKGS),Requires: $(subst $
- define install_pkgconfig
- $(Q)$(ECHO) $(ECHOFLAGS) "sed -e... $1 >$(BUILDDIR)/$(1:.in=)"
- $(Q)$(SED) \
-- -e 's#PREFIX#$(PREFIX)#' \
-+ -e 's#PREFIX#$(TRUEPREFIX)#' \
- -e 's#MAJOR#$(major-version)#' \
- -e 's#MINOR#$(minor-version)#' \
- -e 's#PATCH#$(patch-version)#' \
-@@ -284,8 +276,6 @@ endef
- # TODO: Is this scheme portable?
- define install_shared_lib
- $(INSTALL) $(INSTALLFLAGS) -m 755 $1 $2/$(notdir $1)
-- $(LN) $(LNFLAGS) -f -s $(notdir $1) $2/$(SONAME)
-- $(LN) $(LNFLAGS) -f -s $(notdir $1) $2/$(SHAREDLIBNAME)
- endef
-
- # Install a file ($1) to the specified location ($2)
Index: libparserutils/patches/patch-libparserutils_pc_in
===================================================================
RCS file: libparserutils/patches/patch-libparserutils_pc_in
diff -N libparserutils/patches/patch-libparserutils_pc_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ libparserutils/patches/patch-libparserutils_pc_in 30 Apr 2013 02:27:35
-0000
@@ -0,0 +1,10 @@
+$OpenBSD$
+--- libparserutils.pc.in.orig Sat Apr 27 13:58:49 2013
++++ libparserutils.pc.in Sat Apr 27 13:59:08 2013
+@@ -6,5 +6,5 @@ includedir=${prefix}/include
+ Name: libparserutils
+ Description: Utility library for facilitating parser development
+ Version: VERSION
+-Libs: -L${libdir} -lparserutils
++Libs: -L${libdir} -lparserutils -liconv
+ Cflags: -I${includedir}
Index: libparserutils/patches/patch-test_cscodec-8859_c
===================================================================
RCS file: libparserutils/patches/patch-test_cscodec-8859_c
diff -N libparserutils/patches/patch-test_cscodec-8859_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ libparserutils/patches/patch-test_cscodec-8859_c 30 Apr 2013 02:27:35
-0000
@@ -0,0 +1,56 @@
+$OpenBSD$
+--- test/cscodec-8859.c.orig Fri Apr 19 12:06:57 2013
++++ test/cscodec-8859.c Thu Apr 25 16:51:19 2013
+@@ -169,7 +169,7 @@ bool handle_line(const char *data, size_t datalen, voi
+ for (end = enc; !isspace(*end); end++)
+ ;
+
+- enc_name = alloca(end - enc + 1);
++ enc_name = malloc(end - enc + 1);
+ memcpy(enc_name, enc, end - enc);
+ enc_name[end - enc] = 0;
+
+@@ -178,6 +178,8 @@ bool handle_line(const char *data, size_t datalen, voi
+ PARSERUTILS_OK);
+
+ ctx->hadenc = true;
++
++ free(enc_name);
+ }
+ } else {
+ if (ctx->indata) {
+@@ -197,7 +199,7 @@ void run_test(line_ctx *ctx)
+ {
+ static int testnum;
+ size_t destlen = ctx->bufused * 4;
+- uint8_t *dest = alloca(destlen);
++ uint8_t *dest = malloc(destlen);
+ uint8_t *pdest = dest;
+ const uint8_t *psrc = ctx->buf;
+ size_t srclen = ctx->bufused;
+@@ -213,7 +215,7 @@ void run_test(line_ctx *ctx)
+ &pdest, &destlen) == ctx->exp_ret);
+ } else {
+ size_t templen = ctx->bufused * 4;
+- uint8_t *temp = alloca(templen);
++ uint8_t *temp = malloc(templen);
+ uint8_t *ptemp = temp;
+ const uint8_t *ptemp2;
+ size_t templen2;
+@@ -237,6 +239,8 @@ void run_test(line_ctx *ctx)
+ assert(templen2 == 0);
+ assert(temp + (ctx->bufused * 4 - templen) == ptemp2);
+ }
++
++ free(temp);
+ }
+ if (ctx->exp_ret == PARSERUTILS_OK) {
+ assert(srclen == 0);
+@@ -259,5 +263,7 @@ void run_test(line_ctx *ctx)
+
+ assert(pdest == dest + ctx->expused);
+ assert(memcmp(dest, ctx->exp, ctx->expused) == 0);
++
++ free(dest);
+ }
+
Index: libparserutils/patches/patch-test_cscodec-ext8_c
===================================================================
RCS file: libparserutils/patches/patch-test_cscodec-ext8_c
diff -N libparserutils/patches/patch-test_cscodec-ext8_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ libparserutils/patches/patch-test_cscodec-ext8_c 30 Apr 2013 02:27:35
-0000
@@ -0,0 +1,56 @@
+$OpenBSD$
+--- test/cscodec-ext8.c.orig Thu Apr 25 14:37:59 2013
++++ test/cscodec-ext8.c Thu Apr 25 14:41:06 2013
+@@ -169,7 +169,7 @@ bool handle_line(const char *data, size_t datalen, voi
+ for (end = enc; !isspace(*end); end++)
+ ;
+
+- enc_name = alloca(end - enc + 1);
++ enc_name = malloc(end - enc + 1);
+ memcpy(enc_name, enc, end - enc);
+ enc_name[end - enc] = 0;
+
+@@ -178,6 +178,8 @@ bool handle_line(const char *data, size_t datalen, voi
+ PARSERUTILS_OK);
+
+ ctx->hadenc = true;
++
++ free(enc_name);
+ }
+ } else {
+ if (ctx->indata) {
+@@ -197,7 +199,7 @@ void run_test(line_ctx *ctx)
+ {
+ static int testnum;
+ size_t destlen = ctx->bufused * 4;
+- uint8_t *dest = alloca(destlen);
++ uint8_t *dest = malloc(destlen);
+ uint8_t *pdest = dest;
+ const uint8_t *psrc = ctx->buf;
+ size_t srclen = ctx->bufused;
+@@ -213,7 +215,7 @@ void run_test(line_ctx *ctx)
+ &pdest, &destlen) == ctx->exp_ret);
+ } else {
+ size_t templen = ctx->bufused * 4;
+- uint8_t *temp = alloca(templen);
++ uint8_t *temp = malloc(templen);
+ uint8_t *ptemp = temp;
+ const uint8_t *ptemp2;
+ size_t templen2;
+@@ -237,6 +239,8 @@ void run_test(line_ctx *ctx)
+ assert(templen2 == 0);
+ assert(temp + (ctx->bufused * 4 - templen) == ptemp2);
+ }
++
++ free(temp);
+ }
+ if (ctx->exp_ret == PARSERUTILS_OK) {
+ assert(srclen == 0);
+@@ -259,5 +263,7 @@ void run_test(line_ctx *ctx)
+
+ assert(pdest == dest + ctx->expused);
+ assert(memcmp(dest, ctx->exp, ctx->expused) == 0);
++
++ free(dest);
+ }
+
Index: libparserutils/patches/patch-test_cscodec-utf16_c
===================================================================
RCS file: libparserutils/patches/patch-test_cscodec-utf16_c
diff -N libparserutils/patches/patch-test_cscodec-utf16_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ libparserutils/patches/patch-test_cscodec-utf16_c 30 Apr 2013 02:27:35
-0000
@@ -0,0 +1,38 @@
+$OpenBSD$
+--- test/cscodec-utf16.c.orig Thu Apr 25 14:42:49 2013
++++ test/cscodec-utf16.c Thu Apr 25 14:43:14 2013
+@@ -255,7 +255,7 @@ void run_test(line_ctx *ctx)
+ {
+ static int testnum;
+ size_t destlen = ctx->bufused * 4;
+- uint8_t *dest = alloca(destlen);
++ uint8_t *dest = malloc(destlen);
+ uint8_t *pdest = dest;
+ const uint8_t *psrc = ctx->buf;
+ size_t srclen = ctx->bufused;
+@@ -271,7 +271,7 @@ void run_test(line_ctx *ctx)
+ &pdest, &destlen) == ctx->exp_ret);
+ } else {
+ size_t templen = ctx->bufused * 4;
+- uint8_t *temp = alloca(templen);
++ uint8_t *temp = malloc(templen);
+ uint8_t *ptemp = temp;
+ const uint8_t *ptemp2;
+ size_t templen2;
+@@ -295,6 +295,8 @@ void run_test(line_ctx *ctx)
+ assert(templen2 == 0);
+ assert(temp + (ctx->bufused * 4 - templen) == ptemp2);
+ }
++
++ free(temp);
+ }
+ if (ctx->exp_ret == PARSERUTILS_OK) {
+ assert(srclen == 0);
+@@ -317,5 +319,7 @@ void run_test(line_ctx *ctx)
+
+ assert(pdest == dest + ctx->expused);
+ assert(memcmp(dest, ctx->exp, ctx->expused) == 0);
++
++ free(dest);
+ }
+
Index: libparserutils/patches/patch-test_cscodec-utf8_c
===================================================================
RCS file: libparserutils/patches/patch-test_cscodec-utf8_c
diff -N libparserutils/patches/patch-test_cscodec-utf8_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ libparserutils/patches/patch-test_cscodec-utf8_c 30 Apr 2013 02:27:35
-0000
@@ -0,0 +1,38 @@
+$OpenBSD$
+--- test/cscodec-utf8.c.orig Thu Apr 25 14:41:15 2013
++++ test/cscodec-utf8.c Thu Apr 25 14:42:29 2013
+@@ -180,7 +180,7 @@ void run_test(line_ctx *ctx)
+ {
+ static int testnum;
+ size_t destlen = ctx->bufused * 4;
+- uint8_t *dest = alloca(destlen);
++ uint8_t *dest = malloc(destlen);
+ uint8_t *pdest = dest;
+ const uint8_t *psrc = ctx->buf;
+ size_t srclen = ctx->bufused;
+@@ -196,7 +196,7 @@ void run_test(line_ctx *ctx)
+ &pdest, &destlen) == ctx->exp_ret);
+ } else {
+ size_t templen = ctx->bufused * 4;
+- uint8_t *temp = alloca(templen);
++ uint8_t *temp = malloc(templen);
+ uint8_t *ptemp = temp;
+ const uint8_t *ptemp2;
+ size_t templen2;
+@@ -220,6 +220,8 @@ void run_test(line_ctx *ctx)
+ assert(templen2 == 0);
+ assert(temp + (ctx->bufused * 4 - templen) == ptemp2);
+ }
++
++ free(temp);
+ }
+ if (ctx->exp_ret == PARSERUTILS_OK) {
+ assert(srclen == 0);
+@@ -242,5 +244,7 @@ void run_test(line_ctx *ctx)
+
+ assert(pdest == dest + ctx->expused);
+ assert(memcmp(dest, ctx->exp, ctx->expused) == 0);
++
++ free(dest);
+ }
+
Index: libparserutils/pkg/PFRAG.shared
===================================================================
RCS file: libparserutils/pkg/PFRAG.shared
diff -N libparserutils/pkg/PFRAG.shared
--- libparserutils/pkg/PFRAG.shared 29 Jun 2010 20:11:13 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2010/06/29 20:11:13 landry Exp $
-@lib lib/libparserutils.so.${LIBparserutils_VERSION}
Index: libparserutils/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/netsurf/libparserutils/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- libparserutils/pkg/PLIST 29 Jun 2010 20:11:13 -0000 1.1.1.1
+++ libparserutils/pkg/PLIST 30 Apr 2013 02:27:35 -0000
@@ -1,5 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2010/06/29 20:11:13 landry Exp $
-%%SHARED%%
+@comment $OpenBSD$
include/parserutils/
include/parserutils/charset/
include/parserutils/charset/codec.h
@@ -16,5 +15,6 @@ include/parserutils/utils/
include/parserutils/utils/buffer.h
include/parserutils/utils/stack.h
include/parserutils/utils/vector.h
+@lib lib/libparserutils.so.${LIBparserutils_VERSION}
lib/pkgconfig/
lib/pkgconfig/libparserutils.pc
Index: libwapcaplet/Makefile
===================================================================
RCS file: /cvs/ports/www/netsurf/libwapcaplet/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- libwapcaplet/Makefile 11 Mar 2013 11:44:43 -0000 1.7
+++ libwapcaplet/Makefile 30 Apr 2013 02:27:35 -0000
@@ -3,13 +3,11 @@
COMMENT = string internment library
NETSURF_PROJECT = libwapcaplet
-NETSURF_VERSION = 0.1.1
-REVISION = 0
+NETSURF_VERSION = 0.2.0
CATEGORIES= devel
-SHARED_LIBS = wapcaplet 1.0 #0.1.1
+SHARED_LIBS = wapcaplet 2.0 #0.2.0
-NO_TEST = Yes #failing test on gcc3 archs
-TEST_DEPENDS += devel/check
+TEST_DEPENDS += devel/check
.include <bsd.port.mk>
Index: libwapcaplet/distinfo
===================================================================
RCS file: /cvs/ports/www/netsurf/libwapcaplet/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- libwapcaplet/distinfo 30 Apr 2012 07:11:58 -0000 1.3
+++ libwapcaplet/distinfo 30 Apr 2013 02:27:35 -0000
@@ -1,5 +1,2 @@
-MD5 (libwapcaplet-0.1.1-src.tar.gz) = m+ySwCnJeMOsk/7md0LoaQ==
-RMD160 (libwapcaplet-0.1.1-src.tar.gz) = CRqNmA3nNvro/xrpGKovkm8rarM=
-SHA1 (libwapcaplet-0.1.1-src.tar.gz) = kcfxTdcTu7s8CIIrOi5oVDbNh8o=
-SHA256 (libwapcaplet-0.1.1-src.tar.gz) =
zwUVnX1RVSNpfOByKM/2pjOdxr3P7D4C47cti3c/Ulg=
-SIZE (libwapcaplet-0.1.1-src.tar.gz) = 18799
+SHA256 (libwapcaplet-0.2.0-src.tar.gz) =
X7SYQbozWwx6FCDZLDpgSA32NpbFA1PAJySqjGtFyyQ=
+SIZE (libwapcaplet-0.2.0-src.tar.gz) = 8894
Index: libwapcaplet/patches/patch-build_makefiles_Makefile_top
===================================================================
RCS file: libwapcaplet/patches/patch-build_makefiles_Makefile_top
diff -N libwapcaplet/patches/patch-build_makefiles_Makefile_top
--- libwapcaplet/patches/patch-build_makefiles_Makefile_top 29 Jun 2010
20:11:13 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,58 +0,0 @@
-$OpenBSD: patch-build_makefiles_Makefile_top,v 1.1.1.1 2010/06/29 20:11:13
landry Exp $
---- build/makefiles/Makefile.top.orig Wed Jun 23 22:56:26 2010
-+++ build/makefiles/Makefile.top Wed Jun 23 22:55:49 2010
-@@ -94,8 +94,8 @@ endif
- # Makefile variables
- ##############################################################################
-
--Q ?= @
--VQ ?= @
-+Q ?=
-+VQ ?=
-
- ##############################################################################
- # Exported variables (also OUTPUT, further down)
-@@ -188,8 +188,8 @@ endif
- ifeq ($(findstring lib,$(COMPONENT_TYPE)),lib)
- ifeq ($(findstring lib-shared,$(COMPONENT_TYPE)),lib-shared)
- SHAREDLIBNAME := lib$(COMPONENT)$(LIBEXT)
-- SONAME := $(SHAREDLIBNAME).$(major-version)
-- OUTPUT := $(BUILDDIR)/$(SHAREDLIBNAME).$(COMPONENT_VERSION)
-+ SONAME := $(SHAREDLIBNAME).$(LIBwapcaplet_VERSION)
-+ OUTPUT := $(BUILDDIR)/$(SHAREDLIBNAME).$(LIBwapcaplet_VERSION)
- else
- OUTPUT := $(BUILDDIR)/lib$(COMPONENT)$(LIBEXT)
- endif
-@@ -204,14 +204,6 @@ endif
- .PHONY: all test coverage profile docs clean distclean install uninstall \
- __default __precov __partial_clean __postshared
-
--ifeq ($(COMPONENT_TYPE),lib-shared)
-- POST_TARGETS := __postshared $(POST_TARGETS)
--
--__postshared:
-- $(Q)$(LN) $(LNFLAGS) -f -s $(notdir $(OUTPUT)) $(BUILDDIR)/$(SONAME)
-- $(Q)$(LN) $(LNFLAGS) -f -s $(notdir $(OUTPUT))
$(BUILDDIR)/$(SHAREDLIBNAME)
--endif
--
- # Default target
- all: $(PRE_TARGETS) $(OUTPUT) $(POST_TARGETS)
-
-@@ -272,7 +264,7 @@ __required = $(if $(REQUIRED_PKGS), \
- # Install a pkg-config control file ($1) to the specified location ($2)
- define install_pkgconfig
- $(Q)$(SED) \
-- -e 's#PREFIX#$(PREFIX)#' \
-+ -e 's#PREFIX#$(TRUEPREFIX)#' \
- -e 's#MAJOR#$(major-version)#' \
- -e 's#MINOR#$(minor-version)#' \
- -e 's#PATCH#$(patch-version)#' \
-@@ -287,8 +279,6 @@ endef
- # TODO: Is this scheme portable?
- define install_shared_lib
- $(INSTALL) $(INSTALLFLAGS) -m 755 $1 $2/$(notdir $1)
-- $(LN) $(LNFLAGS) -f -s $(notdir $1) $2/$(SONAME)
-- $(LN) $(LNFLAGS) -f -s $(notdir $1) $2/$(SHAREDLIBNAME)
- endef
-
- # Install a file ($1) to the specified location ($2)
Index: libwapcaplet/pkg/PFRAG.shared
===================================================================
RCS file: libwapcaplet/pkg/PFRAG.shared
diff -N libwapcaplet/pkg/PFRAG.shared
--- libwapcaplet/pkg/PFRAG.shared 29 Jun 2010 20:11:13 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2010/06/29 20:11:13 landry Exp $
-@lib lib/libwapcaplet.so.${LIBwapcaplet_VERSION}
Index: libwapcaplet/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/netsurf/libwapcaplet/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- libwapcaplet/pkg/PLIST 29 Jun 2010 20:11:13 -0000 1.1.1.1
+++ libwapcaplet/pkg/PLIST 30 Apr 2013 02:27:35 -0000
@@ -1,6 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2010/06/29 20:11:13 landry Exp $
-%%SHARED%%
+@comment $OpenBSD$
include/libwapcaplet/
include/libwapcaplet/libwapcaplet.h
+@lib lib/libwapcaplet.so.${LIBwapcaplet_VERSION}
lib/pkgconfig/
lib/pkgconfig/libwapcaplet.pc
