main/nspr: fix the soname for libs

make sure that the soname patch gets used by running autoconf
remove similar patch that does not work.
again put the .so symlink to -dev package as it should not be
needed anymore.

4 files changed, 31 insertions, 61 deletions

diff --git a/main/nspr/APKBUILD b/main/nspr/APKBUILD
index 2d639817d8..e492b23c23 100644
--- a/main/nspr/APKBUILD
+++ b/main/nspr/APKBUILD
@@ -1,32 +1,38 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=nspr
 pkgver=4.8.6
-pkgrel=4
+pkgrel=5
 pkgdesc="Netscape Portable Runtime"
 url="http://www.mozilla.org/projects/nspr/"
 arch="all"
 license="MPL-1.1 GPL-2 LGPL-2.1"
 depends=
+makedepends="autoconf sed"
 subpackages="$pkgname-dev"
 source="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$pkgver/src/nspr-$pkgver.tar.gz
-	nspr-4.6.1-config-1.patch
 	nspr-4.7.0-prtime.patch
+	nspr-4.8-sonames.patch
 	nspr-4.8-config.patch
 	nspr-4.8-pkgconfig-gentoo-3.patch
-	nspr-4.8-sonames.patch
+	nspr-bb-shell.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
 	mkdir build inst
-	for i in "$srcdir"/*.patch; do
-		msg "Applying $i"
-		patch -p1 -i "$i" || return 1
+	for i in $source; do
+		case $i in 
+		*.patch)
+			msg "Applying $i"
+			patch -p1 -i "$srcdir"/$i || return 1
+			;;
+		esac
 	done
 	# respect LDFLAGS
 	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
 		mozilla/nsprpub/config/rules.mk
+	cd mozilla/nsprpub && aclocal && autoconf
 }
 
 build() {
@@ -38,45 +44,18 @@ build() {
 	../mozilla/nsprpub/configure --prefix=/usr \
 		$conf \
 		|| return 1
-	make CC="${CC:-gcc}" CXX="${CXX:-g++}" || return 1
-}
-
-dev() {
-        local i= j=
-        depends="$pkgname $depends_dev"
-	replaces="nspr"
-
-        cd "$pkgdir" || return 0
-
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/nspr-config "$subpkgdir"/usr/bin
-
-        for i in usr/include usr/lib/pkgconfig; do
-                if [ -e "$pkgdir/$i" ] || [ -L "$pkgdir/$i" ]; then
-                        d="$subpkgdir/${i%/*}"  # dirname $i
-                        mkdir -p "$d"
-                        mv "$pkgdir/$i" "$d"
-                        rmdir "$pkgdir/${i%/*}" 2>/dev/null
-                fi
-        done
-
-	return 0
+	make SO_VERSION=$pkgver CC="${CC:-gcc}" CXX="${CXX:-g++}" || return 1
 }
 
 package() {
-	local file= minor_version=${pkgver#*.}
-	minor_version=${minor_version%.*}
+	local file= 
 	replaces="nspr-dev"
 
 	cd "$_builddir"/build
-	make DESTDIR="$pkgdir" install || die "emake install failed"
+	make SO_VERSION=$pkgver DESTDIR="$pkgdir" install || return 1
 
 	cd "$pkgdir"/usr/lib
 	rm -f *.a
-	for file in *.so; do
-		mv ${file} ${file}.${minor_version} || return 1
-		ln -s ${file}.${minor_version} ${file} || return 1
-	done
 
 	cd "$_builddir"/build/config
 	install -Dm755 nspr-config "$pkgdir"/usr/bin/nspr-config || return 1
@@ -88,8 +67,8 @@ package() {
 }
 
 md5sums="592c275728c29d193fdba8009165990b  nspr-4.8.6.tar.gz
-d204a641dd7cbf6751d14dc6b98835f1  nspr-4.6.1-config-1.patch
 c48e1f47799c1cff7e3bf46dc0e653f1  nspr-4.7.0-prtime.patch
+5c9f15c65561af93ff5e148d8b64e212  nspr-4.8-sonames.patch
 c790c638a7c9fd1d731272f464f065c6  nspr-4.8-config.patch
-5b67b4339be94d0dbc4337a55eabe73a  nspr-4.8-pkgconfig-gentoo-3.patch
-5c9f15c65561af93ff5e148d8b64e212  nspr-4.8-sonames.patch"
+c31984cfcc167eb010aed949ace236ae  nspr-4.8-pkgconfig-gentoo-3.patch
+6574eabdfbfcd246e0dfaf1aa8b0e695  nspr-bb-shell.patch"
diff --git a/main/nspr/nspr-4.6.1-config-1.patch b/main/nspr/nspr-4.6.1-config-1.patch
deleted file mode 100644
index b919c7930b..0000000000
--- a/main/nspr/nspr-4.6.1-config-1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mozilla/nsprpub/configure.orig	2006-01-14 22:41:37.000000000 +0000
-+++ b/mozilla/nsprpub/configure	2006-01-14 22:49:14.000000000 +0000
-@@ -3893,7 +3893,7 @@
-     PR_MD_CSRCS=linux.c
-     MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-     DSO_CFLAGS=-fPIC
--    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
-+    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@).$(MOD_MINOR_VERSION)'
-     _OPTIMIZE_FLAGS=-O2
-     _DEBUG_FLAGS="-g -fno-inline"  # most people on linux use gcc/gdb, and that
-                                    # combo is not yet good at debugging inlined
diff --git a/main/nspr/nspr-4.8-pkgconfig-gentoo-3.patch b/main/nspr/nspr-4.8-pkgconfig-gentoo-3.patch
index 2525928db4..89e042d957 100644
--- a/main/nspr/nspr-4.8-pkgconfig-gentoo-3.patch
+++ b/main/nspr/nspr-4.8-pkgconfig-gentoo-3.patch
@@ -102,17 +102,6 @@ diff -urN nspr-4.8-orig/mozilla/nsprpub/config/rules.mk nspr-4.8/mozilla/nsprpub
  	+$(LOOP_OVER_DIRS)
  
  alltags:
-diff -urN nspr-4.8-orig/mozilla/nsprpub/configure nspr-4.8/mozilla/nsprpub/configure
---- nspr-4.8-orig/mozilla/nsprpub/configure	2009-09-12 00:43:47.600359058 -0500
-+++ nspr-4.8/mozilla/nsprpub/configure	2009-09-12 00:44:19.444380569 -0500
-@@ -6037,6 +6037,7 @@
- config/nsprincl.mk
- config/nsprincl.sh
- config/nspr-config
-+config/nspr.pc
- lib/Makefile 
- lib/ds/Makefile 
- lib/libc/Makefile 
 diff -urN nspr-4.8-orig/mozilla/nsprpub/configure.in nspr-4.8/mozilla/nsprpub/configure.in
 --- nspr-4.8-orig/mozilla/nsprpub/configure.in	2009-09-12 00:43:47.678357452 -0500
 +++ nspr-4.8/mozilla/nsprpub/configure.in	2009-09-12 00:44:19.451396074 -0500
diff --git a/main/nspr/nspr-bb-shell.patch b/main/nspr/nspr-bb-shell.patch
new file mode 100644
index 0000000000..a336c2a56c
--- /dev/null
+++ b/main/nspr/nspr-bb-shell.patch
@@ -0,0 +1,13 @@
+diff --git a/mozilla/nsprpub/configure.in b/mozilla/nsprpub/configure.in
+index 25dcca1..b508762 100644
+--- a/mozilla/nsprpub/configure.in
++++ b/mozilla/nsprpub/configure.in
+@@ -511,7 +511,7 @@ if test "$target" != "$host"; then
+ 
+     AC_MSG_CHECKING([whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
+     AC_TRY_COMPILE([], [return(0);], 
+-        [ac_cv_prog_host_cc_works=1 AC_MSG_RESULT([yes])],
++        [ac_cv_prog_host_cc_works=1; AC_MSG_RESULT([yes])],
+         AC_MSG_ERROR([installation or configuration problem: $host compiler $HOST_CC cannot create executables.]) )
+ 
+     CC=$_SAVE_CC