add -r1 which patches Makefile.in and Makefile.am to accept CXXFLAGS

4 files changed, 270 insertions, 1 deletions

diff --git a/net-misc/bk2site/ChangeLog b/net-misc/bk2site/ChangeLog
index 419c8ef6ffaf..dcf58aaa73ed 100644
--- a/net-misc/bk2site/ChangeLog
+++ b/net-misc/bk2site/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for net-misc/bk2site
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bk2site/ChangeLog,v 1.2 2002/04/06 06:55:32 jnelson Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bk2site/ChangeLog,v 1.3 2002/04/06 07:28:16 jnelson Exp $
 
+*bk2site-1.1.8-r1 (5 Apr 2002)
+
+  5 Apr 2002; Jon Nelson <jnelson@gentoo.org> ChangeLog,
+   bk2site-1.1.8.ebuild-r1, files/ebuild.patch
+
+  Patch Makefile.am and Makefile.in to support CXXFLAGS
+  
 *bk2site-1.1.8 (5 Apr 2002)
 
   5 Apr 2002; Jon Nelson <jnelson@gentoo.org> ChangeLog bk2site-1.1.8.ebuild:
diff --git a/net-misc/bk2site/bk2site-1.1.8-r1.ebuild b/net-misc/bk2site/bk2site-1.1.8-r1.ebuild
new file mode 100644
index 000000000000..a757c09fa968
--- /dev/null
+++ b/net-misc/bk2site/bk2site-1.1.8-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Maintainer: Jon Nelson <jnelson@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bk2site/bk2site-1.1.8-r1.ebuild,v 1.1 2002/04/06 07:28:16 jnelson Exp $
+
+S=${WORKDIR}/${P}
+
+DESCRIPTION="bk2site will transform your Netscape bookmarks file into a yahoo-like website with slashdot-like news."
+SRC_URI="http://prdownloads.sourceforge.net/bk2site/${P}.tar.gz"
+HOMEPAGE="http://bk2site.sourceforge.net/"
+
+DEPEND=""
+#RDEPEND=""
+
+
+src_unpack() {
+	unpack $A
+        # Apply any patches available for this version
+        local patches=`echo ${FILESDIR}/${PV}.[0-9][0-9][0-9]`
+        case "$patches" in
+                *\]) 
+                        ;; # globbing didn't work; no patches available
+                *)
+                        cd $S
+                        for a in $patches; do
+                                patch -p0 < $a
+                        done
+                        ;;
+        esac
+        patch -f -p0 < ${FILESDIR}/ebuild.patch
+}
+
+src_compile() {
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man || die "./configure failed"
+	emake || die
+	#make || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+	insinto /etc/bk2site
+	doins indexbase.html newbase.html otherbase.html searchbase.html
+	dodoc bk2site.html *.gif 
+	dodoc README COPYING AUTHORS ChangeLog INSTALL NEWS TODO
+	exeinto /home/httpd/cgi-bin/bk2site
+	doexe *.pl
+}
diff --git a/net-misc/bk2site/files/digest-bk2site-1.1.8-r1 b/net-misc/bk2site/files/digest-bk2site-1.1.8-r1
new file mode 100644
index 000000000000..193de00067d7
--- /dev/null
+++ b/net-misc/bk2site/files/digest-bk2site-1.1.8-r1
@@ -0,0 +1 @@
+MD5 35417b26e056926d42925f25268082a8 bk2site-1.1.8.tar.gz 124411
diff --git a/net-misc/bk2site/files/ebuild.patch b/net-misc/bk2site/files/ebuild.patch
new file mode 100644
index 000000000000..e0403e008f38
--- /dev/null
+++ b/net-misc/bk2site/files/ebuild.patch
@@ -0,0 +1,210 @@
+Only in bk2site-1.1.8: .deps
+Only in bk2site-1.1.8: Makefile
+diff -ur bk2site-1.1.8.orig/Makefile.am bk2site-1.1.8/Makefile.am
+--- bk2site-1.1.8.orig/Makefile.am	Thu Dec  6 15:39:57 2001
++++ bk2site-1.1.8/Makefile.am	Sat Apr  6 01:20:12 2002
+@@ -19,7 +19,8 @@
+ 	$(man_MANS)
+ 
+ #CXXFLAGS=-Wall -g
+-CXXFLAGS = -O2
++#CXXFLAGS = -O2
++CXXFLAGS = @CXXFLAGS@
+ 
+ html:
+ 		./bk2site -f dot.bk2siterc
+diff -ur bk2site-1.1.8.orig/Makefile.in bk2site-1.1.8/Makefile.in
+--- bk2site-1.1.8.orig/Makefile.in	Thu Dec  6 15:55:04 2001
++++ bk2site-1.1.8/Makefile.in	Sat Apr  6 01:20:43 2002
+@@ -1,6 +1,6 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -75,7 +75,8 @@
+ 
+ 
+ #CXXFLAGS=-Wall -g
+-CXXFLAGS = -O2
++#CXXFLAGS = -O2
++CXXFLAGS = @CXXFLAGS@
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
+@@ -111,8 +112,10 @@
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
++DEP_FILES =  .deps/XMLParser.P .deps/bk2site.P .deps/channel.P \
++.deps/element.P .deps/funstring.P .deps/iwebstream.P .deps/reference.P
+ SOURCES = $(bk2site_SOURCES)
+ OBJECTS = $(bk2site_OBJECTS)
+ 
+@@ -120,9 +123,9 @@
+ .SUFFIXES:
+ .SUFFIXES: .C .S .c .o .s
+ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+@@ -187,9 +190,6 @@
+ 	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+ 	done
+ 
+-.c.o:
+-	$(COMPILE) -c $<
+-
+ .s.o:
+ 	$(COMPILE) -c $<
+ 
+@@ -337,6 +337,11 @@
+ 	-rm -rf $(distdir)
+ 	mkdir $(distdir)
+ 	-chmod 777 $(distdir)
++	here=`cd $(top_builddir) && pwd`; \
++	top_distdir=`cd $(distdir) && pwd`; \
++	distdir=`cd $(distdir) && pwd`; \
++	cd $(top_srcdir) \
++	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+@@ -347,19 +352,57 @@
+ 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+ 	  fi; \
+ 	done
+-XMLParser.o: XMLParser.C config.h XMLParser.H iwebstream.H reference.H \
+-	element.H funstring.H channel.H
+-bk2site.o: bk2site.C config.h channel.H reference.H element.H \
+-	iwebstream.H funstring.H XMLParser.H
+-channel.o: channel.C channel.H config.h reference.H element.H \
+-	iwebstream.H funstring.H
+-element.o: element.C config.h element.H reference.H iwebstream.H \
+-	funstring.H channel.H
+-funstring.o: funstring.C config.h funstring.H
+-iwebstream.o: iwebstream.C iwebstream.H config.h
+-reference.o: reference.C config.h reference.H element.H iwebstream.H \
+-	funstring.H channel.H XMLParser.H
+ 
++DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
++
++-include $(DEP_FILES)
++
++mostlyclean-depend:
++
++clean-depend:
++
++distclean-depend:
++	-rm -rf .deps
++
++maintainer-clean-depend:
++
++%.o: %.c
++	@echo '$(COMPILE) -c $<'; \
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.c
++	@echo '$(LTCOMPILE) -c $<'; \
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
++
++%.o: %.C
++	@echo '$(CXXCOMPILE) -c $<'; \
++	$(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
++
++%.lo: %.C
++	@echo '$(LTCXXCOMPILE) -c $<'; \
++	$(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
+ info-am:
+ info: info-am
+ dvi-am:
+@@ -401,25 +444,27 @@
+ 
+ maintainer-clean-generic:
+ mostlyclean-am:  mostlyclean-hdr mostlyclean-binPROGRAMS \
+-		mostlyclean-compile mostlyclean-tags \
++		mostlyclean-compile mostlyclean-tags mostlyclean-depend \
+ 		mostlyclean-generic
+ 
+ mostlyclean: mostlyclean-am
+ 
+ clean-am:  clean-hdr clean-binPROGRAMS clean-compile clean-tags \
+-		clean-generic mostlyclean-am
++		clean-depend clean-generic mostlyclean-am
+ 
+ clean: clean-am
+ 
+ distclean-am:  distclean-hdr distclean-binPROGRAMS distclean-compile \
+-		distclean-tags distclean-generic clean-am
++		distclean-tags distclean-depend distclean-generic \
++		clean-am
+ 
+ distclean: distclean-am
+ 	-rm -f config.status
+ 
+ maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-binPROGRAMS \
+ 		maintainer-clean-compile maintainer-clean-tags \
+-		maintainer-clean-generic distclean-am
++		maintainer-clean-depend maintainer-clean-generic \
++		distclean-am
+ 	@echo "This command is intended for maintainers to use;"
+ 	@echo "it deletes files that may require special tools to rebuild."
+ 
+@@ -433,12 +478,13 @@
+ maintainer-clean-compile install-man1 uninstall-man1 install-man \
+ uninstall-man uninstall-pkgdataDATA install-pkgdataDATA tags \
+ mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
+-distdir info-am info dvi-am dvi check check-am installcheck-am \
+-installcheck all-recursive-am install-exec-am install-exec \
+-install-data-am install-data install-am install uninstall-am uninstall \
+-all-redirect all-am all installdirs mostlyclean-generic \
+-distclean-generic clean-generic maintainer-clean-generic clean \
+-mostlyclean distclean maintainer-clean
++distdir mostlyclean-depend distclean-depend clean-depend \
++maintainer-clean-depend info-am info dvi-am dvi check check-am \
++installcheck-am installcheck all-recursive-am install-exec-am \
++install-exec install-data-am install-data install-am install \
++uninstall-am uninstall all-redirect all-am all installdirs \
++mostlyclean-generic distclean-generic clean-generic \
++maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ 
+ 
+ html:
+Only in bk2site-1.1.8: config.cache
+Only in bk2site-1.1.8: config.h
+Only in bk2site-1.1.8: config.log
+Only in bk2site-1.1.8: config.status
+Only in bk2site-1.1.8: stamp-h