Attachment 152576 Details for Bug 197323 – new patch for updating the port

[patch] new patch for updating the port

deforaos-surfer-0.2.7.patch (text/plain), 6.78 KB, created by olivier on 2015-02-05 11:09:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: olivier

Created: 2015-02-05 11:09:52 UTC

Size: 6.78 KB

patch

obsolete

>Index: www/deforaos-surfer/Makefile
>===================================================================
>--- www/deforaos-surfer/Makefile	(revision 378422)
>+++ www/deforaos-surfer/Makefile	(working copy)
>@@ -2,10 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	surfer
>-PORTVERSION=	0.2.6
>-PORTREVISION=	2
>+PORTVERSION=	0.2.7
> CATEGORIES=	www
>-MASTER_SITES=	http://www.defora.org/os/download/download/3709/
>+MASTER_SITES=	http://www.defora.org/os/download/download/4345/
> PKGNAMEPREFIX=	deforaos-
> DISTNAME=	Surfer-${PORTVERSION}
> 
>@@ -14,10 +13,6 @@
> 
> LICENSE=	GPLv3
> 
>-BROKEN=		Fails to build
>-
>-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
>-		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
> LIB_DEPENDS=	libSystem.so:${PORTSDIR}/devel/deforaos-libsystem \
> 		libDesktop.so:${PORTSDIR}/x11/deforaos-libdesktop \
> 		libgnet-2.0.so:${PORTSDIR}/net/gnet2 \
>@@ -25,10 +20,19 @@
> RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
> 
> USE_GNOME=	gtk20
>-USES=		pkgconfig gettext
>+USES=		desktop-file-utils pkgconfig gettext
> INSTALLS_ICONS=	yes
> 
> MAKE_ARGS=	PREFIX=${PREFIX}
> MAKE_ENV+=	MANDIR=${STAGEDIR}${MANPREFIX}/man
> 
>+post-patch:
>+	@${REINPLACE_CMD} 's|data doc po|data po|' \
>+		${WRKSRC}/Makefile
>+
>+post-install:
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/download
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/surfer
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/helper
>+
> .include <bsd.port.mk>
>Index: www/deforaos-surfer/distinfo
>===================================================================
>--- www/deforaos-surfer/distinfo	(revision 378422)
>+++ www/deforaos-surfer/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (Surfer-0.2.6.tar.gz) = 5f7c6ebd98d2edccef4be9beff82d697727582c45a638c22b21c8bf985505d30
>-SIZE (Surfer-0.2.6.tar.gz) = 75870
>+SHA256 (Surfer-0.2.7.tar.gz) = ddabc709866a067b086cfd25ab488ce153685c4298f31bb343e330a3ba3d145c
>+SIZE (Surfer-0.2.7.tar.gz) = 88108
>Index: www/deforaos-surfer/files/patch-doc__Makefile
>===================================================================
>--- www/deforaos-surfer/files/patch-doc__Makefile	(revision 378422)
>+++ www/deforaos-surfer/files/patch-doc__Makefile	(working copy)
>@@ -1,20 +0,0 @@
>---- ./doc/Makefile.orig	2012-10-14 19:21:29.000000000 +0200
>-+++ ./doc/Makefile	2012-12-19 13:31:00.833357884 +0100
>-@@ -1,4 +1,4 @@
>--TARGETS	= download.1 download.html helper.1 helper.html surfer.1 surfer.html
>-+TARGETS	= download.1 helper.1 surfer.1
>- PREFIX	= /usr/local
>- DESTDIR	=
>- RM	?= rm -f
>-@@ -35,11 +35,8 @@
>- 
>- install: $(TARGETS)
>- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "download.1"
>--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "download.html"
>- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "helper.1"
>--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "helper.html"
>- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "surfer.1"
>--	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "surfer.html"
>- 
>- uninstall:
>- 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "download.1"
>Index: www/deforaos-surfer/files/patch-ghtml-webkit.c
>===================================================================
>--- www/deforaos-surfer/files/patch-ghtml-webkit.c	(revision 0)
>+++ www/deforaos-surfer/files/patch-ghtml-webkit.c	(working copy)
>@@ -0,0 +1,12 @@
>+--- src/ghtml-webkit.c.orig	2015-02-03 21:41:14.728793636 +0100
>++++ src/ghtml-webkit.c	2015-02-03 21:41:39.669804743 +0100
>+@@ -207,7 +207,8 @@
>+ 		"/etc/ssl/certs/ca-certificates.crt",
>+ 		"/etc/openssl/certs/ca-certificates.crt",
>+ 		PREFIX "/etc/ssl/certs/ca-certificates.crt",
>+-		PREFIX "/etc/openssl/certs/ca-certificates.crt"
>++		PREFIX "/etc/openssl/certs/ca-certificates.crt",
>++		PREFIX "/share/certs/ca-root-nss.crt"
>+ 	};
>+ 	size_t i;
>+ #endif
>
>Property changes on: www/deforaos-surfer/files/patch-ghtml-webkit.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/deforaos-surfer/files/patch-ghtml-webkit.diff
>===================================================================
>--- www/deforaos-surfer/files/patch-ghtml-webkit.diff	(revision 378422)
>+++ www/deforaos-surfer/files/patch-ghtml-webkit.diff	(working copy)
>@@ -1,12 +0,0 @@
>---- src/ghtml-webkit.c.orig	2012-10-21 14:12:06.000000000 +0200
>-+++ src/ghtml-webkit.c	2012-10-21 14:13:02.000000000 +0200
>-@@ -160,7 +160,8 @@
>- 		"/etc/ssl/certs/ca-certificates.crt",
>- 		"/etc/openssl/certs/ca-certificates.crt",
>- 		PREFIX "/etc/ssl/certs/ca-certificates.crt",
>--		PREFIX "/etc/openssl/certs/ca-certificates.crt"
>-+		PREFIX "/etc/openssl/certs/ca-certificates.crt",
>-+		PREFIX "/share/certs/ca-root-nss.crt"
>- 	};
>- 	size_t i;
>- #endif
>Index: www/deforaos-surfer/files/patch-src-download.c
>===================================================================
>--- www/deforaos-surfer/files/patch-src-download.c	(revision 0)
>+++ www/deforaos-surfer/files/patch-src-download.c	(working copy)
>@@ -0,0 +1,10 @@
>+--- src/download.c.orig	2015-02-04 15:42:08.947324133 +0100
>++++ src/download.c	2015-02-04 15:46:14.898892516 +0100
>+@@ -29,6 +29,7 @@
>+ #include <errno.h>
>+ #include <locale.h>
>+ #include <libintl.h>
>++#include <netdb.h>
>+ #include <gtk/gtk.h>
>+ #if GTK_CHECK_VERSION(3, 0, 0)
>+ # include <gtk/gtkx.h>
>
>Property changes on: www/deforaos-surfer/files/patch-src-download.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/deforaos-surfer/pkg-plist
>===================================================================
>--- www/deforaos-surfer/pkg-plist	(revision 378422)
>+++ www/deforaos-surfer/pkg-plist	(working copy)
>@@ -1,11 +1,8 @@
> bin/download
> bin/surfer
> bin/helper
>-man/man1/download.1.gz
>-man/man1/helper.1.gz
>-man/man1/surfer.1.gz
>-share/applications/surfer.desktop
>-share/applications/helper.desktop
>+share/applications/deforaos-helper.desktop
>+share/applications/deforaos-surfer.desktop
> share/icons/hicolor/16x16/apps/surfer-view-html-source.png
> share/icons/hicolor/24x24/apps/surfer-view-html-source.png
> share/locale/de/LC_MESSAGES/Surfer.mo
>@@ -12,9 +9,9 @@
> share/locale/es/LC_MESSAGES/Surfer.mo
> share/locale/fr/LC_MESSAGES/Surfer.mo
> share/locale/it/LC_MESSAGES/Surfer.mo
>-@dirrmtry share/icons/hicolor/24x24/apps
>-@dirrmtry share/icons/hicolor/24x24
>-@dirrmtry share/icons/hicolor/16x16/apps
>-@dirrmtry share/icons/hicolor/16x16
>-@dirrmtry share/icons/hicolor
>-@dirrmtry share/icons
>+@dir share/icons/hicolor/24x24/apps
>+@dir share/icons/hicolor/24x24
>+@dir share/icons/hicolor/16x16/apps
>+@dir share/icons/hicolor/16x16
>+@dir share/icons/hicolor
>+@dir share/icons

Actions: View | Diff

Attachments on bug 197323: 152554 | 152555 | 152576 | 152577 | 152583 | 152592 | 152593 | 152601