Update to 1.2.1

PR:		ports/200043
Submitted by:	takefu@airport.fm

12 files changed, 50 insertions, 352 deletions

diff --git a/comms/tlf/Makefile b/comms/tlf/Makefile
index ac15a5aaa0e4..938b92584bf6 100644
--- a/comms/tlf/Makefile
+++ b/comms/tlf/Makefile
@@ -2,38 +2,29 @@
 # $FreeBSD$
 
 PORTNAME=	tlf
-PORTVERSION=	0.9.31
-PORTREVISION=	1
+PORTVERSION=	1.2.1
 CATEGORIES=	comms hamradio
-MASTER_SITES=	http://sharon.esrac.ele.tue.nl/pub/linux/ham/tlf/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	db
-DISTNAME=	tlf-0.9.31-2
+MASTER_SITES=	http://www.hs-mittweida.de/tb/ \
+		LOCAL/db
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio curses based logging program
 
 LICENSE=	GPLv2
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_AUTOTOOLS=	autoconf aclocal automake
-USES=		libtool
-AUTOMAKE_ARGS=	--add-missing
+LIB_DEPENDS=	libglib-2.0.so:${PORTSDIR}/devel/glib20
+
+USES=		pkgconfig
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
+OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	HAMLIB
-HAMLIB_DESC=	Use hamlib
+HAMLIB_DESC=	Support rig control via hamlib
 OPTION_DEFAULT=	HAMLIB
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MHAMLIB}
-LIB_DEPENDS+=	libhamlib.so:${PORTSDIR}/comms/hamlib
-CONFIGURE_ARGS+=	--enable-hamlib
-.else
-CONFIGURE_ARGS+=	--disable-hamlib
-.endif
+HAMLIB_LIB_DEPENDS=	libhamlib.so:${PORTSDIR}/comms/hamlib
+HAMLIB_CONFIGURE_ENABLE=hamlib
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/comms/tlf/distinfo b/comms/tlf/distinfo
index cee186c210e9..b905f1b1f2df 100644
--- a/comms/tlf/distinfo
+++ b/comms/tlf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tlf-0.9.31-2.tar.gz) = 6d6c323e3124df5ea1b62b07555fcaf5388fef14b938014aa150d582d4e6d6b0
-SIZE (tlf-0.9.31-2.tar.gz) = 606427
+SHA256 (tlf-1.2.1.tar.gz) = a7969aa56bc705db75d8deca92517485f6366169800fa7eaec5bfb51455abfac
+SIZE (tlf-1.2.1.tar.gz) = 511959
diff --git a/comms/tlf/files/patch-configure.in b/comms/tlf/files/patch-configure.in
deleted file mode 100644
index 5f9059b36a15..000000000000
--- a/comms/tlf/files/patch-configure.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	2007-12-19 04:59:39.000000000 -0800
-+++ configure.in	2014-06-21 03:37:13.000000000 -0700
-@@ -33,7 +33,7 @@
- [wanthamlib=false])
- 
- if test "x${wanthamlib}" != "xfalse"; then
--	AC_CHECK_LIB(hamlib,main,,AC_MSG_ERROR([Hamradio control libraries not found...]))
-+	AC_CHECK_LIB(hamlib,rig_init,,AC_MSG_ERROR([Hamradio control libraries not found...]))
- 	AC_CHECK_HEADERS(hamlib/rig.h,,AC_MSG_ERROR([Hamlib headers not found...]))
- 	AC_DEFINE([WANT_HAMLIB], 1, [Want Hamlib])
- 	echo "enabling hamlib support"
diff --git a/comms/tlf/files/patch-doc_Makefile.am b/comms/tlf/files/patch-doc_Makefile.am
deleted file mode 100644
index ab93859129e2..000000000000
--- a/comms/tlf/files/patch-doc_Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- doc/Makefile.am.orig	2014-06-21 03:59:01.000000000 -0700
-+++ doc/Makefile.am	2014-06-21 03:59:22.000000000 -0700
-@@ -3,5 +3,5 @@
- CLEANFILES = *~
- 
- install-data-local:
--	$(mkinstalldirs) $(pkgdatadir)/doc
--	install -m 0644 README $(pkgdatadir)/doc
-+	$(mkinstalldirs) ${DESTDIR}$(pkgdatadir)/doc
-+	install -m 0644 README ${DESTDIR}$(pkgdatadir)/doc
diff --git a/comms/tlf/files/patch-rules_Makefile.am b/comms/tlf/files/patch-rules_Makefile.am
deleted file mode 100644
index 59a26081ad85..000000000000
--- a/comms/tlf/files/patch-rules_Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
---- rules/Makefile.am.orig	2014-06-21 04:03:17.000000000 -0700
-+++ rules/Makefile.am	2014-06-21 04:03:54.000000000 -0700
-@@ -6,20 +6,20 @@
- CLEANFILES = *~
- 
- install-data-local:
--	$(mkinstalldirs) $(pkgdatadir)/rules
--	install -m 0644 arrldx_dx $(pkgdatadir)/rules
--	install -m 0644 arrldx_usa $(pkgdatadir)/rules
--	install -m 0644 arrlfd $(pkgdatadir)/rules
--	install -m 0644 arrlss $(pkgdatadir)/rules
--	install -m 0644 cqww $(pkgdatadir)/rules
--	install -m 0644 dxped $(pkgdatadir)/rules
--	install -m 0644 eusprint $(pkgdatadir)/rules
--	install -m 0644 lzdx $(pkgdatadir)/rules
--	install -m 0644 pacc_pa $(pkgdatadir)/rules
--	install -m 0644 pacc_dx $(pkgdatadir)/rules
--	install -m 0644 qso $(pkgdatadir)/rules
--	install -m 0644 spdx_dx $(pkgdatadir)/rules
--	install -m 0644 spdx_sp $(pkgdatadir)/rules
--	install -m 0644 ssa_mt $(pkgdatadir)/rules
--	install -m 0644 template $(pkgdatadir)/rules
--	install -m 0644 wpx $(pkgdatadir)/rules
-+	$(mkinstalldirs) ${DESTDIR}$(pkgdatadir)/rules
-+	install -m 0644 arrldx_dx ${DESTDIR}$(pkgdatadir)/rules
-+	install -m 0644 arrldx_usa ${DESTDIR}$(pkgdatadir)/rules
-+	install -m 0644 arrlfd ${DESTDIR}$(pkgdatadir)/rules
-+	install -m 0644 arrlss ${DESTDIR}$(pkgdatadir)/rules
-+	install -m 0644 cqww ${DESTDIR}$(pkgdatadir)/rules
-+	install -m 0644 dxped ${DESTDIR}$(pkgdatadir)/rules
-+	install -m 0644 eusprint ${DESTDIR}$(pkgdatadir)/rules
-+	install -m 0644 lzdx ${DESTDIR}$(pkgdatadir)/rules
-+	install -m 0644 pacc_pa ${DESTDIR}$(pkgdatadir)/rules
-+	install -m 0644 pacc_dx ${DESTDIR}$(pkgdatadir)/rules
-+	install -m 0644 qso ${DESTDIR}$(pkgdatadir)/rules
-+	install -m 0644 spdx_dx ${DESTDIR}$(pkgdatadir)/rules
-+	install -m 0644 spdx_sp ${DESTDIR}$(pkgdatadir)/rules
-+	install -m 0644 ssa_mt ${DESTDIR}$(pkgdatadir)/rules
-+	install -m 0644 template ${DESTDIR}$(pkgdatadir)/rules
-+	install -m 0644 wpx ${DESTDIR}$(pkgdatadir)/rules
diff --git a/comms/tlf/files/patch-scripts_Makefile.am b/comms/tlf/files/patch-scripts_Makefile.am
deleted file mode 100644
index b87f9cda2cb9..000000000000
--- a/comms/tlf/files/patch-scripts_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/Makefile.am.orig	2014-06-21 04:11:09.000000000 -0700
-+++ scripts/Makefile.am	2014-06-21 04:11:27.000000000 -0700
-@@ -3,7 +3,7 @@
- CLEANFILES = *~
- 
- install-exec-local:
--	install soundlog $(bindir)
-+	install soundlog ${DESTDIR}$(bindir)
- 
- uninstall:
- 	rm -f $(bindir)/soundlog
diff --git a/comms/tlf/files/patch-share_Makefile.am b/comms/tlf/files/patch-share_Makefile.am
deleted file mode 100644
index 0a46492fcf36..000000000000
--- a/comms/tlf/files/patch-share_Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
---- share/Makefile.am.orig	2014-06-21 04:10:12.000000000 -0700
-+++ share/Makefile.am	2014-06-21 04:10:22.000000000 -0700
-@@ -4,14 +4,14 @@
- 			spdxmults ssamults
- 
- install-data-local:
--	install -m 0644 callmaster $(pkgdatadir)
--	install -m 0644 cty.dat $(pkgdatadir)
--	install -m 0644 logcfg.dat $(pkgdatadir)
--	install -m 0644 arrlsections $(pkgdatadir)
--	install -m 0644 ea_sections $(pkgdatadir)
--	install -m 0644 paccmults $(pkgdatadir)
--	install -m 0644 spdxmults $(pkgdatadir)
--	install -m 0644 ssamults $(pkgdatadir)
-+	install -m 0644 callmaster ${DESTDIR}$(pkgdatadir)
-+	install -m 0644 cty.dat ${DESTDIR}$(pkgdatadir)
-+	install -m 0644 logcfg.dat ${DESTDIR}$(pkgdatadir)
-+	install -m 0644 arrlsections ${DESTDIR}$(pkgdatadir)
-+	install -m 0644 ea_sections ${DESTDIR}$(pkgdatadir)
-+	install -m 0644 paccmults ${DESTDIR}$(pkgdatadir)
-+	install -m 0644 spdxmults ${DESTDIR}$(pkgdatadir)
-+	install -m 0644 ssamults ${DESTDIR}$(pkgdatadir)
- 
- uninstall:
--	rm -rf $(pkgdatadir)
-+	rm -rf ${DESTDIR}$(pkgdatadir)
diff --git a/comms/tlf/files/patch-share_logcfg.dat b/comms/tlf/files/patch-share_logcfg.dat
index 3b1a7a1703cb..8c9a75796d31 100644
--- a/comms/tlf/files/patch-share_logcfg.dat
+++ b/comms/tlf/files/patch-share_logcfg.dat
@@ -1,6 +1,6 @@
---- share/logcfg.dat.orig	Mon May  8 14:51:58 2006
-+++ share/logcfg.dat	Mon May  8 14:52:09 2006
-@@ -27,8 +27,8 @@
+--- share/logcfg.dat.orig	2014-05-15 12:02:23 UTC
++++ share/logcfg.dat
+@@ -27,8 +27,8 @@ RULES=cqww
  #                               #
  #################################
  #
