diff options
| author | miwi <miwi@FreeBSD.org> | 2013-03-25 00:04:22 +0800 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2013-03-25 00:04:22 +0800 |
| commit | 6d58677bffb0fc61e929eacf621c8f97752461a1 (patch) | |
| tree | ab6f9c43212b6692c9d2c1936ea35bc16c4d59ca | |
| parent | c43838793c3cc1655bdeeb1b35906a0b214aba7d (diff) | |
| download | freebsd-ports-gnome-6d58677bffb0fc61e929eacf621c8f97752461a1.tar.gz freebsd-ports-gnome-6d58677bffb0fc61e929eacf621c8f97752461a1.tar.zst freebsd-ports-gnome-6d58677bffb0fc61e929eacf621c8f97752461a1.zip | |
- Update to 0.6
PR: 177252
Submitted by: ports fury
| -rw-r--r-- | www/surf/Makefile | 29 | ||||
| -rw-r--r-- | www/surf/distinfo | 4 | ||||
| -rw-r--r-- | www/surf/files/patch-config.mk | 39 |
3 files changed, 24 insertions, 48 deletions
diff --git a/www/surf/Makefile b/www/surf/Makefile index 221216cae712..0efa74110599 100644 --- a/www/surf/Makefile +++ b/www/surf/Makefile @@ -2,23 +2,30 @@ # $FreeBSD$ 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 @@ post-extract: @${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 --git a/www/surf/distinfo b/www/surf/distinfo index 49f4a2f4fcf2..9a0093fc0ccc 100644 --- a/www/surf/distinfo +++ b/www/surf/distinfo @@ -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 --git a/www/surf/files/patch-config.mk b/www/surf/files/patch-config.mk deleted file mode 100644 index 69b82e52e699..000000000000 --- a/www/surf/files/patch-config.mk +++ /dev/null @@ -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 |