cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove www/surf2 in favor of www/surf

Browse Source 
Prodded by jung@
This commit is contained in:
czarkoff 2017-06-23 19:50:41 +00:00
parent 1cf1378bc4
commit 7df861eff1
13 changed files with 9 additions and 275 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/quirks/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.487 2017/06/21 20:31:13 bcallah Exp $
# $OpenBSD: Makefile,v 1.488 2017/06/23 19:50:42 czarkoff Exp $
COMMENT = exceptions to pkg_add rules
CATEGORIES = devel databases
DISTFILES =
# API.rev
PKGNAME = quirks-2.332
PKGNAME = quirks-2.333
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>

3
devel/quirks/files/Quirks.pm
View File

@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: Quirks.pm,v 1.499 2017/06/21 20:31:13 bcallah Exp $
# $OpenBSD: Quirks.pm,v 1.500 2017/06/23 19:50:42 czarkoff Exp $
#
# Copyright (c) 2009 Marc Espie <espie@openbsd.org>
#
@ -983,6 +983,7 @@ my $obsolete_reason = {
'samhain-docs' => 5,
'samhain-server' => 5,
'texapp' => 6,
'surf2' => 5,
};
# reasons for obsolete packages

3
www/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.826 2017/06/20 21:33:10 shadchin Exp $
# $OpenBSD: Makefile,v 1.827 2017/06/23 19:50:41 czarkoff Exp $
SUBDIR =
SUBDIR += ajaxterm
@ -539,7 +539,6 @@
SUBDIR += stagit
SUBDIR += sthttpd
SUBDIR += surf
SUBDIR += surf2
SUBDIR += surfraw
SUBDIR += swiggle
SUBDIR += syweb

3
www/surf/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.23 2017/05/26 20:37:56 jung Exp $
# $OpenBSD: Makefile,v 1.24 2017/06/23 19:50:42 czarkoff Exp $
COMMENT = simple webbrowser based on webkit/gtk+
DISTNAME = surf-2.0
CATEGORIES = www
HOMEPAGE = http://surf.suckless.org/
REVISION = 0
MAINTAINER= Joerg Jung <jung@openbsd.org>

3
www/surf/pkg/PLIST
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2009/11/08 12:17:18 landry Exp $
@comment $OpenBSD: PLIST,v 1.2 2017/06/23 19:50:42 czarkoff Exp $
@pkgpath www/surf2
@bin bin/surf
@man man/man1/surf.1

30
www/surf2/Makefile
View File

@ -1,30 +0,0 @@
# $OpenBSD: Makefile,v 1.10 2016/10/24 07:49:08 czarkoff Exp $
COMMENT = simple webbrowser based on webkit/gtk+
DISTNAME = surf2-0.6.20160922
REVISION = 0
CATEGORIES = www
HOMEPAGE = http://surf.suckless.org/
MAINTAINER= Dmitrij D. Czarkoff <czarkoff@openbsd.org>
# MIT
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += X11 c gdk-3 glib-2.0 gobject-2.0 gtk-3 webkit2gtk-4.0
GH_ACCOUNT = czarkoff
GH_PROJECT = surf2
GH_COMMIT = da5290a41aac4eabef83f6b88039f44d28b0ea00
LIB_DEPENDS = www/webkitgtk4
RUN_DEPENDS = devel/xdg-utils \
multimedia/gstreamer1/plugins-libav \
multimedia/mpv \
net/curl \
x11/dmenu
NO_TEST = Yes
.include <bsd.port.mk>

2
www/surf2/distinfo
View File

@ -1,2 +0,0 @@
SHA256 (surf2-0.6.20160922-da5290a4.tar.gz) = qP7G9quY1wKU1cJ+TfFM84xUBXLHpm6CJae8Xs0uZVc=
SIZE (surf2-0.6.20160922-da5290a4.tar.gz) = 18660

51
www/surf2/patches/patch-Makefile
View File