diff --git a/comms/tlf/files/patch-src_audio.c b/comms/tlf/files/patch-src_audio.c
deleted file mode 100644
index 95f1a7ef4086..000000000000
--- a/comms/tlf/files/patch-src_audio.c
+++ /dev/null
@@ -1,208 +0,0 @@
---- src/audio.c.orig	Wed Apr  5 03:16:50 2006
-+++ src/audio.c	Mon May  8 14:31:45 2006
-@@ -30,6 +30,8 @@
- #include "onechar.h"
- 
- extern char sc_device[];
-+char soundlog_dir[FILENAME_MAX];
-+char *home;
- 
- int afd;
- 
-@@ -668,10 +670,8 @@
- 				mvprintw(15,20, "recording %s", ph_message[0]);
- 				mvprintw(16,20, "");
- 				refresh();
--				strcpy(commands,"rec -w -r 8000 -d ");
--				strcat(commands, sc_device);
-- 				strcat(commands, " ");			// (W9WI)
-- 				strcat(commands, ph_message[0]);
-+				snprintf(commands,sizeof(commands), "rec -w -w 8000 -d %s %s",
-+					sc_device, ph_message[0]);
- 				system (commands);
- 				runnit = 0;
- 				break;
-@@ -680,21 +680,16 @@
- 				mvprintw(16,20, "");
- 				refresh();
- 
--				strcpy(commands,"rec -w -r 8000 -d ");
--				strcat(commands, sc_device);
--				strcat(commands, " ");			// (W9WI)
--				strcat(commands, ph_message[1]);
--				system (commands);
-+				snprintf(commands,sizeof(commands),"rec -w -r 8000 -d %s %s",
-+					sc_device, ph_message[1]);
- 				runnit = 0;
- 				break;
- 			case 131 :
- 				mvprintw(15,20, "recording %s", ph_message[2]);
- 				mvprintw(16,20, "");
- 				refresh();
--				strcpy(commands,"rec -w -r 8000 -d ");
--				strcat(commands, sc_device);
-- 				strcat(commands, " ");			// (W9WI)
--				strcat(commands, ph_message[2]);
-+				snprintf(commands,sizeof(commands),"rec -w -r 8000 -d %s %s",
-+					sc_device, ph_message[2]);
- 				system (commands);
- 				runnit = 0;
- 				break;
-@@ -702,10 +697,8 @@
- 				mvprintw(15,20, "recording %s", ph_message[3]);
- 				mvprintw(16,20, "");
- 				refresh();
--				strcpy(commands,"rec -w -r 8000 -d ");
--				strcat(commands, sc_device);
--				strcat(commands, " ");			// (W9WI)
--				strcat(commands, ph_message[3]);
-+				snprintf(commands,sizeof(commands),"rec -w -r 8000 -d %s %s",
-+					sc_device, ph_message[3]);
- 				system (commands);
- 				runnit = 0;
- 				break;
-@@ -713,10 +706,8 @@
- 				mvprintw(15,20, "recording %s", ph_message[4]);
- 				mvprintw(16,20, "");
- 				refresh();
--				strcpy(commands,"rec -w -r 8000 -d ");
--				strcat(commands, sc_device);
-- 				strcat(commands, " ");				// (W9WI)
--				strcat(commands, ph_message[4]);
-+				snprintf(commands,sizeof(commands),"rec -w -r 8000 -d %s %s",
-+					sc_device, ph_message[4]);
- 				system (commands);
- 				runnit = 0;
- 				break;
-@@ -724,10 +715,8 @@
- 				mvprintw(15,20, "recording %s", ph_message[5]);
- 				mvprintw(16,20, "");
- 				refresh();
--				strcpy(commands,"rec -w -r 8000 -d ");
--				strcat(commands, sc_device);
-- 				strcat(commands, " ");				// (W9WI)
--				strcat(commands, ph_message[5]);
-+				snprintf(commands,sizeof(commands),"rec -w -r 8000 -d %s %s",
-+					sc_device, ph_message[5]);
- 				system (commands);
- 				runnit = 0;
- 				break;
-@@ -735,10 +724,8 @@
- 				mvprintw(15,20, "recording %s", ph_message[6]);
- 				mvprintw(16,20, "");
- 				refresh();
--				strcpy(commands,"rec -w -r 8000 -d ");
--				strcat(commands, sc_device);
-- 				strcat(commands, " ");				// (W9WI)
--				strcat(commands, ph_message[6]);
-+				snprintf(commands,sizeof(commands),"rec -w -r 8000 -d %s %s",
-+					sc_device, ph_message[6]);
- 				system (commands);
- 				runnit = 0;
- 				break;
-@@ -746,10 +733,8 @@
- 				mvprintw(15,20, "recording %s", ph_message[7]);
- 				mvprintw(16,20, "");
- 				refresh();
--				strcpy(commands,"rec -w -r 8000 -d ");
--				strcat(commands, sc_device);
-- 				strcat(commands, " ");				// (W9WI)
--				strcat(commands, ph_message[7]);
-+				snprintf(commands,sizeof(commands),"rec -w -r 8000 -d %s %s",
-+					sc_device, ph_message[7]);
- 				system (commands);
- 				runnit = 0;
- 				break;
-@@ -757,10 +742,8 @@
- 				mvprintw(15,20, "recording %s", ph_message[8]);
- 				mvprintw(16,20, "");
- 				refresh();
--				strcpy(commands,"rec -w -r 8000 -d ");
--				strcat(commands, sc_device);
-- 				strcat(commands, " ");				// (W9WI)
--				strcat(commands, ph_message[8]);
-+				snprintf(commands,sizeof(commands),"rec -w -r 8000 -d %s %s",
-+					sc_device, ph_message[8]);
- 				system (commands);
- 				runnit = 0;
- 				break;
-@@ -768,10 +751,8 @@
- 				mvprintw(15,20, "recording %s", ph_message[9]);
- 				mvprintw(16,20, "");
- 				refresh();
--				strcpy(commands,"rec -w -r 8000 -d ");
--				strcat(commands, sc_device);
-- 				strcat(commands, " ");				// (W9WI)
--				strcat(commands, ph_message[9]);
-+				snprintf(commands,sizeof(commands),"rec -w -r 8000 -d %s %s",
-+					sc_device, ph_message[9]);
- 				system (commands);
- 				runnit = 0;
- 				break;
-@@ -779,10 +760,8 @@
- 				mvprintw(15,20, "recording %s", ph_message[10]);
- 				mvprintw(16,20, "");
- 				refresh();
--				strcpy(commands,"rec -w -r 8000 -d ");
--				strcat(commands, sc_device);
-- 				strcat(commands, " ");				// (W9WI)
--				strcat(commands, ph_message[10]);
-+				snprintf(commands,sizeof(commands),"rec -w -r 8000 -d %s %s",
-+					sc_device, ph_message[10]);
- 				system (commands);
- 				runnit = 0;
- 				break;
-@@ -790,10 +769,8 @@
- 				mvprintw(15,20, "recording %s", ph_message[11]);
- 				mvprintw(16,20, "");
- 				refresh();
--				strcpy(commands,"rec -w -r 8000 -d ");
--				strcat(commands, sc_device);
-- 				strcat(commands, " ");				// (W9WI)
--				strcat(commands, ph_message[11]);
-+				snprintf(commands,sizeof(commands),"rec -w -r 8000 -d %s %s",
-+					sc_device, ph_message[11]);
- 				system (commands);
- 				runnit = 0;
- 				break;
-@@ -802,10 +779,8 @@
- 				mvprintw(15,20, "recording %s", ph_message[12]);
- 				mvprintw(16,20, "");
- 				refresh();
--				strcpy(commands,"rec -w -r 8000 -d ");
--				strcat(commands, sc_device);
-- 				strcat(commands, " ");				// (W9WI)
--				strcat(commands, ph_message[12]);
-+				snprintf(commands,sizeof(commands),"rec -w -r 8000 -d %s %s",
-+					sc_device, ph_message[12]);
- 				system (commands);
- 				runnit = 0;
- 				break;
-@@ -814,10 +789,8 @@
- 				mvprintw(15,20, "recording %s", ph_message[13]);
- 				mvprintw(16,20, "");
- 				refresh();
--				strcpy(commands,"rec -w -r 8000 -d ");
--				strcat(commands, sc_device);
-- 				strcat(commands, " ");				// (W9WI)
--				strcat(commands, ph_message[13]);
-+				snprintf(commands,sizeof(commands),"rec -w -r 8000 -d %s %s",
-+					sc_device, ph_message[13]);
- 				system (commands);
- 				runnit = 0;
- 				break;
-@@ -840,7 +813,13 @@
- 				runnit = 0;
- 				break;
- 			case '3' :
-- 				sounddir = opendir("$HOME/tlf/soundlogs/");		// (W9WI)
-+				if ((home = getenv("HOME")) != NULL) {
-+				 	snprintf(soundlog_dir,sizeof(soundlog_dir),
-+						"%s/tlf/soundlogs/", home);
-+	 				sounddir = opendir(soundlog_dir);
-+				} else
-+					sounddir = NULL;
-+
- 
- 				if (sounddir == NULL) break;
- 
diff --git a/comms/tlf/files/patch-src_readcalls.c b/comms/tlf/files/patch-src_readcalls.c
index 1ce1f0f8270d..4e12acd5dd8a 100644
--- a/comms/tlf/files/patch-src_readcalls.c
+++ b/comms/tlf/files/patch-src_readcalls.c
@@ -1,11 +1,11 @@
---- src/readcalls.c.orig	Wed Apr  5 03:16:50 2006
-+++ src/readcalls.c	Thu Sep 27 19:54:14 2007
-@@ -563,7 +563,7 @@
+--- src/readcalls.c.orig	2014-05-15 21:02:23 UTC
++++ src/readcalls.c
+@@ -492,7 +492,7 @@ int synclog(char *synclogfile)
  
