- Update to version 7.3alpha2

- Define LICENSE, utilize DISTVERSION, etc.
- Conditionally install documentation
- Reindent port description while here

PR:		ports/175662
Submitted by:	maintainer

6 files changed, 46 insertions, 56 deletions

diff --git a/devel/libatomic_ops/Makefile b/devel/libatomic_ops/Makefile
index 61ddb83eceaa..3336379ca41d 100644
--- a/devel/libatomic_ops/Makefile
+++ b/devel/libatomic_ops/Makefile
@@ -1,20 +1,37 @@
-# Created by: stas
+# Created by: Stanislav Sedov <stas@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libatomic_ops
-PORTVERSION=	7.2.a6
-PORTREVISION=	0
+DISTVERSION=	7.3alpha2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/
-DISTNAME=	gc-${PORTVERSION:S/.a/alpha/}
 
 MAINTAINER=	rodrigo@bebik.net
 COMMENT=	Atomic operations access library
 
-USE_AUTOTOOLS=	aclocal autoconf automake
+LICENSE=	BSD GPLv2
+LICENSE_COMB=	multi
+
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+USE_GNOME=	gnomehack
+
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/libatomic_ops
+post-patch:
+# Inhibit installation of extra copy of GPL
+	${REINPLACE_CMD} -E 's,: (un)?install-dist_pkgdataDATA,:,' \
+		${WRKSRC}/Makefile.in
+.if ${PORT_OPTIONS:MDOCS}
+# Fix documentation installation directory
+	${REINPLACE_CMD} -E 's,pkgdata,pkgdoc,g ; s,\(datadir.*,(docdir),' \
+		${WRKSRC}/doc/Makefile.in
+.else
+# If documentation is not wanted, just disable it instead of fixing
+	${REINPLACE_CMD} -E 's,: (un)?install-dist_pkgdataDATA,:,' \
+		${WRKSRC}/doc/Makefile.in
+.endif
 
 .include <bsd.port.mk>
diff --git a/devel/libatomic_ops/distinfo b/devel/libatomic_ops/distinfo
index 31464ed90574..bc6847d4e6a4 100644
--- a/devel/libatomic_ops/distinfo
+++ b/devel/libatomic_ops/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gc-7.2alpha6.tar.gz) = ebf425b254773d565e1690287641ed177716a78e952c96fec917edbc64535c16
-SIZE (gc-7.2alpha6.tar.gz) = 1241386
+SHA256 (libatomic_ops-7.3alpha2.tar.gz) = e1e95d814f98ef7b011285b670eb3a0d44e3c48847f905eb8ac68369c5648bae
+SIZE (libatomic_ops-7.3alpha2.tar.gz) = 388924
diff --git a/devel/libatomic_ops/files/patch-configure.ac b/devel/libatomic_ops/files/patch-configure.ac
deleted file mode 100644
index 6c16dbb12e5d..000000000000
--- a/devel/libatomic_ops/files/patch-configure.ac
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.ac.orig	2011-09-22 22:52:50.000000000 -0700
-+++ configure.ac	2011-09-22 22:53:33.000000000 -0700
-@@ -49,6 +49,10 @@
-       PICFLAG=-fPIC
-       # Any Linux compiler had better be gcc compatible.
-       ;;
-+    *-*-freebsd*)
-+      AC_MSG_RESULT(-fPIC)
-+      PICFLAG=-fPIC
-+      ;;
-     *)
-       AC_MSG_RESULT("<none>")
-       ;;
-@@ -68,7 +72,7 @@
-     *-*-netbsd*)
-       AC_DEFINE(_PTHREADS)
-       ;;
--    *-*-openbsd* | *-*-kfreebsd*-gnu | *-*-dgux*)
-+    *-*-freebsd* | *-*-openbsd* | *-*-kfreebsd*-gnu | *-*-dgux*)
-       THREADDLLIBS=-pthread
-       ;;
-     *-*-cygwin* | *-*-darwin*)
diff --git a/devel/libatomic_ops/files/patch-doc_Makefile.am b/devel/libatomic_ops/files/patch-doc_Makefile.am
deleted file mode 100644
index fdf24271a23e..000000000000
--- a/devel/libatomic_ops/files/patch-doc_Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
---- doc/Makefile.am.orig	2011-09-22 22:53:38.000000000 -0700
-+++ doc/Makefile.am	2011-09-22 22:53:45.000000000 -0700
-@@ -1,3 +1,3 @@
- # installed documentation
- #
--dist_pkgdata_DATA=COPYING LICENSING.txt README.txt README_stack.txt README_malloc.txt README_win32.txt
-+dist_doc_DATA=COPYING LICENSING.txt README.txt README_stack.txt README_malloc.txt README_win32.txt
diff --git a/devel/libatomic_ops/pkg-descr b/devel/libatomic_ops/pkg-descr
index 10d2ae78b536..491392060903 100644
--- a/devel/libatomic_ops/pkg-descr
+++ b/devel/libatomic_ops/pkg-descr
@@ -1,15 +1,14 @@
-This package provides semi-portable access to hardware provided
-atomic memory operations.  These might allow you to write code:
+This package provides semi-portable access to hardware provided atomic memory
+operations.  These might allow you to write code:
 