@ -1,51 +0,0 @@
$OpenBSD: patch-Makefile,v 1.2 2016/08/18 18:30:57 czarkoff Exp $
--- Makefile.orig Fri Jul 8 15:02:42 2016
+++ Makefile Thu Aug 18 19:08:42 2016
@@ -6,7 +6,7 @@ include config.mk
SRC = surf.c
OBJ = ${SRC:.c=.o}
-all: options surf
+all: surf2
options:
@echo surf build options:
@@ -15,8 +15,7 @@ options:
@echo "CC = ${CC}"
.c.o:
- @echo CC $<
- @${CC} -c ${CFLAGS} $<
+ ${CC} -c ${CFLAGS} $<
${OBJ}: config.h config.mk
@@ -24,9 +23,8 @@ config.h:
@echo creating $@ from config.def.h
@cp config.def.h $@
-surf: ${OBJ}
- @echo CC -o $@
- @${CC} -o $@ surf.o ${LDFLAGS}
+surf2: ${OBJ}
+ ${CC} -o $@ surf.o ${LDFLAGS}
clean:
@echo cleaning
@@ -45,12 +43,12 @@ dist: clean
install: all
@echo installing executable file to ${DESTDIR}${PREFIX}/bin
@mkdir -p ${DESTDIR}${PREFIX}/bin
- @cp -f surf ${DESTDIR}${PREFIX}/bin
- @chmod 755 ${DESTDIR}${PREFIX}/bin/surf
+ @cp -f surf2 ${DESTDIR}${PREFIX}/bin
+ @chmod 755 ${DESTDIR}${PREFIX}/bin/surf2
@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
@mkdir -p ${DESTDIR}${MANPREFIX}/man1
- @sed "s/VERSION/${VERSION}/g" < surf.1 > ${DESTDIR}${MANPREFIX}/man1/surf.1
- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/surf.1
+ @sed "s/VERSION/${VERSION}/g" < surf.1 > ${DESTDIR}${MANPREFIX}/man1/surf2.1
+ @chmod 644 ${DESTDIR}${MANPREFIX}/man1/surf2.1
uninstall:
@echo removing executable file from ${DESTDIR}${PREFIX}/bin

44
www/surf2/patches/patch-config_def_h
View File

