diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /www-client/surf/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'www-client/surf/files')
-rw-r--r-- | www-client/surf/files/surf-0.6-gentoo.patch | 133 | ||||
-rw-r--r-- | www-client/surf/files/surf-9999-gentoo.patch | 133 |
2 files changed, 266 insertions, 0 deletions
diff --git a/www-client/surf/files/surf-0.6-gentoo.patch b/www-client/surf/files/surf-0.6-gentoo.patch new file mode 100644 index 000000000000..cda644baa84e --- /dev/null +++ b/www-client/surf/files/surf-0.6-gentoo.patch @@ -0,0 +1,133 @@ +--- 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 diff --git a/www-client/surf/files/surf-9999-gentoo.patch b/www-client/surf/files/surf-9999-gentoo.patch new file mode 100644 index 000000000000..424b08d75cc3 --- /dev/null +++ b/www-client/surf/files/surf-9999-gentoo.patch @@ -0,0 +1,133 @@ +--- 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 |