diff --git a/app-arch/bzip2/patches/bzip2-1.0.5.patch b/app-arch/bzip2/patches/bzip2-1.0.5.patch index 248b5f0c1..b53f738cc 100644 --- a/app-arch/bzip2/patches/bzip2-1.0.5.patch +++ b/app-arch/bzip2/patches/bzip2-1.0.5.patch @@ -1,12 +1,13 @@ diff -urN work/bzip2-1.0.5/Makefile work-haiku/bzip2-1.0.5/Makefile --- bzip2-1.0.5/Makefile 2008-02-14 12:39:18.000000000 +0000 +++ bzip2-1.0.5-haiku/Makefile 2009-12-27 00:29:38.000000000 +0000 -@@ -24,7 +24,7 @@ +@@ -24,7 +24,8 @@ CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) # Where you want it installed when you do 'make install' -PREFIX=/usr/local +PREFIX=/boot/common ++DOCDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` OBJS= blocksort.o \ @@ -53,8 +54,8 @@ diff -urN work/bzip2-1.0.5/Makefile work-haiku/bzip2-1.0.5/Makefile - echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1 + if ( test ! -d $(DESTDIR)$(PREFIX)/bin ) ; then mkdir -p $(DESTDIR)$(PREFIX)/bin ; fi + if ( test ! -d $(DESTDIR)$(PREFIX)/lib ) ; then mkdir -p $(DESTDIR)$(PREFIX)/lib ; fi -+ if ( test ! -d $(DESTDIR)$(PREFIX)/man ) ; then mkdir -p $(DESTDIR)$(PREFIX)/man ; fi -+ if ( test ! -d $(DESTDIR)$(PREFIX)/man/man1 ) ; then mkdir -p $(DESTDIR)$(PREFIX)/man/man1 ; fi ++ if ( test ! -d $(DESTDIR)$(DOCDIR)/man ) ; then mkdir -p $(DESTDIR)$(DOCDIR)/man ; fi ++ if ( test ! -d $(DESTDIR)$(DOCDIR)/man/man1 ) ; then mkdir -p $(DESTDIR)$(DOCDIR)/man/man1 ; fi + if ( test ! -d $(DESTDIR)$(PREFIX)/include ) ; then mkdir -p $(DESTDIR)$(PREFIX)/include ; fi + cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bzip2 + cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bunzip2 @@ -64,8 +65,8 @@ diff -urN work/bzip2-1.0.5/Makefile work-haiku/bzip2-1.0.5/Makefile + chmod a+x $(DESTDIR)$(PREFIX)/bin/bunzip2 + chmod a+x $(DESTDIR)$(PREFIX)/bin/bzcat + chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2recover -+ cp -f bzip2.1 $(DESTDIR)$(PREFIX)/man/man1 -+ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzip2.1 ++ cp -f bzip2.1 $(DESTDIR)$(DOCDIR)/man/man1 ++ chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzip2.1 + cp -f bzlib.h $(DESTDIR)$(PREFIX)/include + chmod a+r $(DESTDIR)$(PREFIX)/include/bzlib.h + cp -f libbz2.a $(DESTDIR)$(PREFIX)/lib @@ -83,14 +84,14 @@ diff -urN work/bzip2-1.0.5/Makefile work-haiku/bzip2-1.0.5/Makefile + cp -f bzdiff $(DESTDIR)$(PREFIX)/bin/bzdiff + ln -s -f $(PREFIX)/bin/bzdiff $(DESTDIR)$(PREFIX)/bin/bzcmp + chmod a+x $(DESTDIR)$(PREFIX)/bin/bzdiff -+ cp -f bzgrep.1 bzmore.1 bzdiff.1 $(DESTDIR)$(PREFIX)/man/man1 -+ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzgrep.1 -+ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzmore.1 -+ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzdiff.1 -+ echo ".so man1/bzgrep.1" > $(DESTDIR)$(PREFIX)/man/man1/bzegrep.1 -+ echo ".so man1/bzgrep.1" > $(DESTDIR)$(PREFIX)/man/man1/bzfgrep.1 -+ echo ".so man1/bzmore.1" > $(DESTDIR)$(PREFIX)/man/man1/bzless.1 -+ echo ".so man1/bzdiff.1" > $(DESTDIR)$(PREFIX)/man/man1/bzcmp.1 ++ cp -f bzgrep.1 bzmore.1 bzdiff.1 $(DESTDIR)$(DOCDIR)/man/man1 ++ chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzgrep.1 ++ chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzmore.1 ++ chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzdiff.1 ++ echo ".so man1/bzgrep.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzegrep.1 ++ echo ".so man1/bzgrep.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzfgrep.1 ++ echo ".so man1/bzmore.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzless.1 ++ echo ".so man1/bzdiff.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzcmp.1 clean: rm -f *.o libbz2.a bzip2 bzip2recover \