- 	showmsg ("Merging logfiles...\n");
- 	sleep(1);
--	sprintf(wgetcmd, "cat log1 log2 | sort -g -k4,4 | uniq -w79 > %s", logfile);
-+	sprintf(wgetcmd, "cat log1 log2 | sort -g -k4,4 | uniq > %s", logfile);
- 	if (system(wgetcmd) == 0)
- 		showmsg ("Merging logs successfull\n");
- 	else
+     showmsg("Merging logfiles...\n");
+     sleep(1);
+-    sprintf(wgetcmd, "cat log1 log2 | sort -g -k4,4 | uniq -w79 > %s",
++    sprintf(wgetcmd, "cat log1 log2 | sort -g -k4,4 | uniq  > %s",
+ 	    logfile);
+     if (system(wgetcmd) == 0)
+ 	showmsg("Merging logs successfull\n");
diff --git a/comms/tlf/pkg-descr b/comms/tlf/pkg-descr
index 15c5218e0426..003d52015cc4 100644
--- a/comms/tlf/pkg-descr
+++ b/comms/tlf/pkg-descr
@@ -1,3 +1,3 @@
-Amateur radio curses based logging program.
+Console based ham radio contest logger.
 
-WWW: http://home.iae.nl/users/reinc/TLF-0.2.html
+WWW: https://github.com/Tlf/tlf
diff --git a/comms/tlf/pkg-plist b/comms/tlf/pkg-plist
index 5504bce33df9..12941a96c78f 100644
--- a/comms/tlf/pkg-plist
+++ b/comms/tlf/pkg-plist
@@ -1,28 +1,41 @@
+bin/play_vk
 bin/soundlog
 bin/tlf
 man/man1/tlf.1.gz
+%%DATADIR%%/arrl10m_mults
+%%DATADIR%%/arrldx_mults
 %%DATADIR%%/arrlsections
+%%DATADIR%%/cabrillo.fmt
 %%DATADIR%%/callmaster
 %%DATADIR%%/cty.dat
-%%DATADIR%%/doc/README
-%%DATADIR%%/rules/dxped
 %%DATADIR%%/ea_sections
-%%DATADIR%%/rules/eusprint
+%%DATADIR%%/help.txt
 %%DATADIR%%/logcfg.dat
-%%DATADIR%%/rules/lzdx
-%%DATADIR%%/rules/pacc_dx
-%%DATADIR%%/rules/pacc_pa
 %%DATADIR%%/paccmults
-%%DATADIR%%/rules/qso
+%%DATADIR%%/rules/arrl10m_dx
 %%DATADIR%%/rules/arrldx_dx
 %%DATADIR%%/rules/arrldx_usa
 %%DATADIR%%/rules/arrlfd
 %%DATADIR%%/rules/arrlss
+%%DATADIR%%/rules/contest
 %%DATADIR%%/rules/cqww
+%%DATADIR%%/rules/dxped
+%%DATADIR%%/rules/eusprint
+%%DATADIR%%/rules/focmarathon
+%%DATADIR%%/rules/lzdx
+%%DATADIR%%/rules/pacc_dx
+%%DATADIR%%/rules/pacc_pa
+%%DATADIR%%/rules/qso
 %%DATADIR%%/rules/spdx_dx
 %%DATADIR%%/rules/spdx_sp
-%%DATADIR%%/spdxmults
 %%DATADIR%%/rules/ssa_mt
-%%DATADIR%%/ssamults
+%%DATADIR%%/rules/stewperry
 %%DATADIR%%/rules/template
 %%DATADIR%%/rules/wpx
+%%DATADIR%%/spdxmults
+%%DATADIR%%/ssamults
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/New_Bandmap.txt
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.cabrillo
+%%PORTDOCS%%%%DOCSDIR%%/README.ssb