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
2009-11-22 08:31:44 +01:00
parent 3c58e3ad40
commit 85cc462e1d
1305 changed files with 719 additions and 654 deletions

2
srcpkgs/openssl/depends Normal file
View File

@@ -0,0 +1,2 @@
abi_depends=">=0.9.8"
api_depends="${abi_depends}"

View File

@@ -0,0 +1,20 @@
# Template file for 'openssl-devel'.
#
short_desc="${short_desc} (development files)"
long_desc="${long_desc}
This package contains files for development, headers, static libs, etc."
Add_dependency run openssl
do_install()
{
mkdir -p ${DESTDIR}/usr/lib
mkdir -p ${DESTDIR}/usr/share/man
mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
}

View File

@@ -0,0 +1,11 @@
--- Makefile.org.orig 2008-10-24 06:41:08.000000000 +0200
+++ Makefile.org 2008-10-24 06:41:24.000000000 +0200
@@ -125,7 +125,7 @@ TESTS = alltests
MAKEFILE= Makefile
-MANDIR=$(OPENSSLDIR)/man
+MANDIR=$(INSTALLTOP)/share/man
MAN1=1
MAN3=3
MANSUFFIX=

View File

@@ -0,0 +1,23 @@
--- Makefile.shared.orig 2008-09-17 17:56:40.000000000 +0200
+++ Makefile.shared 2009-02-04 03:01:45.000000000 +0100
@@ -105,7 +105,7 @@ LINK_SO= \
LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
$${SHAREDCMD} $${SHAREDFLAGS} \
- -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
+ -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \
) && $(SYMLINK_SO)
@@ -149,9 +149,9 @@ DO_GNU_SO=$(CALC_VERSIONS); \
SHLIB_SUFFIX=; \
ALLSYMSFLAGS='-Wl,--whole-archive'; \
NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
+ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB.7"
-DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
+DO_GNU_APP=LDFLAGS="$(CFLAGS)"
#This is rather special. It's a special target with which one can link
#applications without bothering with any features that have anything to

42
srcpkgs/openssl/template Normal file
View File

@@ -0,0 +1,42 @@
# Template file for 'openssl'
pkgname=openssl
openssl_version=0.9.8
version=${openssl_version}l
distfiles="http://www.openssl.org/source/$pkgname-$version.tar.gz"
build_style=configure
configure_script="./config"
configure_args="--prefix=/usr
--install_prefix=$XBPS_DESTDIR/$pkgname-$version --openssldir=/etc/ssl
zlib-dynamic shared threads"
make_build_target="all"
short_desc="Secure Socket Layer and cryptographic library"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=ecd054e9eed2e9c1620ba15257e6fc4d882c9a4aea663d23b769e2138de8c91a
long_desc="
The OpenSSL Project is a collaborative effort to develop a robust,
commercial-grade, full-featured, and Open Source toolkit implementing the
Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1)
protocols as well as a full-strength general purpose cryptography library."
# Does not build with -j.
disable_parallel_build=yes
conf_files="/etc/ssl/openssl.cnf"
subpackages="openssl-devel"
Add_dependency full glibc
Add_dependency full zlib
Add_dependency build perl
post_install()
{
# Grr. Stupid Makefile, remove stuff installed in wrong dir.
rm -rf $DESTDIR/usr/usr
# Fix for correct SONAME in shared libs.
cd $DESTDIR/usr/lib || exit 1
for f in libssl libcrypto; do
ln -sf $f.so.${openssl_version} $f.so.7
done
# Remove passwd.1 manpage, it's supplied by the shadow pkg.
rm -f ${DESTDIR}/usr/share/man/man1/passwd.1
}