Date: Sat, 23 Mar 2013 03:28:06 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/177252: www/surf: Update to version 0.6 Message-ID: <20130323032806.9982ff84e77f1d1d680108a0@yahoo.com> Resent-Message-ID: <201303221840.r2MIe3Xu020141@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 177252 >Category: ports >Synopsis: www/surf: Update to version 0.6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Mar 22 18:40:03 UTC 2013 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.4-RELEASE-p10 i386 >Organization: >Environment: >Description: - Update to version 0.6 Remove file: files/patch-config.mk >How-To-Repeat: >Fix: diff -urN /usr/ports/www/surf/Makefile www/surf/Makefile --- /usr/ports/www/surf/Makefile 2013-03-10 14:03:35.000000000 +0900 +++ www/surf/Makefile 2013-03-10 23:49:12.000000000 +0900 @@ -2,23 +2,30 @@ # $FreeBSD: head/www/surf/Makefile 313765 2013-03-09 22:21:47Z eadler $ PORTNAME= surf -PORTVERSION= 0.4.1 -PORTREVISION= 2 +PORTVERSION= 0.6 CATEGORIES= www MASTER_SITES= http://dl.suckless.org/${PORTNAME}/ MAINTAINER= ports@FreeBSD.org COMMENT= Simple Web browser based on WebKit/Gtk+ +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +OPTIONS_DEFINE= DOCS + LIB_DEPENDS= webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 RUN_DEPENDS= dmenu:${PORTSDIR}/x11/dmenu +USE_CSTD= c99 USE_GNOME= gtk20 USE_PKGCONFIG= yes MAN1= surf.1 -PLIST_FILES= bin/surf -PORTDOCS= LICENSE README +PORTDOCS= README +PLIST_FILES= bin/surf share/pixmaps/surf.png + +DESKTOP_ENTRIES="Surf" "" "${PREFIX}/share/pixmaps/surf.png" "surf" "" true CONFLICTS= surf-1* # math/surf @@ -37,12 +44,20 @@ @${CP} ${SURF_CONF} ${WRKSRC}/config.h .endif +post-patch: + @${REINPLACE_CMD} -e \ + 's|^\(PREFIX\)|#\1| ; \ + s|/share/man|/man| ; \ + s|^\(CFLAGS\) =.*|\1 += -I. $${GTKINC} $${CPPFLAGS}| ; \ + s|^\(LDFLAGS\) =.*|\1 += $${GTKLIB}| ; \ + s|^\(CC\)|#\1|' ${WRKSRC}/config.mk + post-install: + @${STRIP_CMD} ${PREFIX}/bin/surf + (cd ${WRKSRC} && ${INSTALL_DATA} surf.png ${PREFIX}/share/pixmaps) .if ${PORT_OPTIONS:MDOCS} - @${ECHO_MSG} "installing additional documentation to ${DOCSDIR}" @${MKDIR} ${DOCSDIR} - @${INSTALL_MAN} ${WRKSRC}/LICENSE ${DOCSDIR} - @${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} README ${DOCSDIR}) .endif .include <bsd.port.mk> diff -urN /usr/ports/www/surf/distinfo www/surf/distinfo --- /usr/ports/www/surf/distinfo 2012-11-08 10:46:08.000000000 +0900 +++ www/surf/distinfo 2013-03-10 15:54:37.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (surf-0.4.1.tar.gz) = 93709ba3e84baf2118676e96a5b2e5d4176f28c35c782fffd80a65c0a5bea546 -SIZE (surf-0.4.1.tar.gz) = 10102 +SHA256 (surf-0.6.tar.gz) = fdc1ccfaee5c4f008eeb8fe5f9200d3ad71296e8d7af52bdd6a771f111866805 +SIZE (surf-0.6.tar.gz) = 14781 diff -urN /usr/ports/www/surf/files/patch-config.mk www/surf/files/patch-config.mk --- /usr/ports/www/surf/files/patch-config.mk 2013-02-08 03:10:26.000000000 +0900 +++ www/surf/files/patch-config.mk 1970-01-01 09:00:00.000000000 +0900 @@ -1,39 +0,0 @@ ---- config.mk.orig 2010-05-30 16:05:25.000000000 -0400 -+++ config.mk 2010-07-12 20:08:08.000000000 -0400 -@@ -4,25 +4,26 @@ - # Customize below to fit your system - - # paths --PREFIX = /usr/local --MANPREFIX = ${PREFIX}/share/man -+PREFIX?= /usr/local -+MANPREFIX = ${PREFIX}/man - --GTKINC=$(shell pkg-config --cflags gtk+-2.0 webkit-1.0) --GTKLIB=$(shell pkg-config --libs gtk+-2.0 webkit-1.0) -+GTKINC!= pkg-config --cflags gtk+-2.0 webkit-1.0 -+GTKLIB!= pkg-config --libs gtk+-2.0 webkit-1.0 - - - # includes and libs --INCS = -I. -I/usr/include ${GTKINC} --LIBS = -L/usr/lib -lc ${GTKLIB} -lgthread-2.0 -+INCS = ${GTKINC} -+LIBS = -pthread ${GTKLIB} - - # flags --CPPFLAGS = -DVERSION=\"${VERSION}\" --CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} --LDFLAGS = -g ${LIBS} -+CPPFLAGS+= -DVERSION=\"${VERSION}\" -+CFLAGS+= -std=c99 ${INCS} ${CPPFLAGS} -+LDFLAGS+= ${LIBS} -+ - - # Solaris - #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" - #LDFLAGS = ${LIBS} - - # compiler and linker --CC = cc -+CC?= cc >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130323032806.9982ff84e77f1d1d680108a0>