[gentoo-commits] gentoo-x86 commit in www-client/surf/files: surf-0.6-gentoo.patch surf-9999-gentoo.patch

[Jeroen Roovers (jer)]

jer         13/10/04 14:52:10

  Modified:             surf-0.6-gentoo.patch
  Added:                surf-9999-gentoo.patch
  Log:
  Sync 0.6-r1 changes. Clean up 0.6-r1 some more.
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A792A613)

Revision  Changes    Path
1.2                  www-client/surf/files/surf-0.6-gentoo.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/files/surf-0.6-gentoo.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/files/surf-0.6-gentoo.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/files/surf-0.6-gentoo.patch?r1=1.1&r2=1.2

Index: surf-0.6-gentoo.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/surf/files/surf-0.6-gentoo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- surf-0.6-gentoo.patch	4 Oct 2013 14:21:10 -0000	1.1
+++ surf-0.6-gentoo.patch	4 Oct 2013 14:52:10 -0000	1.2
@@ -1,5 +1,5 @@
---- a/config.mk	2013-02-10 19:40:14.000000000 +0100
-+++ b/config.mk	2013-10-04 16:11:28.773331797 +0200
+--- a/config.mk
++++ b/config.mk
 @@ -4,27 +4,27 @@
  # Customize below to fit your system
  
@@ -16,14 +16,14 @@
  
 -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 webkit-1.0)
-+GTKLIB = $(shell $(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) -lgthread-2.0
++LIBS = $(X11LIB) $(GTKLIB)
  
  # flags
 -CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE
@@ -42,8 +42,8 @@
  # compiler and linker
 -CC = cc
 +CC ?= gcc
---- a/Makefile	2013-02-10 19:40:14.000000000 +0100
-+++ b/Makefile	2013-10-04 16:05:02.230549420 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -4,58 +4,58 @@
  include config.mk
  



1.1                  www-client/surf/files/surf-9999-gentoo.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/files/surf-9999-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/files/surf-9999-gentoo.patch?rev=1.1&content-type=text/plain

Index: surf-9999-gentoo.patch
===================================================================
--- 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_BSD_SOURCE
-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS = -g ${LIBS}
+CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_BSD_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