-- That does more interesting things in signal handlers.
-- Makes more effective use of multiprocessors by allowing you to write
-  clever lock-free code.  Note that such code is very difficult to get
-  right, and will unavoidably be less portable than lock-based code.  It
-  is also not always faster than lock-based code.  But it may occasionally
-  be a large performance win.
-- To experiment with new and much better thread programming paradigms, etc.
+  - That does more interesting things in signal handlers
+  - Makes more effective use of multiprocessors by allowing you to write
+    clever lock-free code.  Note that such code is very difficult to get
+    right, and will unavoidably be less portable than lock-based code.  It
+    is also not always faster than lock-based code.  But it may occasionally
+    be a large performance win
+  - To experiment with new and much better thread programming paradigms, etc.
 
-For details and licensing restrictions see the files in the doc
-subdirectory.
+For details and licensing restrictions see the files in the doc subdirectory.
 
 WWW: http://www.hpl.hp.com/personal/Hans_Boehm/gc/
diff --git a/devel/libatomic_ops/pkg-plist b/devel/libatomic_ops/pkg-plist
index 3af5d819c47d..644ee2ffbf8f 100644
--- a/devel/libatomic_ops/pkg-plist
+++ b/devel/libatomic_ops/pkg-plist
@@ -1,7 +1,7 @@
 include/atomic_ops.h
+include/atomic_ops/ao_version.h
 include/atomic_ops/generalize-small.h
 include/atomic_ops/generalize.h
-include/atomic_ops/sysdeps/README
 include/atomic_ops/sysdeps/acquire_release_volatile.h
 include/atomic_ops/sysdeps/aligned_atomic_load_store.h
 include/atomic_ops/sysdeps/all_acquire_release_volatile.h
@@ -17,6 +17,7 @@ include/atomic_ops/sysdeps/gcc/alpha.h
 include/atomic_ops/sysdeps/gcc/arm.h
 include/atomic_ops/sysdeps/gcc/avr32.h
 include/atomic_ops/sysdeps/gcc/cris.h
+include/atomic_ops/sysdeps/gcc/hexagon.h
 include/atomic_ops/sysdeps/gcc/hppa.h
 include/atomic_ops/sysdeps/gcc/ia64.h
 include/atomic_ops/sysdeps/gcc/m68k.h
@@ -54,14 +55,16 @@ 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.la
 lib/libatomic_ops_gpl.a
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/LICENSING.txt
-%%DOCSDIR%%/README.txt
-%%DOCSDIR%%/README_malloc.txt
-%%DOCSDIR%%/README_stack.txt
-%%DOCSDIR%%/README_win32.txt
-@dirrm %%DOCSDIR%%
+lib/libatomic_ops_gpl.la
+libdata/pkgconfig/atomic_ops.pc
+%%PORTDOCS%%%%DOCSDIR%%/LICENSING.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/README_malloc.txt
+%%PORTDOCS%%%%DOCSDIR%%/README_stack.txt
+%%PORTDOCS%%%%DOCSDIR%%/README_win32.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/atomic_ops/sysdeps/sunc
 @dirrm include/atomic_ops/sysdeps/msftc
 @dirrm include/atomic_ops/sysdeps/icc