From 8b05a445740f0b3fc17c255c13c13e9cdbbee162 Mon Sep 17 00:00:00 2001 From: landry Date: Mon, 18 Jul 2011 20:02:54 +0000 Subject: [PATCH] Update to libparserutils 0.1.0, needed by the upcoming netsurf 2.7 update. From Anthony J. Bentley, thanks! --- www/netsurf/libparserutils/Makefile | 6 +++--- www/netsurf/libparserutils/distinfo | 10 +++++----- .../patches/patch-build_makefiles_Makefile_top | 18 +++++++++--------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/www/netsurf/libparserutils/Makefile b/www/netsurf/libparserutils/Makefile index d8e881e6506..18981e2646d 100644 --- a/www/netsurf/libparserutils/Makefile +++ b/www/netsurf/libparserutils/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2010/06/29 20:11:13 landry Exp $ +# $OpenBSD: Makefile,v 1.2 2011/07/18 20:02:54 landry Exp $ 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" \ diff --git a/www/netsurf/libparserutils/distinfo b/www/netsurf/libparserutils/distinfo index 48c50130e52..9929f3a99bf 100644 --- a/www/netsurf/libparserutils/distinfo +++ b/www/netsurf/libparserutils/distinfo @@ -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 diff --git a/www/netsurf/libparserutils/patches/patch-build_makefiles_Makefile_top b/www/netsurf/libparserutils/patches/patch-build_makefiles_Makefile_top index 0f6e816d10f..78ca32eff80 100644 --- a/www/netsurf/libparserutils/patches/patch-build_makefiles_Makefile_top +++ b/www/netsurf/libparserutils/patches/patch-build_makefiles_Makefile_top @@ -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: 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 ############################################################################## @@ -12,7 +12,7 @@ $OpenBSD: patch-build_makefiles_Makefile_top,v 1.1.1.1 2010/06/29 20:11:13 landr ############################################################################## # 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 @@ $OpenBSD: patch-build_makefiles_Makefile_top,v 1.1.1.1 2010/06/29 20:11:13 landr 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 @@ $OpenBSD: patch-build_makefiles_Makefile_top,v 1.1.1.1 2010/06/29 20:11:13 landr # 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)