16329726 Update slrn to the latest version.
authorRich Burridge <rich.burridge@oracle.com>
Mon, 04 Mar 2013 11:37:14 -0800
changeset 1190 477fb9c70524
parent 1189 c3e41d3c09cf
child 1191 3bdf33525a13
16329726 Update slrn to the latest version.
components/slrn/Makefile
components/slrn/slrn.license
components/slrn/slrn.p5m
--- a/components/slrn/Makefile	Mon Mar 04 09:38:48 2013 -0800
+++ b/components/slrn/Makefile	Mon Mar 04 11:37:14 2013 -0800
@@ -20,22 +20,19 @@
 #
 
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		slrn
-COMPONENT_VERSION=	0.9.9
-COMPONENT_SUBVERSION=	p1
-HUMAN_VERSION=		$(COMPONENT_VERSION)$(COMPONENT_SUBVERSION)
+COMPONENT_VERSION=	1.0.1
 COMPONENT_PROJECT_URL=	http://slrn.sourceforge.net/
-COMPONENT_SRC=		$(COMPONENT_NAME)-$(HUMAN_VERSION)
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:3a896f42b78c32252878fd291b21d6482d466921b68ab97f7d8cbadf4a76b533
-COMPONENT_ARCHIVE_URL=	ftp://space.mit.edu/pub/davis/slrn/$(COMPONENT_ARCHIVE)
-IPS_COMPONENT_VERSION=	$(COMPONENT_VERSION).1
+    sha256:06b4a060939ec3077e5a060c7a2556747c96061a24eec2c09e1feacd5dbeaae6
+COMPONENT_ARCHIVE_URL=	http://sourceforge.net/projects/slrn/files/slrn/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/slrn
 
 include ../../make-rules/prep.mk
@@ -56,10 +53,15 @@
 CONFIGURE_OPTIONS +=	--with-ssl
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)"
 
+# Needed to successfully link the 64-bit programs.
+CC +=			$(CC_BITS)
+
+ASLR_MODE = $(ASLR_ENABLE)
+
 # common targets
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
 test:		$(NO_TESTS)
 
--- a/components/slrn/slrn.license	Mon Mar 04 09:38:48 2013 -0800
+++ b/components/slrn/slrn.license	Mon Mar 04 11:37:14 2013 -0800
@@ -1,15 +1,8 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
+--------------
+- slrn 1.0.1 -
+--------------
 
---------------------------------------------------------------------
-
- Copyright (c) 1994, 1999, 2007-2008 John E. Davis <[email protected]>
+ Copyright (c) 1994, 1999, 2007-2012 John E. Davis <[email protected]>
  
  For parts of it:
  
--- a/components/slrn/slrn.p5m	Mon Mar 04 09:38:48 2013 -0800
+++ b/components/slrn/slrn.p5m	Mon Mar 04 11:37:14 2013 -0800
@@ -18,70 +18,28 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/network/nntp/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.human-version value=$(HUMAN_VERSION)
-set name=pkg.summary \
-    value="slrn - S-Lang read news"
+set name=pkg.summary value="slrn - S-Lang read news"
 set name=pkg.description \
     value="slrn is an text-based news client, i.e. a program that accesses a newsserver to read messages from the Internet News service (also known as 'Usenet')."
 set name=info.classification \
-    value="org.opensolaris.category.2008:Applications/Internet"
+    value=org.opensolaris.category.2008:Applications/Internet
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url \
-    value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2008/639
-set name=org.opensolaris.consolidation \
-    value=$(CONSOLIDATION)
-
-license slrn.license license='GPLv2'
-
-dir path=usr
-dir path=usr/bin
-dir path=usr/share
-dir path=usr/share/doc
-dir path=usr/share/doc/slrn
-dir path=usr/share/doc/slrn/slrnpull
-dir path=usr/share/locale
-dir path=usr/share/locale/be
-dir path=usr/share/locale/be/LC_MESSAGES
-dir path=usr/share/locale/da
-dir path=usr/share/locale/da/LC_MESSAGES
-dir path=usr/share/locale/de
-dir path=usr/share/locale/de/LC_MESSAGES
-dir path=usr/share/locale/es
-dir path=usr/share/locale/es/LC_MESSAGES
-dir path=usr/share/locale/fi
-dir path=usr/share/locale/fi/LC_MESSAGES
-dir path=usr/share/locale/fr
-dir path=usr/share/locale/fr/LC_MESSAGES
-dir path=usr/share/locale/it
-dir path=usr/share/locale/it/LC_MESSAGES
-dir path=usr/share/locale/ko
-dir path=usr/share/locale/ko/LC_MESSAGES
-dir path=usr/share/locale/nl
-dir path=usr/share/locale/nl/LC_MESSAGES
-dir path=usr/share/locale/pl
-dir path=usr/share/locale/pl/LC_MESSAGES
-dir path=usr/share/locale/ru
-dir path=usr/share/locale/ru/LC_MESSAGES
-dir path=usr/share/locale/sv
-dir path=usr/share/locale/sv/LC_MESSAGES
-dir path=usr/share/locale/tr
-dir path=usr/share/locale/tr/LC_MESSAGES
-dir path=usr/share/man
-dir path=usr/share/man/man1
-dir path=usr/share/slrn
-dir path=usr/share/slrn/slang
-file path=usr/bin/slrn
-file path=usr/bin/slrnpull
-file path=usr/share/doc/slrn/COPYING
-file path=usr/share/doc/slrn/COPYRIGHT
+set name=org.opensolaris.arc-caseid value=PSARC/2008/639
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+dir  path=usr
+dir  path=usr/bin
+file usr/bin/$(MACH64)/slrn path=usr/bin/slrn
+file usr/bin/$(MACH64)/slrnpull path=usr/bin/slrnpull
+dir  path=usr/share
+dir  path=usr/share/doc
+dir  path=usr/share/doc/slrn
 file path=usr/share/doc/slrn/FAQ
 file path=usr/share/doc/slrn/FIRST_STEPS
 file path=usr/share/doc/slrn/README
