Date: Fri, 4 Mar 2016 15:02:50 +0000 (UTC) From: Olivier Cochard <olivier@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410126 - in head/www/deforaos-surfer: . files Message-ID: <201603041502.u24F2oeW014584@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olivier Date: Fri Mar 4 15:02:50 2016 New Revision: 410126 URL: https://svnweb.freebsd.org/changeset/ports/410126 Log: Update to 0.2.9, add DOCS and NLS options Approved by: tabthorpe Differential Revision: https://reviews.freebsd.org/D5552 Added: head/www/deforaos-surfer/files/patch-doc_Makefile (contents, props changed) head/www/deforaos-surfer/files/patch-src_download.c (contents, props changed) head/www/deforaos-surfer/files/patch-src_ghtml-webkit.c (contents, props changed) Deleted: head/www/deforaos-surfer/files/patch-ghtml-webkit.c head/www/deforaos-surfer/files/patch-src-download.c Modified: head/www/deforaos-surfer/Makefile head/www/deforaos-surfer/distinfo head/www/deforaos-surfer/pkg-plist Modified: head/www/deforaos-surfer/Makefile ============================================================================== --- head/www/deforaos-surfer/Makefile Fri Mar 4 14:57:38 2016 (r410125) +++ head/www/deforaos-surfer/Makefile Fri Mar 4 15:02:50 2016 (r410126) @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= surfer -PORTVERSION= 0.2.7 +PORTVERSION= 0.2.9 CATEGORIES= www -MASTER_SITES= http://www.defora.org/os/download/download/4345/ +MASTER_SITES= http://www.defora.org/os/download/download/4411/ PKGNAMEPREFIX= deforaos- DISTNAME= Surfer-${PORTVERSION} @@ -12,9 +12,8 @@ MAINTAINER= olivier@FreeBSD.org COMMENT= DeforaOS desktop web browser LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt \ - docbook-xsl>=0:${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 \ @@ -22,13 +21,30 @@ LIB_DEPENDS= libSystem.so:${PORTSDIR}/de RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss USE_GNOME= gtk20 -USES= desktop-file-utils pkgconfig gettext +USES= desktop-file-utils pkgconfig INSTALLS_ICONS= yes MAKE_ARGS= PREFIX=${PREFIX} MAKE_ENV+= MANDIR=${STAGEDIR}${MANPREFIX}/man -MANDIRS= ${PREFIX}/share/man/man1 +OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes +NLS_USES= gettext +DOCS_BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt \ + ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl + +post-patch-DOCS-off: + ${REINPLACE_CMD} 's|= data doc|= data|' \ + ${WRKSRC}/Makefile + +post-patch-NLS-off: + ${REINPLACE_CMD} 's|po src tools|src tools|' \ + ${WRKSRC}/Makefile + +post-patch: + ${REINPLACE_CMD} 's|-Wl,-pie||g' \ + ${WRKSRC}/tools/Makefile \ + ${WRKSRC}/src/Makefile post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* Modified: head/www/deforaos-surfer/distinfo ============================================================================== --- head/www/deforaos-surfer/distinfo Fri Mar 4 14:57:38 2016 (r410125) +++ head/www/deforaos-surfer/distinfo Fri Mar 4 15:02:50 2016 (r410126) @@ -1,2 +1,2 @@ -SHA256 (Surfer-0.2.7.tar.gz) = ddabc709866a067b086cfd25ab488ce153685c4298f31bb343e330a3ba3d145c -SIZE (Surfer-0.2.7.tar.gz) = 88108 +SHA256 (Surfer-0.2.9.tar.gz) = 47d02e87fec5564c9caf9fbe3b2372b81871e0484f5b394a9a741fafa78d9b1d +SIZE (Surfer-0.2.9.tar.gz) = 94394 Added: head/www/deforaos-surfer/files/patch-doc_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/deforaos-surfer/files/patch-doc_Makefile Fri Mar 4 15:02:50 2016 (r410126) @@ -0,0 +1,22 @@ +--- doc/Makefile.orig 2016-02-07 03:47:06 UTC ++++ doc/Makefile +@@ -1,4 +1,4 @@ +-TARGETS = $(OBJDIR)download.1 $(OBJDIR)download.html $(OBJDIR)helper.1 $(OBJDIR)helper.html $(OBJDIR)htmlapp.1 $(OBJDIR)htmlapp.html $(OBJDIR)surfer.1 $(OBJDIR)surfer.html ++TARGETS = $(OBJDIR)download.1 $(OBJDIR)helper.1 $(OBJDIR)htmlapp.1 $(OBJDIR)surfer.1 + OBJDIR = + PREFIX = /usr/local + DESTDIR = +@@ -50,13 +50,9 @@ distclean: clean + + install: $(TARGETS) + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)download.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)download.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)helper.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)helper.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)htmlapp.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)htmlapp.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)surfer.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)surfer.html" + + uninstall: + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "download.1" Added: head/www/deforaos-surfer/files/patch-src_download.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/deforaos-surfer/files/patch-src_download.c Fri Mar 4 15:02:50 2016 (r410126) @@ -0,0 +1,12 @@ +--- src/download.c.orig 2015-11-28 14:58:25 UTC ++++ src/download.c +@@ -36,6 +36,9 @@ + #include <System.h> + #ifdef WITH_WEBKIT + # include <netdb.h> ++# include <sys/types.h> ++# include <sys/socket.h> ++# include <netinet/in.h> + # include <arpa/inet.h> + # include <webkit/webkit.h> + #else Added: head/www/deforaos-surfer/files/patch-src_ghtml-webkit.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/deforaos-surfer/files/patch-src_ghtml-webkit.c Fri Mar 4 15:02:50 2016 (r410126) @@ -0,0 +1,21 @@ +--- src/ghtml-webkit.c.orig 2016-02-07 03:44:23 UTC ++++ src/ghtml-webkit.c +@@ -20,6 +20,9 @@ + #include <string.h> + #include <errno.h> + #include <netdb.h> ++#include <sys/types.h> ++#include <sys/socket.h> ++#include <netinet/in.h> + #include <arpa/inet.h> + #include <libintl.h> + #include <webkit/webkit.h> +@@ -205,7 +208,7 @@ static void _new_init(GHtml * ghtml) + { + "/etc/pki/tls/certs/ca-bundle.crt", + "/etc/ssl/certs/ca-certificates.crt", +- "/etc/openssl/certs/ca-certificates.crt", ++ "/etc/ssl/cert.pem", + PREFIX "/etc/ssl/certs/ca-certificates.crt", + PREFIX "/etc/openssl/certs/ca-certificates.crt" + }; Modified: head/www/deforaos-surfer/pkg-plist ============================================================================== --- head/www/deforaos-surfer/pkg-plist Fri Mar 4 14:57:38 2016 (r410125) +++ head/www/deforaos-surfer/pkg-plist Fri Mar 4 15:02:50 2016 (r410126) @@ -1,17 +1,17 @@ bin/download -bin/surfer bin/helper -man/man1/download.1.gz -man/man1/helper.1.gz -man/man1/surfer.1.gz +bin/htmlapp +bin/surfer +%%PORTDOCS%%man/man1/download.1.gz +%%PORTDOCS%%man/man1/helper.1.gz +%%PORTDOCS%%man/man1/htmlapp.1.gz +%%PORTDOCS%%man/man1/surfer.1.gz share/applications/deforaos-helper.desktop +share/applications/deforaos-htmlapp.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 -share/locale/es/LC_MESSAGES/Surfer.mo -share/locale/fr/LC_MESSAGES/Surfer.mo -share/locale/it/LC_MESSAGES/Surfer.mo -share/man/html1/download.html -share/man/html1/helper.html -share/man/html1/surfer.html +%%NLS%%share/locale/de/LC_MESSAGES/Surfer.mo +%%NLS%%share/locale/es/LC_MESSAGES/Surfer.mo +%%NLS%%share/locale/fr/LC_MESSAGES/Surfer.mo +%%NLS%%share/locale/it/LC_MESSAGES/Surfer.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603041502.u24F2oeW014584>