@ -1,44 +0,0 @@
$OpenBSD: patch-config_def_h,v 1.6 2016/10/24 07:49:08 czarkoff Exp $
--- config.def.h.orig Fri Jul 8 15:02:42 2016
+++ config.def.h Thu Aug 18 19:02:53 2016
@@ -17,7 +17,7 @@ static Parameter defconfig[ParameterLast] = {
SETB(FrameFlattening, 0),
SETB(Geolocation, 0),
SETB(HideBackground, 0),
- SETB(Inspector, 0),
+ SETB(Inspector, 1),
SETB(JavaScript, 1),
SETB(KioskMode, 0),
SETB(LoadImages, 1),
@@ -30,7 +30,7 @@ static Parameter defconfig[ParameterLast] = {
SETB(SiteQuirks, 1),
SETB(SpellChecking, 0),
SETV(SpellLanguages, ((char *[]){ "en_US", NULL })),
- SETB(StrictSSL, 0),
+ SETB(StrictSSL, 1),
SETB(Style, 1),
SETF(ZoomLevel, 1.0),
};
@@ -48,7 +48,7 @@ static WebKitFindOptions findopts = WEBKIT_FIND_OPTION
#define SETPROP(p, q) { \
.v = (const char *[]){ "/bin/sh", "-c", \
"prop=\"`xprop -id $2 $0 " \
- "| sed \"s/^$0(STRING) = \\(\\\\\"\\?\\)\\(.*\\)\\1$/\\2/\" " \
+ "| sed \"s/^$0(STRING) = \\\\\"\\(.\\{0,\\}\\)\\\\\"$/\\1/\" " \
"| xargs -0 printf %b | dmenu`\" &&" \
"xprop -id $2 -f $1 8s -set $1 \"$prop\"", \
p, q, winid, NULL \
@@ -58,9 +58,10 @@ static WebKitFindOptions findopts = WEBKIT_FIND_OPTION
/* DOWNLOAD(URI, referer) */
#define DOWNLOAD(d, r) { \
.v = (const char *[]){ "/bin/sh", "-c", \
- "st -e /bin/sh -c \"curl -g -L -J -O --user-agent '$1'" \
- " --referer '$2' -b $3 -c $3 '$0';" \
- " sleep 5;\"", \
+ "xterm -e /bin/sh -c \"cd \'${XDG_DOWNLOAD_DIR}\';" \
+ " curl -gLJO --user-agent '$1' --referer '$2' -b $3 -c $3" \
+ " -w \'Saved to \"%{filename_effective}\".\' '$0';" \
+ " read dismiss;\"", \
d, useragent, r, cookiefile, NULL \
} \
}

38
www/surf2/patches/patch-config_mk
View File

@ -1,38 +0,0 @@
$OpenBSD: patch-config_mk,v 1.4 2016/09/30 23:47:28 czarkoff Exp $
--- config.mk.orig Thu Sep 22 10:21:31 2016
+++ config.mk Fri Sep 30 13:44:49 2016
@@ -5,27 +5,24 @@ VERSION = 0.6
# paths
PREFIX = /usr/local
-MANPREFIX = ${PREFIX}/share/man
+MANPREFIX = ${PREFIX}/man
LIBPREFIX = ${PREFIX}/lib/surf
X11INC = /usr/X11R6/include
X11LIB = /usr/X11R6/lib
-GTKINC = `pkg-config --cflags gtk+-3.0 webkit2gtk-4.0`
-GTKLIB = `pkg-config --libs gtk+-3.0 webkit2gtk-4.0`
+GTKINC != pkg-config --cflags gtk+-3.0 webkit2gtk-4.0
+GTKLIB != pkg-config --libs gtk+-3.0 webkit2gtk-4.0
# includes and libs
-INCS = -I. -I/usr/include -I${X11INC} ${GTKINC}
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${GTKLIB} -lgthread-2.0
+INCS = ${GTKINC}
+LIBS = -pthread ${GTKLIB}
# flags
CPPFLAGS = -DVERSION=\"${VERSION}\" -DWEBEXTDIR=\"${LIBPREFIX}\" -D_DEFAULT_SOURCE
-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS = -s ${LIBS}
+CFLAGS = -std=c99 ${INCS} ${CPPFLAGS}
+LDFLAGS = -Wl,--as-needed ${LIBS}
# Solaris
#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
#LDFLAGS = ${LIBS}
-
-# compiler and linker
-CC = cc

95
www/surf2/patches/patch-surf_1
View File

@ -1,95 +0,0 @@
$OpenBSD: patch-surf_1,v 1.3 2016/01/18 22:32:12 czarkoff Exp $
--- surf.1.orig Tue Nov 24 23:18:06 2015
+++ surf.1 Tue Jan 12 13:17:56 2016
@@ -1,8 +1,8 @@
-.TH SURF 1 surf\-VERSION
+.TH SURF2 1 surf2\-VERSION
.SH NAME
-surf \- simple webkit-based browser
+surf2 \- simple webkit-based browser
.SH SYNOPSIS
-.B surf
+.B surf2
.RB [-bBdDfFgGiIkKmMnNpPsSvx]
.RB [-a\ cookiepolicies]
.RB [-c\ cookiefile]
@@ -13,10 +13,10 @@ surf \- simple webkit-based browser
.RB [-z\ zoomlevel]
.RB "URI"
.SH DESCRIPTION
-surf is a simple Web browser based on WebKit/GTK+. It is able
+surf2 is a simple Web browser based on WebKit/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.
+one can point surf2 to another URI by setting its XProperties.
.SH OPTIONS
.TP
.B \-a cookiepolicies
@@ -26,7 +26,7 @@ The default is "Aa@" but could be
redefined in the
.I config.h,
with "A" meaning to
-accept all cookies, "a" to deny all cookies and "@", which tells surf to
+accept all cookies, "a" to deny all cookies and "@", which tells surf2 to
accept no third party cookies.
.TP
.B \-b
@@ -51,10 +51,10 @@ Reparents to window specified by
.I xid.
.TP
.B \-f
-Start surf in windowed mode (not fullscreen).
+Start surf2 in windowed mode (not fullscreen).
.TP
.B \-F
-Start surf in fullscreen mode.
+Start surf2 in fullscreen mode.
.TP
.B \-g
Disable giving the geolocation to websites.
@@ -110,7 +110,7 @@ This does disable the site-specific styles.
.B \-u useragent
Specify the
.I useragent
-which surf should use.
+which surf2 should use.
.TP
.B \-v
Prints version information to standard output, then exits.
@@ -123,7 +123,7 @@ example
.B \-z zoomlevel
Specify the
.I zoomlevel
-which surf should use.
+which surf2 should use.
.BR xprop(1).
.SH USAGE
.B Escape
@@ -218,7 +218,7 @@ Open the Web Inspector (Developer Tools) window for th
Toggle script execution. This will reload the page.
.TP
.B Ctrl\-Shift\-v
-Toggle the enabling of plugins on that surf instance. This will reload the
+Toggle the enabling of plugins on that surf2 instance. This will reload the
page.
.TP
.B F11
@@ -277,14 +277,14 @@ no proxy
using proxy
.SH ENVIRONMENT
.B SURF_USERAGENT
-If this variable is set upon startup, surf will use it as the
+If this variable is set upon startup, surf2 will use it as the
.I useragent
string
.TP
.B http_proxy
-If this variable is set and not empty upon startup, surf will use it as the http proxy
+If this variable is set and not empty upon startup, surf2 will use it as the http proxy
.SH PLUGINS
-For using plugins in surf, first determine your running architecture. Then get
+For using plugins in surf2, first determine your running architecture. Then get
the appropriate plugin for that architecture and copy it to
.BR /usr/lib/browser-plugins
or

5
www/surf2/pkg/DESCR
View File

@ -1,5 +0,0 @@
surf2 is a version of surf webbrowser based on webkit v2 API. It is
able to display websites and follow links. It supports the Xembedded
protocol which makes it possible to embed it into another application.
Furthermore one can point surf to another URI by setting its
XProperties.

3
www/surf2/pkg/PLIST
View File

@ -1,3 +0,0 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2015/07/19 03:13:14 czarkoff Exp $
@bin bin/surf2
@man man/man1/surf2.1