libtoolize libatomic_ops so it builds shared libraries, bump PKGREVISION

5 files changed, 48 insertions, 5 deletions

diff --git a/devel/libatomic_ops/Makefile b/devel/libatomic_ops/Makefile
index 81a9a078412..62b1f58db59 100644
--- a/devel/libatomic_ops/Makefile
+++ b/devel/libatomic_ops/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/10/25 00:32:23 bjs Exp $
+# $NetBSD: Makefile,v 1.2 2008/12/22 02:46:52 jmcneill Exp $
 #
 .include "Makefile.version"
 
 DISTNAME=	libatomic_ops-${LIBATOMIC_OPS_SNAPDATE}
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
@@ -14,11 +15,16 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}/libatomic_ops-${LIBATOMIC_OPS_VERSION}
 GNU_CONFIGURE=	yes
+USE_TOOLS+=	gmake automake autoconf autoreconf
+USE_LIBTOOL=	yes
 TEST_TARGET=	check
 
 INSTALL_MAKE_FLAGS=	pkgdatadir=${PKGDOCDIR:Q}
 PKGDOCDIR=		${PREFIX}/share/doc/libatomic_ops
 
+pre-configure:
+	cd ${WRKSRC} && autoreconf -vif
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/atomic_ops/sysdeps/README \
 		${DESTDIR}${PKGDOCDIR}/README_headers.txt
diff --git a/devel/libatomic_ops/PLIST b/devel/libatomic_ops/PLIST
index 378c5421762..ab932496b3a 100644
--- a/devel/libatomic_ops/PLIST
+++ b/devel/libatomic_ops/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/10/25 00:32:23 bjs Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/12/22 02:46:52 jmcneill Exp $
 include/atomic_ops.h
 include/atomic_ops/generalize-small.h
 include/atomic_ops/generalize.h
@@ -47,8 +47,8 @@ include/atomic_ops/sysdeps/test_and_set_t_is_ao_t.h
 include/atomic_ops/sysdeps/test_and_set_t_is_char.h
 include/atomic_ops_malloc.h
 include/atomic_ops_stack.h
-lib/libatomic_ops.a
-lib/libatomic_ops_gpl.a
+lib/libatomic_ops.la
+lib/libatomic_ops_gpl.la
 share/doc/libatomic_ops/COPYING
 share/doc/libatomic_ops/LICENSING.txt
 share/doc/libatomic_ops/README.txt
diff --git a/devel/libatomic_ops/distinfo b/devel/libatomic_ops/distinfo
index 431a9f1823c..31a04fb80ec 100644
--- a/devel/libatomic_ops/distinfo
+++ b/devel/libatomic_ops/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2008/10/25 05:46:01 bjs Exp $
+$NetBSD: distinfo,v 1.3 2008/12/22 02:46:52 jmcneill Exp $
 
 SHA1 (libatomic_ops-20081024.tar.gz) = 70dcc68c89ea8ce8b8e6c936ea337eca31f13662
 RMD160 (libatomic_ops-20081024.tar.gz) = a9194631fafc2d4ce68cea93dbc212d7212cab13
 Size (libatomic_ops-20081024.tar.gz) = 193399 bytes
 SHA1 (patch-aa) = bf53ad892ba270b1d7a9bd1fa14012ca83ab5323
+SHA1 (patch-ab) = 74674124fff34faf2aae0d694566c66ffaf9df25
+SHA1 (patch-ac) = 40eeac276e322ea6f28743c183c11e92b1ab8de5
diff --git a/devel/libatomic_ops/patches/patch-ab b/devel/libatomic_ops/patches/patch-ab
new file mode 100644
index 00000000000..997507cadef
--- /dev/null
+++ b/devel/libatomic_ops/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.1 2008/12/22 02:47:24 jmcneill Exp $
+
+--- src/Makefile.am.orig	2006-07-11 19:29:29.000000000 -0400
++++ src/Makefile.am	2008-12-21 21:42:31.000000000 -0500
+@@ -3,14 +3,14 @@
+ AM_CFLAGS=@PICFLAG@
+ 
+ include_HEADERS=atomic_ops.h atomic_ops_stack.h atomic_ops_malloc.h
+-lib_LIBRARIES = libatomic_ops.a libatomic_ops_gpl.a
++lib_LTLIBRARIES = libatomic_ops.la libatomic_ops_gpl.la
+ if NEED_ASM
+-libatomic_ops_a_SOURCES = atomic_ops.c atomic_ops_sysdeps.S
++libatomic_ops_la_SOURCES = atomic_ops.c atomic_ops_sysdeps.S
+ else
+-libatomic_ops_a_SOURCES = atomic_ops.c
++libatomic_ops_la_SOURCES = atomic_ops.c
+ endif
+ 
+-libatomic_ops_gpl_a_SOURCES = atomic_ops_stack.c atomic_ops_malloc.c
++libatomic_ops_gpl_la_SOURCES = atomic_ops_stack.c atomic_ops_malloc.c
+ 
+ EXTRA_DIST=Makefile.msft
+ 
diff --git a/devel/libatomic_ops/patches/patch-ac b/devel/libatomic_ops/patches/patch-ac
new file mode 100644
index 00000000000..2d10b8a2b51
--- /dev/null
+++ b/devel/libatomic_ops/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2008/12/22 02:47:24 jmcneill Exp $
+
+--- configure.ac.orig	2008-12-21 21:44:17.000000000 -0500
++++ configure.ac	2008-12-21 21:44:24.000000000 -0500
+@@ -4,6 +4,7 @@
+ AC_CONFIG_SRCDIR(src/atomic_ops.c)
+ AM_INIT_AUTOMAKE
+ AC_PROG_RANLIB
++AC_PROG_LIBTOOL
+ 
+ AM_CONFIG_HEADER(src/config.h)
+