diff options
| author |   Dane Smith <smitdane@gmail.com> | 2010-08-12 21:36:35 -0400 |
|---|---|---|
| committer | Dane Smith <smitdane@gmail.com> | 2010-08-12 21:36:35 -0400 |
| commit | 80e198c43a350ab9468f1eefeb5b93b5ec5915e3 (patch) | |
| tree | 3d2e7aad2fc60987ac776bced20ce3f957e999cb | |
| parent | This time, 100% less suck (diff) | |
| download | smithdanea-80e198c43a350ab9468f1eefeb5b93b5ec5915e3.tar.gz smithdanea-80e198c43a350ab9468f1eefeb5b93b5ec5915e3.tar.bz2 smithdanea-80e198c43a350ab9468f1eefeb5b93b5ec5915e3.zip | |
Final try
| -rw-r--r-- | app-misc/glimpse/Manifest | 3 | ||||
| -rw-r--r-- | app-misc/glimpse/files/glimpse-4.18.5-makefile.patch | 42 | ||||
| -rw-r--r-- | app-misc/glimpse/glimpse-4.18.5.ebuild | 9 |
3 files changed, 49 insertions, 5 deletions
diff --git a/app-misc/glimpse/Manifest b/app-misc/glimpse/Manifest index 0417e0a..4b0b1dc 100644 --- a/app-misc/glimpse/Manifest +++ b/app-misc/glimpse/Manifest @@ -1,4 +1,5 @@ +AUX glimpse-4.18.5-makefile.patch 1044 RMD160 41345e7b351d6107ede3b33cf4451f63e2e1b7f5 SHA1 89fffef4433febca6ab791770487b5e11e83026c SHA256 a4bbf8b63cd20242c51b3200d150850854da455f17bfc7b8914598aee7d4fca8 DIST glimpse-4.18.5.tar.gz 402754 RMD160 12693f9fd4565fc795e43e32b0d318401cdadbe2 SHA1 929bfb03bcef29be313e5ec599ee640dd8ef7e70 SHA256 ef15d43db09d59fdce6d46343ac38a3d996924dfce3287ba63c76e6be93b70e1 -EBUILD glimpse-4.18.5.ebuild 1390 RMD160 af83901ca90febcd7ba18fc0efcdb22c3c181448 SHA1 f1796de1be5f02a5ff06b221b98486ad4fe14aee SHA256 e21a67330a708ae5732f5eeb88a8f7964139851322e0aaaaa303ca8642e871bd +EBUILD glimpse-4.18.5.ebuild 1382 RMD160 39e55e3f0bf61e9fa7aa50a20b394f384bd34e35 SHA1 4508bd1034020f4912fc492d8d4f7250e374ec84 SHA256 50d6a2107907511ea5d9ddb2b624151589cef0432684d1089085a6a8ed0207d2 MISC ChangeLog 293 RMD160 d4ae3c64a9187f12f33c114330aeaa2f68cca130 SHA1 720e41cc88de3cb0ac91b151453d74ee5475f01c SHA256 f6c8d71fdd6421ddefbf54fe72a2bee83a89736d086fa77841e70e73197c4415 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829 diff --git a/app-misc/glimpse/files/glimpse-4.18.5-makefile.patch b/app-misc/glimpse/files/glimpse-4.18.5-makefile.patch new file mode 100644 index 0000000..8606409 --- /dev/null +++ b/app-misc/glimpse/files/glimpse-4.18.5-makefile.patch @@ -0,0 +1,42 @@ +--- Makefile.in 2006-03-10 20:42:12.000000000 -0500 ++++ Makefile.in.new 2010-08-12 21:12:41.000000000 -0400 +@@ -52,7 +52,7 @@ + PROGAGREP = agrep/agrep + OPTIMIZEFLAGS = -O2 + INCLUDEFLAGS = -I$(INDEXDIR) -I$(AGREPDIR) -I$(TEMPLATEDIR)/include +-CFLAGS = $(INCLUDEFLAGS) $(DEFS) ++CFLAGS = $(INCLUDEFLAGS) $(DEFS) $(OPTIMIZEFLAGS) + + OBJS = get_filename.o \ + get_index.o \ +@@ -78,7 +78,7 @@ + $(INDEXDIR)/memlook.c \ + $(INDEXDIR)/io.c + +-all: build-sub @TARGET@ ++all: build-sub + Sall: $(PROG) $(PROGSERVER) $(PROGINDEX) + agrep: $(PROGAGREP) + NOTSall: $(NOTSPROG) $(NOTSPROGSERVER) +@@ -87,6 +87,7 @@ + for d in $(SUBDIRS) ; do \ + ( cd $$d; $(MAKE) ); \ + done ++ $(MAKE) @TARGET@ + + # Check target + +@@ -105,11 +106,11 @@ + + install-man: + for d in $(MANUAL) ; do \ +- $(INSTALL_MAN) $$d $(mandir) ; \ ++ $(INSTALL_MAN) $$d $(mandir)/man1/ ; \ + done + + installdirs: mkinstalldirs +- $(srcdir)/mkinstalldirs $(bindir) $(mandir) ++ $(srcdir)/mkinstalldirs $(bindir) $(mandir)/man1/ + + clean: + for d in $(SUBDIRS); do \ diff --git a/app-misc/glimpse/glimpse-4.18.5.ebuild b/app-misc/glimpse/glimpse-4.18.5.ebuild index 412bc13..e22d6d2 100644 --- a/app-misc/glimpse/glimpse-4.18.5.ebuild +++ b/app-misc/glimpse/glimpse-4.18.5.ebuild @@ -27,25 +27,26 @@ src_unpack() { sed -i \ -e '/^CFLAGS/s:$: $(OPTIMIZEFLAGS):' \ {agrep,compress,index}/Makefile.in \ - Makefile.in \ libtemplate/{template,util}/Makefile.in \ || die "inserting OPTIMIZEFLAGS failed" sed -i \ -e 's:$(mandir):&/man1/:' \ - Makefile.in agrep/Makefile.in \ + agrep/Makefile.in \ || die "adding man1 to man install dir failed" sed -i \ -e '/^LDFLAGS/d' \ {agrep,compress,index}/Makefile.in \ - || die "Remove the blanking of LDFLAGS failed" + || die "LDFLAGS sed failed" + + epatch "${FILESDIR}"/${P}-makefile.patch } src_compile() { use static && append-ldflags -static econf || die - emake -j1 OPTIMIZEFLAGS="${CFLAGS}" || die + emake OPTIMIZEFLAGS="${CFLAGS}" || die } src_install() { |