@@ -98,6 +56,7 @@
 file path=usr/share/doc/slrn/slrn-doc.html
 file path=usr/share/doc/slrn/slrn.rc
 file path=usr/share/doc/slrn/slrnfuns.txt
+dir  path=usr/share/doc/slrn/slrnpull
 file path=usr/share/doc/slrn/slrnpull/README
 file path=usr/share/doc/slrn/slrnpull/README.offline
 file path=usr/share/doc/slrn/slrnpull/SETUP
@@ -106,25 +65,58 @@
 file path=usr/share/doc/slrn/slrnpull/slrn.rc
 file path=usr/share/doc/slrn/slrnpull/slrnpull.conf
 file path=usr/share/doc/slrn/slrnpull/slrnpull.sh
+dir  path=usr/share/locale
+dir  path=usr/share/locale/be
+dir  path=usr/share/locale/be/LC_MESSAGES
 file path=usr/share/locale/be/LC_MESSAGES/slrn.mo
+dir  path=usr/share/locale/da
+dir  path=usr/share/locale/da/LC_MESSAGES
 file path=usr/share/locale/da/LC_MESSAGES/slrn.mo
+dir  path=usr/share/locale/de
+dir  path=usr/share/locale/de/LC_MESSAGES
 file path=usr/share/locale/de/LC_MESSAGES/slrn.mo
+dir  path=usr/share/locale/es
+dir  path=usr/share/locale/es/LC_MESSAGES
 file path=usr/share/locale/es/LC_MESSAGES/slrn.mo
+dir  path=usr/share/locale/fi
+dir  path=usr/share/locale/fi/LC_MESSAGES
 file path=usr/share/locale/fi/LC_MESSAGES/slrn.mo
+dir  path=usr/share/locale/fr
+dir  path=usr/share/locale/fr/LC_MESSAGES
 file path=usr/share/locale/fr/LC_MESSAGES/slrn.mo
+dir  path=usr/share/locale/it
+dir  path=usr/share/locale/it/LC_MESSAGES
 file path=usr/share/locale/it/LC_MESSAGES/slrn.mo
+dir  path=usr/share/locale/ko
+dir  path=usr/share/locale/ko/LC_MESSAGES
 file path=usr/share/locale/ko/LC_MESSAGES/slrn.mo
+dir  path=usr/share/locale/nl
+dir  path=usr/share/locale/nl/LC_MESSAGES
 file path=usr/share/locale/nl/LC_MESSAGES/slrn.mo
+dir  path=usr/share/locale/pl
+dir  path=usr/share/locale/pl/LC_MESSAGES
 file path=usr/share/locale/pl/LC_MESSAGES/slrn.mo
+dir  path=usr/share/locale/ru
+dir  path=usr/share/locale/ru/LC_MESSAGES
 file path=usr/share/locale/ru/LC_MESSAGES/slrn.mo
+dir  path=usr/share/locale/sv
+dir  path=usr/share/locale/sv/LC_MESSAGES
 file path=usr/share/locale/sv/LC_MESSAGES/slrn.mo
+dir  path=usr/share/locale/tr
+dir  path=usr/share/locale/tr/LC_MESSAGES
 file path=usr/share/locale/tr/LC_MESSAGES/slrn.mo
+dir  path=usr/share/man
+dir  path=usr/share/man/man1
 file path=usr/share/man/man1/slrn.1
 file path=usr/share/man/man1/slrnpull.1
+dir  path=usr/share/slrn
+dir  path=usr/share/slrn/slang
 file path=usr/share/slrn/slang/color.sl
 file path=usr/share/slrn/slang/gsort.sl
 file path=usr/share/slrn/slang/ispell.sl
 file path=usr/share/slrn/slang/latin2.sl
+file path=usr/share/slrn/slang/mailcap.sl
+file path=usr/share/slrn/slang/mime.sl
 file path=usr/share/slrn/slang/multipart.sl
 file path=usr/share/slrn/slang/nn.sl
 file path=usr/share/slrn/slang/posthook.sl
@@ -136,3 +128,4 @@
 file path=usr/share/slrn/slang/util.sl
 file path=usr/share/slrn/slang/varset.sl
 file path=usr/share/slrn/slang/xcomment.sl
+license slrn.license license=GPLv2