svn commit: r448061 - in head/www/surf: . files
Tobias Kortkamp
tobik at FreeBSD.org
Wed Aug 16 16:26:45 UTC 2017
Author: tobik
Date: Wed Aug 16 16:26:44 2017
New Revision: 448061
URL: https://svnweb.freebsd.org/changeset/ports/448061
Log:
www/surf: Update to 2.0
Assign maintainership to submitter
Notable changes since 0.7:
- Switch to webkit2-gtk3
- Remove proxy stuff, it's now handled by WebView
- Scrolling, SSL policy, Disk Cache, and Cookies are now handled through WebKit
Changes: http://git.suckless.org/surf/log/?qt=range&q=0.7..2.0
PR: 221548
Submitted by: Dmitri Goutnik <dg at syrec.org>
Deleted:
head/www/surf/files/
Modified:
head/www/surf/Makefile
head/www/surf/distinfo
head/www/surf/pkg-descr
Modified: head/www/surf/Makefile
==============================================================================
--- head/www/surf/Makefile Wed Aug 16 15:56:26 2017 (r448060)
+++ head/www/surf/Makefile Wed Aug 16 16:26:44 2017 (r448061)
@@ -2,65 +2,52 @@
# $FreeBSD$
PORTNAME= surf
-PORTVERSION= 0.7
+DISTVERSION= 2.0
CATEGORIES= www
MASTER_SITES= http://dl.suckless.org/${PORTNAME}/
PKGNAMESUFFIX= -browser
-MAINTAINER= ports at FreeBSD.org
-COMMENT= Simple Web browser based on WebKit/Gtk+
+MAINTAINER= dg at syrec.org
+COMMENT= Simple Web browser based on WebKit2/GTK+
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-LIB_DEPENDS= libwebkitgtk-1.0.so:www/webkit-gtk2
-RUN_DEPENDS= dmenu:x11/dmenu
+LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+ libsoup-2.4.so:devel/libsoup
+RUN_DEPENDS= dmenu:x11/dmenu \
+ curl:ftp/curl \
+ xterm:x11/xterm
-USE_GNOME= gtk20
-USE_XORG= x11
USES= pkgconfig
+USE_GNOME= gtk30 pango cairo gdkpixbuf2
+USE_XORG= x11
+CONFLICTS= surf-1* # math/surf
+
+PLIST_FILES= bin/surf \
+ man/man1/surf.1.gz \
+ share/pixmaps/surf.png
PORTDOCS= FAQ.md README TODO.md
PORTEXAMPLES= surf-open.sh
-PLIST_FILES= bin/surf man/man1/surf.1.gz share/pixmaps/surf.png
DESKTOP_ENTRIES="Surf" "" "${PREFIX}/share/pixmaps/surf.png" "surf" "" true
-CONFLICTS= surf-1* # math/surf
+OPTIONS_DEFINE= DOCS EXAMPLES
-OPTIONS_DEFINE= BUILTIN_DOWNLOAD DOCS EXAMPLES
-OPTIONS_SINGLE= TOOLKIT
-OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3
-OPTIONS_DEFAULT= GTK2
-
-# http://surf.suckless.org/patches/download
-# http://surf.suckless.org/patches/smoothscrolling-via-GTK3
-BUILTIN_DOWNLOAD_DESC= Built-in download support
-BUILTIN_DOWNLOAD_CFLAGS= -DBUILTIN_DOWNLOAD
-GTK2_LIB_DEPENDS= libwebkitgtk-1.0.so:www/webkit-gtk2
-GTK2_USE= gnome=gtk20
-GTK2_MAKE_ENV= GTKINC="$$(pkg-config --cflags webkit-1.0)" \
- GTKLIB="$$(pkg-config --libs webkit-1.0)"
-GTK3_LIB_DEPENDS= libwebkitgtk-3.0.so:www/webkit-gtk3
-GTK3_USE= gnome=gtk30
-GTK3_MAKE_ENV= GTKINC="$$(pkg-config --cflags webkitgtk-3.0)" \
- GTKLIB="$$(pkg-config --libs webkitgtk-3.0)"
-TOOLKIT_DESC= Gtk+ toolkit
-
-.include <bsd.port.options.mk>
-
pre-everything::
@${ECHO_MSG} "You can build surf with your own config.h using the SURF_CONF knob:"
@${ECHO_MSG} "make SURF_CONF=/path/to/surf/config.h install clean"
+ @${ECHO_MSG} "Note: Pre-${PORTVERSION} config.h-files may not work."
post-extract:
.if defined(SURF_CONF)
@${ECHO_MSG} "creating config.h from ${SURF_CONF}"
- @${CP} ${SURF_CONF} ${WRKSRC}/config.h
+ @${LN} -sf ${SURF_CONF} ${WRKSRC}/config.h
.endif
post-patch:
- ${REINPLACE_CMD} -e \
+ @${REINPLACE_CMD} -e \
'/^PREFIX/s| =| ?=| ; \
/^MANPREFIX/s|/share/man|/man| ; \
/^X11/s|/usr/X11R6/|$${LOCALBASE}/| ; \
@@ -74,19 +61,18 @@ post-patch:
/^LDFLAGS/s| =| +=| ; \
/^LDFLAGS/s|-g || ; \
/^CC/s| =| ?=|' ${WRKSRC}/config.mk
+ @${REINPLACE_CMD} -e 's|st -e|xterm -e|' ${WRKSRC}/config.def.h
post-install:
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/surf
- (cd ${WRKSRC} && ${INSTALL_DATA} surf.png \
- ${STAGEDIR}${PREFIX}/share/pixmaps)
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/surf
+ ${INSTALL_DATA} ${WRKSRC}/surf.png ${STAGEDIR}${PREFIX}/share/pixmaps
post-install-DOCS-on:
- ${MKDIR} ${STAGEDIR}${DOCSDIR}
- (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
post-install-EXAMPLES-on:
- ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
- (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES} \
- ${STAGEDIR}${EXAMPLESDIR})
+ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+ cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
.include <bsd.port.mk>
Modified: head/www/surf/distinfo
==============================================================================
--- head/www/surf/distinfo Wed Aug 16 15:56:26 2017 (r448060)
+++ head/www/surf/distinfo Wed Aug 16 16:26:44 2017 (r448061)
@@ -1,2 +1,3 @@
-SHA256 (surf-0.7.tar.gz) = 95608546fb64d01c7a8153c356be0e284ebe120c3c596a94eb3f3ad47e1c494a
-SIZE (surf-0.7.tar.gz) = 18792
+TIMESTAMP = 1502724289
+SHA256 (surf-2.0.tar.gz) = faee4c7a62c38fc9791eff1ad06787c3c9b2b79f338806827f5152a7bc54951d
+SIZE (surf-2.0.tar.gz) = 19056
Modified: head/www/surf/pkg-descr
==============================================================================
--- head/www/surf/pkg-descr Wed Aug 16 15:56:26 2017 (r448060)
+++ head/www/surf/pkg-descr Wed Aug 16 16:26:44 2017 (r448061)
@@ -1,4 +1,4 @@
-surf is a simple web browser based on WebKit/GTK+. It is able to display
+surf is a simple web browser based on WebKit2/GTK+. It is able to display
websites and follow links. It supports the XEmbed protocol which makes
it possible to embed it in another application. Furthermore, one can
point surf to another URI by setting its XProperties.
More information about the svn-ports-head
mailing list