Major infrastructure changes, part 2.
* Moved helpers, common and triggers dirs into xbps-src, where
they belong.
* Renamed the templates dir to srcpkgs, it was so redundant before.
* Make it possible to add subpkgs with no restriction in names, for
example udev now has a subpkgs called "libgudev". Previously
subpkgs were named "${sourcepkg}-${pkgname}".
* xbps-src: changed to look for template files in current directory.
That means that most arguments from the targets have been removed.
* xbps-src: added a reinstall target, to remove + install.
* xbps-src: do not overwrite binpkgs by default, skip them.
And more that I forgot because it's a mega-commit that I've been
working for some days already...
--HG--
extra : convert_revision : 0f466878584d1e6895d2a234f07ea1b2d1e61b3e
This commit is contained in:
Juan RP
15
srcpkgs/bzip2/bzip2-devel.template
Normal file
15
srcpkgs/bzip2/bzip2-devel.template
Normal file
@@ -0,0 +1,15 @@
|
||||
# Template file for 'bzip2-devel'.
|
||||
#
|
||||
short_desc="${sourcepkg} development files"
|
||||
long_desc="${long_desc}
|
||||
|
||||
This package contains files for development, headers, static libs, etc."
|
||||
|
||||
Add_dependency run bzip2
|
||||
|
||||
do_install()
|
||||
{
|
||||
mkdir -p ${DESTDIR}/usr/lib
|
||||
mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
|
||||
mv ${SRCPKGDESTDIR}/usr/lib/libbz2.*a ${DESTDIR}/usr/lib
|
||||
}
|
||||
2
srcpkgs/bzip2/depends
Normal file
2
srcpkgs/bzip2/depends
Normal file
@@ -0,0 +1,2 @@
|
||||
abi_depends=">=1.0.5"
|
||||
api_depends="${abi_depends}"
|
||||
69
srcpkgs/bzip2/patches/Makefile_fix_install.diff
Normal file
69
srcpkgs/bzip2/patches/Makefile_fix_install.diff
Normal file
@@ -0,0 +1,69 @@
|
||||
--- Makefile.orig 2008-02-14 13:39:18.000000000 +0100
|
||||
+++ Makefile 2009-02-18 02:31:13.000000000 +0100
|
||||
@@ -25,7 +25,7 @@ CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
|
||||
|
||||
# Where you want it installed when you do 'make install'
|
||||
PREFIX=/usr/local
|
||||
-
|
||||
+MANDIR=$(PREFIX)/share/man
|
||||
|
||||
OBJS= blocksort.o \
|
||||
huffman.o \
|
||||
@@ -72,8 +72,8 @@ test: bzip2
|
||||
install: bzip2 bzip2recover
|
||||
if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
|
||||
if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
|
||||
- if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
|
||||
- if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
|
||||
+ if ( test ! -d $(MANDIR) ) ; then mkdir -p $(MANDIR) ; fi
|
||||
+ if ( test ! -d $(MANDIR)/man1 ) ; then mkdir -p $(MANDIR)/man1 ; fi
|
||||
if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
|
||||
cp -f bzip2 $(PREFIX)/bin/bzip2
|
||||
cp -f bzip2 $(PREFIX)/bin/bunzip2
|
||||
@@ -83,31 +83,30 @@ install: bzip2 bzip2recover
|
||||
chmod a+x $(PREFIX)/bin/bunzip2
|
||||
chmod a+x $(PREFIX)/bin/bzcat
|
||||
chmod a+x $(PREFIX)/bin/bzip2recover
|
||||
- cp -f bzip2.1 $(PREFIX)/man/man1
|
||||
- chmod a+r $(PREFIX)/man/man1/bzip2.1
|
||||
+ cp -f bzip2.1 $(MANDIR)/man1
|
||||
+ chmod a+r $(MANDIR)/man1/bzip2.1
|
||||
cp -f bzlib.h $(PREFIX)/include
|
||||
chmod a+r $(PREFIX)/include/bzlib.h
|
||||
cp -f libbz2.a $(PREFIX)/lib
|
||||
- chmod a+r $(PREFIX)/lib/libbz2.a
|
||||
+ cp -a libbz2.so* $(PREFIX)/lib
|
||||
+ #chmod a+r $(PREFIX)/lib/libbz2.*
|
||||
cp -f bzgrep $(PREFIX)/bin/bzgrep
|
||||
- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
|
||||
- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
|
||||
+ cd $(PREFIX)/bin && ln -s bzgrep bzegrep && ln -s bzgrep bzfgrep
|
||||
chmod a+x $(PREFIX)/bin/bzgrep
|
||||
cp -f bzmore $(PREFIX)/bin/bzmore
|
||||
- ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
|
||||
+ cd $(PREFIX)/bin && ln -s bzmore bzless
|
||||
chmod a+x $(PREFIX)/bin/bzmore
|
||||
cp -f bzdiff $(PREFIX)/bin/bzdiff
|
||||
- ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
|
||||
+ cd $(PREFIX)/bin && ln -s bzdiff bzcmp
|
||||
chmod a+x $(PREFIX)/bin/bzdiff
|
||||
- cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
|
||||
- chmod a+r $(PREFIX)/man/man1/bzgrep.1
|
||||
- chmod a+r $(PREFIX)/man/man1/bzmore.1
|
||||
- chmod a+r $(PREFIX)/man/man1/bzdiff.1
|
||||
- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1
|
||||
- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
|
||||
- echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
|
||||
- echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
|
||||
-
|
||||
+ cp -f bzgrep.1 bzmore.1 bzdiff.1 $(MANDIR)/man1
|
||||
+ chmod a+r $(MANDIR)/man1/bzgrep.1
|
||||
+ chmod a+r $(MANDIR)/man1/bzmore.1
|
||||
+ chmod a+r $(MANDIR)/man1/bzdiff.1
|
||||
+ echo ".so man1/bzgrep.1" > $(MANDIR)/man1/bzegrep.1
|
||||
+ echo ".so man1/bzgrep.1" > $(MANDIR)/man1/bzfgrep.1
|
||||
+ echo ".so man1/bzmore.1" > $(MANDIR)/man1/bzless.1
|
||||
+ echo ".so man1/bzdiff.1" > $(MANDIR)/man1/bzcmp.1
|
||||
clean:
|
||||
rm -f *.o libbz2.a bzip2 bzip2recover \
|
||||
sample1.rb2 sample2.rb2 sample3.rb2 \
|
||||
22
srcpkgs/bzip2/patches/Makefile_libbz2_so_fix_soname.diff
Normal file
22
srcpkgs/bzip2/patches/Makefile_libbz2_so_fix_soname.diff
Normal file
@@ -0,0 +1,22 @@
|
||||
--- Makefile-libbz2_so.orig 2007-12-09 14:00:50.000000000 +0100
|
||||
+++ Makefile-libbz2_so 2009-02-18 02:30:10.000000000 +0100
|
||||
@@ -35,13 +35,14 @@ OBJS= blocksort.o \
|
||||
bzlib.o
|
||||
|
||||
all: $(OBJS)
|
||||
- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS)
|
||||
- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4
|
||||
- rm -f libbz2.so.1.0
|
||||
- ln -s libbz2.so.1.0.4 libbz2.so.1.0
|
||||
+ $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.5 $(OBJS)
|
||||
+ $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.5
|
||||
+ ln -s libbz2.so.1.0.5 libbz2.so
|
||||
+ ln -s libbz2.so.1.0.5 libbz2.so.1
|
||||
+ #ln -s libbz2.so.1.0.5 libbz2.so.1.0
|
||||
|
||||
clean:
|
||||
- rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1.0 bzip2-shared
|
||||
+ rm -f $(OBJS) bzip2.o libbz2.so.* bzip2-shared
|
||||
|
||||
blocksort.o: blocksort.c
|
||||
$(CC) $(CFLAGS) -c blocksort.c
|
||||
28
srcpkgs/bzip2/template
Normal file
28
srcpkgs/bzip2/template
Normal file
@@ -0,0 +1,28 @@
|
||||
# Template build file for 'bzip2'.
|
||||
pkgname=bzip2
|
||||
version=1.0.5
|
||||
distfiles="http://www.bzip.org/1.0.5/$pkgname-$version.tar.gz"
|
||||
build_style=gnu_makefile
|
||||
make_build_target="-f Makefile-libbz2_so"
|
||||
make_install_args="PREFIX=$XBPS_DESTDIR/$pkgname-$version/usr"
|
||||
short_desc="The bzip2 compression library"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
checksum=f7bf5368309d76e5daf3a89d4d1bea688dac7780742e7a0ae1af19be9316fe22
|
||||
long_desc="
|
||||
bzip2 is a freely available, patent free, high-quality data compressor.
|
||||
It typically compresses files to within 10%% to 15%% of the best available
|
||||
techniques, whilst being around twice as fast at compression and six times
|
||||
faster at decompression.
|
||||
|
||||
bzip2 compresses files using the Burrows-Wheeler block-sorting text
|
||||
compression algorithm, and Huffman coding. Compression is generally
|
||||
considerably better than that achieved by more conventional LZ77/LZ78-based
|
||||
compressors, and approaches the performance of the PPM family of statistical
|
||||
compressors.
|
||||
|
||||
The archive file format of bzip2 (.bz2) is incompatible with that of its
|
||||
predecessor, bzip (.bz)."
|
||||
|
||||
base_chroot=yes
|
||||
subpackages="bzip2-devel"
|
||||
Add_dependency run glibc
|
||||
Reference in New Issue
Block a user