Index: Makefile.inc =================================================================== RCS file: /cvs/ports/www/netsurf/Makefile.inc,v retrieving revision 1.1.1.1 diff -u Makefile.inc --- Makefile.inc 29 Jun 2010 20:11:13 -0000 1.1.1.1 +++ Makefile.inc 23 Jun 2011 02:57:30 -0000 @@ -17,7 +17,6 @@ PERMIT_DISTFILES_FTP= Yes DESTDIRNAME = ${DESTDIR} -WRKDIST ?= ${WRKDIR}/${DISTNAME:S/-src//} REGRESS_TARGET =test USE_GMAKE = Yes Index: browser/Makefile =================================================================== RCS file: /cvs/ports/www/netsurf/browser/Makefile,v retrieving revision 1.7 diff -u browser/Makefile --- browser/Makefile 22 Nov 2010 08:36:49 -0000 1.7 +++ browser/Makefile 23 Jun 2011 02:57:30 -0000 @@ -3,15 +3,16 @@ COMMENT = lightweight web browser NETSURF_PROJECT = netsurf -NETSURF_VERSION = 2.6 -REVISION= 0 +NETSURF_VERSION = 2.7 CATEGORIES= www HOMEPAGE= http://www.netsurf-browser.org/ MASTER_SITES = ${HOMEPAGE}downloads/releases/ -MODULE = devel/gettext +MODULES = devel/gettext \ + textproc/intltool \ + converters/libiconv LIB_DEPENDS = www/netsurf/hubbub \ www/netsurf/libcss \ @@ -29,9 +30,9 @@ 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 xcb-render-util z gdk_pixbuf-2.0 +WANTLIB += xcb-render z gdk_pixbuf-2.0 GL Xxf86vm drm iconv WANTLIB += hubbub css nsgif nsbmp mng gdk-x11-2.0 gtk-x11-2.0 -WANTLIB += glade-2.0 rsvg-2 curl +WANTLIB += glade-2.0 rsvg-2 curl intl xcb-shm WRKDIST = ${WRKDIR}/netsurf Index: browser/distinfo =================================================================== RCS file: /cvs/ports/www/netsurf/browser/distinfo,v retrieving revision 1.2 diff -u browser/distinfo --- browser/distinfo 30 Sep 2010 19:45:04 -0000 1.2 +++ browser/distinfo 23 Jun 2011 02:57:30 -0000 @@ -1,5 +1,5 @@ -MD5 (netsurf-2.6-src.tar.gz) = hlN4nS7ebbv+eYgq/HU4/A== -RMD160 (netsurf-2.6-src.tar.gz) = jewGz1cL5x8UExMt7y3VON0s6eI= -SHA1 (netsurf-2.6-src.tar.gz) = f+8Z5TcuK+LrX4psalTgdpQG8zQ= -SHA256 (netsurf-2.6-src.tar.gz) = NmrRXhh5d2tUiC/W8/pOQhoElkTAKeTBT8Fjt2xvwZA= -SIZE (netsurf-2.6-src.tar.gz) = 1766352 +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 Index: browser/patches/patch-Makefile =================================================================== RCS file: /cvs/ports/www/netsurf/browser/patches/patch-Makefile,v retrieving revision 1.3 diff -u browser/patches/patch-Makefile --- browser/patches/patch-Makefile 30 Sep 2010 19:45:04 -0000 1.3 +++ browser/patches/patch-Makefile 23 Jun 2011 02:57:30 -0000 @@ -3,9 +3,9 @@ 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 Tue Sep 21 21:35:54 2010 -+++ Makefile Thu Sep 30 21:37:56 2010 -@@ -110,8 +110,8 @@ ifneq ($(TARGET),riscos) +--- 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 @@ -16,7 +16,7 @@ PERL=perl MKDIR=mkdir TOUCH=touch -@@ -198,7 +198,7 @@ OBJROOT = build-$(HOST)-$(TARGET)$(SUBTARGET) +@@ -318,7 +318,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 \ @@ -25,11 +25,3 @@ -Wnested-externs ifneq ($(GCCVER),2) WARNFLAGS += -Wno-unused-parameter -@@ -452,7 +452,6 @@ ifeq ($(TARGET),gtk) - $(eval $(call pkg_config_find_and_add,PNG,libpng,PNG )) - - GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \ -- -DGTK_DISABLE_DEPRECATED \ - -D_BSD_SOURCE \ - -D_XOPEN_SOURCE=600 \ - -D_POSIX_C_SOURCE=200112L \ ? browser/patches/patch-gtk_Makefile_target Index: browser/pkg/PLIST =================================================================== RCS file: /cvs/ports/www/netsurf/browser/pkg/PLIST,v retrieving revision 1.2 diff -u browser/pkg/PLIST --- browser/pkg/PLIST 30 Sep 2010 19:45:04 -0000 1.2 +++ browser/pkg/PLIST 23 Jun 2011 02:57:30 -0000 @@ -1,7 +1,6 @@ @comment $OpenBSD: PLIST,v 1.2 2010/09/30 19:45:04 landry Exp $ @bin bin/netsurf share/netsurf/ -share/netsurf/Aliases share/netsurf/C/ share/netsurf/C/Messages share/netsurf/SearchEngines @@ -9,21 +8,26 @@ share/netsurf/arrow_down_8x32.png share/netsurf/blankpage share/netsurf/ca-bundle.txt +share/netsurf/cookies.glade share/netsurf/de/ share/netsurf/de/Messages share/netsurf/default.css share/netsurf/default.ico -share/netsurf/docs/ -share/netsurf/docs/about/ -share/netsurf/docs/about/index_en,faf share/netsurf/downloads.glade share/netsurf/en/ share/netsurf/en/Messages +share/netsurf/en/credits.html +share/netsurf/en/licence.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/icons/ +share/netsurf/icons/content.png +share/netsurf/icons/directory.png +share/netsurf/internal.css share/netsurf/it/ share/netsurf/it/Messages share/netsurf/languages @@ -31,6 +35,7 @@ share/netsurf/login.glade share/netsurf/netsurf-16x16.xpm share/netsurf/netsurf.glade +share/netsurf/netsurf.png share/netsurf/netsurf.xpm share/netsurf/nl/ share/netsurf/nl/Messages Index: hubbub/Makefile =================================================================== RCS file: /cvs/ports/www/netsurf/hubbub/Makefile,v retrieving revision 1.4 diff -u hubbub/Makefile --- hubbub/Makefile 22 Nov 2010 08:36:49 -0000 1.4 +++ hubbub/Makefile 23 Jun 2011 02:57:30 -0000 @@ -3,10 +3,10 @@ COMMENT = HTML parser NETSURF_PROJECT = hubbub -NETSURF_VERSION = 0.0.2 +NETSURF_VERSION = 0.1.0 CATEGORIES = www -SHARED_LIBS = hubbub 0.0 #0.0.2 +SHARED_LIBS = hubbub 1.0 #0.1.0 LIB_DEPENDS = www/netsurf/libparserutils WANTLIB = parserutils Index: hubbub/distinfo =================================================================== RCS file: /cvs/ports/www/netsurf/hubbub/distinfo,v retrieving revision 1.1.1.1 diff -u hubbub/distinfo --- hubbub/distinfo 29 Jun 2010 20:11:13 -0000 1.1.1.1 +++ hubbub/distinfo 23 Jun 2011 02:57:30 -0000 @@ -1,5 +1,5 @@ -MD5 (hubbub-0.0.2-src.tar.gz) = 29xrsTpxznI4TX7liRoDgg== -RMD160 (hubbub-0.0.2-src.tar.gz) = mhsqYQhclwICgc31cZ4uKIUtJRw= -SHA1 (hubbub-0.0.2-src.tar.gz) = j3w2ZleL3TBvunZ91t0sAxBXzg0= -SHA256 (hubbub-0.0.2-src.tar.gz) = /RlbkegO8uofVY+UvVu134kiixrz6bfFwQOfZdUGqh0= -SIZE (hubbub-0.0.2-src.tar.gz) = 817514 +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 Index: hubbub/patches/patch-build_makefiles_Makefile_top =================================================================== RCS file: /cvs/ports/www/netsurf/hubbub/patches/patch-build_makefiles_Makefile_top,v retrieving revision 1.1.1.1 diff -u hubbub/patches/patch-build_makefiles_Makefile_top --- hubbub/patches/patch-build_makefiles_Makefile_top 29 Jun 2010 20:11:13 -0000 1.1.1.1 +++ hubbub/patches/patch-build_makefiles_Makefile_top 23 Jun 2011 02:57:30 -0000 @@ -1,7 +1,7 @@ $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:53:05 2010 -+++ build/makefiles/Makefile.top Fri Jun 25 18:54:01 2010 -@@ -94,8 +94,8 @@ endif +--- 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 ############################################################################## @@ -12,7 +12,7 @@ ############################################################################## # Exported variables (also OUTPUT, further down) -@@ -188,8 +188,8 @@ endif +@@ -185,8 +185,8 @@ endif ifeq ($(findstring lib,$(COMPONENT_TYPE)),lib) ifeq ($(findstring lib-shared,$(COMPONENT_TYPE)),lib-shared) SHAREDLIBNAME := lib$(COMPONENT)$(LIBEXT) @@ -23,7 +23,7 @@ else OUTPUT := $(BUILDDIR)/lib$(COMPONENT)$(LIBEXT) endif -@@ -204,14 +204,6 @@ endif +@@ -201,14 +201,6 @@ endif .PHONY: all test coverage profile docs clean distclean install uninstall \ __default __precov __partial_clean __postshared @@ -38,16 +38,16 @@ # 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) +@@ -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)#' \ -@@ -287,8 +279,6 @@ endef +@@ -284,8 +276,6 @@ endef # TODO: Is this scheme portable? define install_shared_lib $(INSTALL) $(INSTALLFLAGS) -m 755 $1 $2/$(notdir $1) Index: libcss/Makefile =================================================================== RCS file: /cvs/ports/www/netsurf/libcss/Makefile,v retrieving revision 1.4 diff -u libcss/Makefile --- libcss/Makefile 22 Nov 2010 08:36:49 -0000 1.4 +++ libcss/Makefile 23 Jun 2011 02:57:30 -0000 @@ -3,10 +3,10 @@ COMMENT = CSS parser and selection engine NETSURF_PROJECT = libcss -NETSURF_VERSION = 0.0.2 +NETSURF_VERSION = 0.1.0 CATEGORIES = www -SHARED_LIBS = css 0.0 #0.0.2 +SHARED_LIBS = css 1.0 #0.1.0 WANTLIB = parserutils wapcaplet LIB_DEPENDS = www/netsurf/libparserutils \ Index: libcss/distinfo =================================================================== RCS file: /cvs/ports/www/netsurf/libcss/distinfo,v retrieving revision 1.2 diff -u libcss/distinfo --- libcss/distinfo 30 Sep 2010 19:44:06 -0000 1.2 +++ libcss/distinfo 23 Jun 2011 02:57:30 -0000 @@ -1,5 +1,5 @@ -MD5 (libcss-0.0.2-src.tar.gz) = O73YU6L1LberDi6jWX5i+g== -RMD160 (libcss-0.0.2-src.tar.gz) = MFDYvWT+47BTzEAGzvFb49jB39E= -SHA1 (libcss-0.0.2-src.tar.gz) = IkDwOAXPeAr0aLySb0M8Q2cHy90= -SHA256 (libcss-0.0.2-src.tar.gz) = UgU1HLMjEXPt7ViFwiy30cJq5m08MMSOL7gmcZ14mJo= -SIZE (libcss-0.0.2-src.tar.gz) = 443565 +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 Index: libcss/patches/patch-build_makefiles_Makefile_top =================================================================== RCS file: /cvs/ports/www/netsurf/libcss/patches/patch-build_makefiles_Makefile_top,v retrieving revision 1.1.1.1 diff -u libcss/patches/patch-build_makefiles_Makefile_top --- libcss/patches/patch-build_makefiles_Makefile_top 29 Jun 2010 20:11:13 -0000 1.1.1.1 +++ libcss/patches/patch-build_makefiles_Makefile_top 23 Jun 2011 02:57:30 -0000 @@ -1,7 +1,7 @@ $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:45:10 2010 -+++ build/makefiles/Makefile.top Fri Jun 25 18:47:17 2010 -@@ -94,8 +94,8 @@ endif +--- 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 ############################################################################## @@ -12,7 +12,7 @@ ############################################################################## # Exported variables (also OUTPUT, further down) -@@ -188,8 +188,8 @@ endif +@@ -185,8 +185,8 @@ endif ifeq ($(findstring lib,$(COMPONENT_TYPE)),lib) ifeq ($(findstring lib-shared,$(COMPONENT_TYPE)),lib-shared) SHAREDLIBNAME := lib$(COMPONENT)$(LIBEXT) @@ -23,7 +23,7 @@ else OUTPUT := $(BUILDDIR)/lib$(COMPONENT)$(LIBEXT) endif -@@ -204,14 +204,6 @@ endif +@@ -201,14 +201,6 @@ endif .PHONY: all test coverage profile docs clean distclean install uninstall \ __default __precov __partial_clean __postshared @@ -38,16 +38,16 @@ # 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) +@@ -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)#' \ -@@ -287,8 +279,6 @@ endef +@@ -284,8 +276,6 @@ endef # TODO: Is this scheme portable? define install_shared_lib $(INSTALL) $(INSTALLFLAGS) -m 755 $1 $2/$(notdir $1) Index: libnsbmp/Makefile =================================================================== RCS file: /cvs/ports/www/netsurf/libnsbmp/Makefile,v retrieving revision 1.1.1.1 diff -u libnsbmp/Makefile --- libnsbmp/Makefile 29 Jun 2010 20:11:13 -0000 1.1.1.1 +++ libnsbmp/Makefile 23 Jun 2011 02:57:30 -0000 @@ -3,9 +3,9 @@ COMMENT = BMP/ICO decoding library NETSURF_PROJECT = libnsbmp -NETSURF_VERSION = 0.0.2 +NETSURF_VERSION = 0.0.3 CATEGORIES = graphics -SHARED_LIBS = nsbmp 0.0 #0.0.2 +SHARED_LIBS = nsbmp 0.0 #0.0.3 .include Index: libnsbmp/distinfo =================================================================== RCS file: /cvs/ports/www/netsurf/libnsbmp/distinfo,v retrieving revision 1.1.1.1 diff -u libnsbmp/distinfo --- libnsbmp/distinfo 29 Jun 2010 20:11:13 -0000 1.1.1.1 +++ libnsbmp/distinfo 23 Jun 2011 02:57:30 -0000 @@ -1,5 +1,5 @@ -MD5 (libnsbmp-0.0.2-src.tar.gz) = YZb1Ij90THxkk0IdIF5ZHA== -RMD160 (libnsbmp-0.0.2-src.tar.gz) = llNY9Yef1zjXqYtZOt1ynILcReA= -SHA1 (libnsbmp-0.0.2-src.tar.gz) = 55yZvR31NFz4kMmo5DQQpY0Y3AQ= -SHA256 (libnsbmp-0.0.2-src.tar.gz) = sYuSUrJ0aZN5yt/zmOQMcnkwyfz7a8+O09NG56k8cg4= -SIZE (libnsbmp-0.0.2-src.tar.gz) = 217781 +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 Index: libnsgif/Makefile =================================================================== RCS file: /cvs/ports/www/netsurf/libnsgif/Makefile,v retrieving revision 1.1.1.1 diff -u libnsgif/Makefile --- libnsgif/Makefile 29 Jun 2010 20:11:13 -0000 1.1.1.1 +++ libnsgif/Makefile 23 Jun 2011 02:57:30 -0000 @@ -3,9 +3,9 @@ COMMENT = GIF decoding library NETSURF_PROJECT = libnsgif -NETSURF_VERSION = 0.0.2 +NETSURF_VERSION = 0.0.3 CATEGORIES = graphics -SHARED_LIBS = nsgif 0.0 #0.0.2 +SHARED_LIBS = nsgif 0.0 #0.0.3 .include Index: libnsgif/distinfo =================================================================== RCS file: /cvs/ports/www/netsurf/libnsgif/distinfo,v retrieving revision 1.1.1.1 diff -u libnsgif/distinfo --- libnsgif/distinfo 29 Jun 2010 20:11:13 -0000 1.1.1.1 +++ libnsgif/distinfo 23 Jun 2011 02:57:30 -0000 @@ -1,5 +1,5 @@ -MD5 (libnsgif-0.0.2-src.tar.gz) = CN1fw+ozB4T2weVcWCRHSQ== -RMD160 (libnsgif-0.0.2-src.tar.gz) = L15JroLfCFv3mQ9e5Vx6hXS0jtI= -SHA1 (libnsgif-0.0.2-src.tar.gz) = BGNOXGIJEUU1gs34lUDsFzBO95s= -SHA256 (libnsgif-0.0.2-src.tar.gz) = 3LaL5qSezDds+ig9Lx5+rgNcdfmcCTSsgJUeF3cFlhc= -SIZE (libnsgif-0.0.2-src.tar.gz) = 209951 +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 Index: libnsgif/patches/patch-build_makefiles_Makefile_top =================================================================== RCS file: /cvs/ports/www/netsurf/libnsgif/patches/patch-build_makefiles_Makefile_top,v retrieving revision 1.1.1.1 diff -u libnsgif/patches/patch-build_makefiles_Makefile_top --- libnsgif/patches/patch-build_makefiles_Makefile_top 29 Jun 2010 20:11:13 -0000 1.1.1.1 +++ libnsgif/patches/patch-build_makefiles_Makefile_top 23 Jun 2011 02:57:30 -0000 @@ -1,7 +1,7 @@ $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:35:10 2010 -+++ build/makefiles/Makefile.top Fri Jun 25 18:36:41 2010 -@@ -94,8 +94,8 @@ endif +--- 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 ############################################################################## @@ -12,7 +12,7 @@ ############################################################################## # Exported variables (also OUTPUT, further down) -@@ -188,8 +188,8 @@ endif +@@ -185,8 +185,8 @@ endif ifeq ($(findstring lib,$(COMPONENT_TYPE)),lib) ifeq ($(findstring lib-shared,$(COMPONENT_TYPE)),lib-shared) SHAREDLIBNAME := lib$(COMPONENT)$(LIBEXT) @@ -23,7 +23,7 @@ else OUTPUT := $(BUILDDIR)/lib$(COMPONENT)$(LIBEXT) endif -@@ -204,14 +204,6 @@ endif +@@ -201,14 +201,6 @@ endif .PHONY: all test coverage profile docs clean distclean install uninstall \ __default __precov __partial_clean __postshared @@ -38,16 +38,16 @@ # 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) +@@ -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)#' \ -@@ -287,8 +279,6 @@ endef +@@ -284,8 +276,6 @@ endef # TODO: Is this scheme portable? define install_shared_lib $(INSTALL) $(INSTALLFLAGS) -m 755 $1 $2/$(notdir $1) Index: libparserutils/Makefile =================================================================== RCS file: /cvs/ports/www/netsurf/libparserutils/Makefile,v retrieving revision 1.1.1.1 diff -u libparserutils/Makefile --- libparserutils/Makefile 29 Jun 2010 20:11:13 -0000 1.1.1.1 +++ libparserutils/Makefile 23 Jun 2011 02:57:30 -0000 @@ -3,10 +3,10 @@ COMMENT = utility library for parser building NETSURF_PROJECT = libparserutils -NETSURF_VERSION = 0.0.2 +NETSURF_VERSION = 0.1.0 CATEGORIES = devel -SHARED_LIBS = parserutils 0.0 #0.0.2 +SHARED_LIBS = parserutils 1.0 #0.1.0 pre-build: echo "CFLAGS += -DWITH_ICONV_FILTER" \ Index: libparserutils/distinfo =================================================================== RCS file: /cvs/ports/www/netsurf/libparserutils/distinfo,v retrieving revision 1.1.1.1 diff -u libparserutils/distinfo --- libparserutils/distinfo 29 Jun 2010 20:11:13 -0000 1.1.1.1 +++ libparserutils/distinfo 23 Jun 2011 02:57:30 -0000 @@ -1,5 +1,5 @@ -MD5 (libparserutils-0.0.2-src.tar.gz) = Wy5N3uvkUcyAHM1ufaBvhw== -RMD160 (libparserutils-0.0.2-src.tar.gz) = 8nU3Dlzfnt+yiByIfHeq42fi+dQ= -SHA1 (libparserutils-0.0.2-src.tar.gz) = zyxty8rOXCJkXCbcYMHrTJyaFaA= -SHA256 (libparserutils-0.0.2-src.tar.gz) = dpvo2lyaAS0tlo/IFFZ8EGf+vz099eGPGuJSEyTc2SM= -SIZE (libparserutils-0.0.2-src.tar.gz) = 95884 +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 Index: libparserutils/patches/patch-build_makefiles_Makefile_top =================================================================== RCS file: /cvs/ports/www/netsurf/libparserutils/patches/patch-build_makefiles_Makefile_top,v retrieving revision 1.1.1.1 diff -u libparserutils/patches/patch-build_makefiles_Makefile_top --- libparserutils/patches/patch-build_makefiles_Makefile_top 29 Jun 2010 20:11:13 -0000 1.1.1.1 +++ libparserutils/patches/patch-build_makefiles_Makefile_top 23 Jun 2011 02:57:30 -0000 @@ -1,7 +1,7 @@ -$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 Jan 6 02:41:30 2010 -+++ build/makefiles/Makefile.top Wed Jun 23 22:48:17 2010 -@@ -94,8 +94,8 @@ endif +$OpenBSD$ +--- 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 ############################################################################## @@ -12,7 +12,7 @@ ############################################################################## # Exported variables (also OUTPUT, further down) -@@ -188,8 +188,8 @@ endif +@@ -185,8 +185,8 @@ endif ifeq ($(findstring lib,$(COMPONENT_TYPE)),lib) ifeq ($(findstring lib-shared,$(COMPONENT_TYPE)),lib-shared) SHAREDLIBNAME := lib$(COMPONENT)$(LIBEXT) @@ -23,7 +23,7 @@ else OUTPUT := $(BUILDDIR)/lib$(COMPONENT)$(LIBEXT) endif -@@ -204,14 +204,6 @@ endif +@@ -201,14 +201,6 @@ endif .PHONY: all test coverage profile docs clean distclean install uninstall \ __default __precov __partial_clean __postshared @@ -38,16 +38,16 @@ # 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) +@@ -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)#' \ -@@ -287,8 +279,6 @@ endef +@@ -284,8 +276,6 @@ endef # TODO: Is this scheme portable? define install_shared_lib $(INSTALL) $(INSTALLFLAGS) -m 755 $1 $2/$(notdir $1) Index: libwapcaplet/Makefile =================================================================== RCS file: /cvs/ports/www/netsurf/libwapcaplet/Makefile,v retrieving revision 1.2 diff -u libwapcaplet/Makefile --- libwapcaplet/Makefile 22 Nov 2010 08:36:49 -0000 1.2 +++ libwapcaplet/Makefile 23 Jun 2011 02:57:30 -0000 @@ -3,10 +3,10 @@ COMMENT = string internment library NETSURF_PROJECT = libwapcaplet -NETSURF_VERSION = 0.0.2 +NETSURF_VERSION = 0.1.0 CATEGORIES= devel -SHARED_LIBS = wapcaplet 0.0 #0.0.2 +SHARED_LIBS = wapcaplet 1.0 #0.1.0 NO_REGRESS = Yes #failing test on gcc3 archs REGRESS_DEPENDS += devel/check Index: libwapcaplet/distinfo =================================================================== RCS file: /cvs/ports/www/netsurf/libwapcaplet/distinfo,v retrieving revision 1.1.1.1 diff -u libwapcaplet/distinfo --- libwapcaplet/distinfo 29 Jun 2010 20:11:13 -0000 1.1.1.1 +++ libwapcaplet/distinfo 23 Jun 2011 02:57:30 -0000 @@ -1,5 +1,5 @@ -MD5 (libwapcaplet-0.0.2-src.tar.gz) = xztf9fzlWBnMaY6MtIbV6w== -RMD160 (libwapcaplet-0.0.2-src.tar.gz) = NNWi5bmnMxkSkhE4vxXepFqUPJk= -SHA1 (libwapcaplet-0.0.2-src.tar.gz) = 2zqy1aEL8QcY1B9de86dJQRufUE= -SHA256 (libwapcaplet-0.0.2-src.tar.gz) = QkYhXO/2IKiC0XCz70q6oE/LQZASKmK26bPmYquICGk= -SIZE (libwapcaplet-0.0.2-src.tar.gz) = 18227 +MD5 (libwapcaplet-0.1.0-src.tar.gz) = whl1uBvNr6YK1rl7lZJe/g== +RMD160 (libwapcaplet-0.1.0-src.tar.gz) = Bvi/v9g8UBlB1e/7lQn0/cKQhhc= +SHA1 (libwapcaplet-0.1.0-src.tar.gz) = kDAswmkME8HGgpXiRFk44o5H/BE= +SHA256 (libwapcaplet-0.1.0-src.tar.gz) = 5Y351O4YNElG1cfBf7mfKSaQJ9r9h14v4Qux+51/wac= +SIZE (libwapcaplet-0.1.0-src.tar.gz) = 18926