www-client/surf: Update live ebuild.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

diff --git a/www-client/surf/files/surf-9999-gentoo.patch b/www-client/surf/files/surf-9999-gentoo.patch
deleted file mode 100644 (file)
index 424b08d..0000000
--- a/www-client/surf/files/surf-9999-gentoo.patch
+++ /dev/null
@@ -1,133 +0,0 @@
---- a/config.mk
-+++ b/config.mk
-@@ -4,27 +4,27 @@
- # Customize below to fit your system
- 
- # paths
--PREFIX = /usr/local
--MANPREFIX = ${PREFIX}/share/man
-+PREFIX = /usr
-+MANPREFIX = $(PREFIX)/share/man
- 
--X11INC = /usr/X11R6/include
--X11LIB = /usr/X11R6/lib
-+X11INC = $(shell $(PKG_CONFIG) --cflags x11)
-+X11LIB = $(shell $(PKG_CONFIG) --libs x11)
- 
--GTKINC = `pkg-config --cflags gtk+-2.0 webkit-1.0`
--GTKLIB = `pkg-config --libs gtk+-2.0 webkit-1.0`
-+GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0 webkit-1.0)
-+GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0 webkit-1.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 = -I. -I/usr/include $(X11INC) $(GTKINC)
-+LIBS = $(X11LIB) $(GTKLIB)
- 
- # flags
--CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE
--CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
--LDFLAGS = -g ${LIBS}
-+CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_DEFAULT_SOURCE
-+CFLAGS += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS)
-+LDFLAGS += $(LIBS)
- 
- # Solaris
--#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
--#LDFLAGS = ${LIBS}
-+#CFLAGS = -fast $(INCS) -DVERSION=\"$(VERSION)\"
-+#LDFLAGS = $(LIBS)
- 
- # compiler and linker
--CC = cc
-+CC ?= gcc
---- a/Makefile
-+++ b/Makefile
-@@ -4,58 +4,58 @@
- include config.mk
- 
- SRC = surf.c
--OBJ = ${SRC:.c=.o}
-+OBJ = $(SRC:.c=.o)
- 
- all: options surf
- 
- options:
-       @echo surf build options:
--      @echo "CFLAGS   = ${CFLAGS}"
--      @echo "LDFLAGS  = ${LDFLAGS}"
--      @echo "CC       = ${CC}"
-+      @echo "CFLAGS   = $(CFLAGS)"
-+      @echo "LDFLAGS  = $(LDFLAGS)"
-+      @echo "CC       = $(CC)"
- 
- .c.o:
-       @echo CC $<
--      @${CC} -c ${CFLAGS} $<
-+      $(CC) -c $(CFLAGS) $<
- 
--${OBJ}: config.h config.mk
-+$(OBJ): config.h config.mk
- 
- config.h:
-       @echo creating $@ from config.def.h
--      @cp config.def.h $@
-+      cp config.def.h $@
- 
--surf: ${OBJ}
-+surf: $(OBJ)
-       @echo CC -o $@
--      @${CC} -o $@ surf.o ${LDFLAGS}
-+      $(CC) -o $@ surf.o $(LDFLAGS)
- 
- clean:
-       @echo cleaning
--      @rm -f surf ${OBJ} surf-${VERSION}.tar.gz
-+      rm -f surf $(OBJ) surf-$(VERSION).tar.gz
- 
- dist: clean
-       @echo creating dist tarball
--      @mkdir -p surf-${VERSION}
--      @cp -R LICENSE Makefile config.mk config.def.h README \
-+      mkdir -p surf-$(VERSION)
-+      cp -R LICENSE Makefile config.mk config.def.h README \
-               surf-open.sh arg.h TODO.md surf.png \
--              surf.1 ${SRC} surf-${VERSION}
--      @tar -cf surf-${VERSION}.tar surf-${VERSION}
--      @gzip surf-${VERSION}.tar
--      @rm -rf surf-${VERSION}
-+              surf.1 $(SRC) surf-$(VERSION)
-+      tar -cf surf-$(VERSION).tar surf-$(VERSION)
-+      gzip surf-$(VERSION).tar
-+      rm -rf surf-$(VERSION)
- 
- 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
--      @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
-+      @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
-+      @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
- 
- uninstall:
--      @echo removing executable file from ${DESTDIR}${PREFIX}/bin
--      @rm -f ${DESTDIR}${PREFIX}/bin/surf
--      @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
--      @rm -f ${DESTDIR}${MANPREFIX}/man1/surf.1
-+      @echo removing executable file from $(DESTDIR)$(PREFIX)/bin
-+      rm -f $(DESTDIR)$(PREFIX)/bin/surf
-+      @echo removing manual page from $(DESTDIR)$(MANPREFIX)/man1
-+      rm -f $(DESTDIR)$(MANPREFIX)/man1/surf.1
- 
- .PHONY: all options clean dist install uninstall

diff --git a/www-client/surf/surf-9999.ebuild b/www-client/surf/surf-9999.ebuild
index 812af57c99707eafdec760ab10efcb2425248ec0..d1f50b0fdae13e1645cde0fdb5a200f3ec6310b6 100644 (file)
--- a/www-client/surf/surf-9999.ebuild
+++ b/www-client/surf/surf-9999.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
        )
 "
 PATCHES=(
-       "${FILESDIR}"/${P}-gentoo.patch
+       "${FILESDIR}"/${PN}-2.0-gentoo.patch
 )
 
 pkg_setup() {