From 192eab7eef321cb83f5c8b33d11bd17affafe820 Mon Sep 17 00:00:00 2001 From: Diane Bruce Date: Wed, 18 Jun 2008 15:41:20 +0000 Subject: [PATCH] - Update to 0.3.5 - Honour NOPORTEXAMPLES and NOPORTDOCS. - Move yfksubs.pl to libexec. - Install a logo for yfklog. --- comms/yfklog/Makefile | 48 +++++++++++++++++++----------------- comms/yfklog/distinfo | 9 ++++--- comms/yfklog/files/patch-yfk | 11 +++++++++ comms/yfklog/pkg-descr | 3 --- comms/yfklog/pkg-plist | 24 +++++++++--------- 5 files changed, 56 insertions(+), 39 deletions(-) create mode 100644 comms/yfklog/files/patch-yfk diff --git a/comms/yfklog/Makefile b/comms/yfklog/Makefile index 8723f278ab72..f6996dd5c764 100644 --- a/comms/yfklog/Makefile +++ b/comms/yfklog/Makefile @@ -6,12 +6,15 @@ # PORTNAME= yfklog -PORTVERSION= 0.3.4 +PORTVERSION= 0.3.5 CATEGORIES= comms hamradio MASTER_SITES= http://fkurz.net/ham/yfklog/ \ - http://www.db.net/downloads/ \ - ${MASTER_SITE_LOCAL} + ${MASTER_SITE_LOCAL} \ + http://www.db.net/downloads/ MASTER_SITE_SUBDIR= db +DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz yfk.png +DIST_SUBDIR= ${PORTNAME} +EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.gz MAINTAINER= db@FreeBSD.org COMMENT= Amateur Radio curses based logging program @@ -19,6 +22,7 @@ COMMENT= Amateur Radio curses based logging program RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Curses.pm:${PORTSDIR}/devel/p5-Curses \ ${SITE_PERL}/${PERL_ARCH}/DBD/SQLite.pm:${PORTSDIR}/databases/p5-DBD-SQLite \ ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \ + ${SITE_PERL}/${PERL_ARCH}/Hamlib.pm:${PORTSDIR}/comms/hamlib \ ${SITE_PERL}/Net/FTP.pm:${PORTSDIR}/net/p5-Net-FTP-File USE_PERL5= yes @@ -31,30 +35,30 @@ post-patch: @${REINPLACE_CMD} -e 's|prefix="/usr"|prefix="${PREFIX}"|' \ ${WRKSRC}/yfk ${WRKSRC}/yfksubs.pl do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/yfk ${PREFIX}/bin/yfklog - ${INSTALL_DATA} ${FILESDIR}/yfklog.1 ${MANPREFIX}/man/man1 - ${MKDIR} ${DATADIR} -.for f in ${WRKSRC}/cty.dat ${WRKSRC}/db_calls.sql db_clubs.sql \ - ${WRKSRC}/db_config.sql ${WRKSRC}/db_log.sql ${WRKSRC}/db_log.sqlite \ - ${WRKSRC}/zweckform3421.lab ${WRKSRC}/zweckform3475.lab yfksubs.pl \ - ${WRKSRC}/zweckform3657.lab ${WRKSRC}/config + @${INSTALL_SCRIPT} ${WRKSRC}/yfk ${PREFIX}/bin/yfklog + @${INSTALL_DATA} ${FILESDIR}/yfklog.1 ${MANPREFIX}/man/man1 + @${INSTALL_SCRIPT} ${WRKSRC}/yfksubs.pl ${PREFIX}/libexec/yfksubs.pl + @${INSTALL_DATA} ${_DISTDIR}/yfk.png ${PREFIX}/share/pixmaps/yfklog.png + @${MKDIR} ${DATADIR} +.for f in cty.dat db_calls.sql db_clubs.sql \ + db_config.sql db_log.sql db_log.sqlite \ + zweckform3421.lab zweckform3475.lab zweckform3657.lab config @${INSTALL_DATA} ${WRKSRC}/$f ${DATADIR} .endfor - ${MKDIR} ${EXAMPLESDIR}/onlinelog -.for f in ${WRKSRC}/onlinelog/README ${WRKSRC}/onlinelog/search.php \ - ${WRKSRC}/onlinelog/test.txt - ${INSTALL_DATA} ${WRKSRC}/$f ${EXAMPLESDIR}/onlinelog +.if !defined(NOPORTEXAMPLES) + @${MKDIR} ${EXAMPLESDIR}/onlinelog +.for f in README search.php test.txt + @${INSTALL_DATA} ${WRKSRC}/onlinelog/$f ${EXAMPLESDIR}/onlinelog .endfor - ${MKDIR} ${EXAMPLESDIR}/clubs -.for f in ${WRKSRC}/clubs/README ${WRKSRC}/clubs/hsc2sql.awk \ - ${WRKSRC}/clubs/hscmember.txt - ${INSTALL_DATA} ${WRKSRC}/$f ${EXAMPLESDIR}/clubs + @${MKDIR} ${EXAMPLESDIR}/clubs +.for f in README hsc2sql.awk hscmember.txt + @${INSTALL_DATA} ${WRKSRC}/clubs/$f ${EXAMPLESDIR}/clubs .endfor +.endif .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -.for d in ${WRKSRC}/AUTHORS ${WRKSRC}/CHANGELOG ${WRKSRC}/INSTALL \ - ${WRKSRC}/MANUAL ${WRKSRC}/README ${WRKSRC}/RELEASENOTES - @${INSTALL_DATA} ${WRKSRC}/${d} ${DOCSDIR} + @${MKDIR} ${DOCSDIR} +.for f in AUTHORS CHANGELOG COPYING INSTALL MANUAL README RELEASENOTES + @${INSTALL_DATA} ${WRKSRC}/$f ${DOCSDIR} .endfor .endif diff --git a/comms/yfklog/distinfo b/comms/yfklog/distinfo index 2a99dde660d8..95b4559cb5eb 100644 --- a/comms/yfklog/distinfo +++ b/comms/yfklog/distinfo @@ -1,3 +1,6 @@ -MD5 (yfklog-0.3.4.tar.gz) = 28dedab2b6a51e5f34111448f06668fa -SHA256 (yfklog-0.3.4.tar.gz) = 7e328923977aeea33d9351bdbdcb033202800ace864b8f3795b11294348f0d08 -SIZE (yfklog-0.3.4.tar.gz) = 119285 +MD5 (yfklog/yfklog-0.3.5.tar.gz) = b9dcffbd77d262676ed108be0ab2db0d +SHA256 (yfklog/yfklog-0.3.5.tar.gz) = af46983aa8900a8b1379b0302cf7891e29e3c2af662dd96ccd7342dc2a159bbf +SIZE (yfklog/yfklog-0.3.5.tar.gz) = 128790 +MD5 (yfklog/yfk.png) = 90b9267746f9b1f1ecd6842e5a308a28 +SHA256 (yfklog/yfk.png) = e54bf52aa79ac2a90b8a901d9eea37c04b4a5895daee4736dde65110abb7d49d +SIZE (yfklog/yfk.png) = 1495 diff --git a/comms/yfklog/files/patch-yfk b/comms/yfklog/files/patch-yfk new file mode 100644 index 000000000000..15ffe8ce72fa --- /dev/null +++ b/comms/yfklog/files/patch-yfk @@ -0,0 +1,11 @@ +--- yfk.orig 2008-06-17 17:34:44.000000000 -0400 ++++ yfk 2008-06-17 17:36:27.000000000 -0400 +@@ -28,7 +28,7 @@ + + my $prefix="/usr"; + +-require "$prefix/share/yfklog/yfksubs.pl"; ++require "$prefix/libexec/yfksubs.pl"; + import yfksubs; + + our $yfkver = '0.3.5'; # Program Version diff --git a/comms/yfklog/pkg-descr b/comms/yfklog/pkg-descr index 471cd7ead7dd..78eca1e8d64f 100644 --- a/comms/yfklog/pkg-descr +++ b/comms/yfklog/pkg-descr @@ -3,6 +3,3 @@ Amateur radio curses perl based logging program. Written by Fabian Kurz, DJ1YFK WWW: http://fkurz.net/ham/yfklog.html - -- Diane (VA3DB) -db@db.net diff --git a/comms/yfklog/pkg-plist b/comms/yfklog/pkg-plist index 21591caaeb66..562f91566407 100644 --- a/comms/yfklog/pkg-plist +++ b/comms/yfklog/pkg-plist @@ -1,4 +1,6 @@ bin/yfklog +libexec/yfksubs.pl +share/pixmaps/yfklog.png %%DATADIR%%/config %%DATADIR%%/cty.dat %%DATADIR%%/db_calls.sql @@ -6,24 +8,24 @@ bin/yfklog %%DATADIR%%/db_config.sql %%DATADIR%%/db_log.sql %%DATADIR%%/db_log.sqlite -%%DATADIR%%/yfksubs.pl %%DATADIR%%/zweckform3421.lab %%DATADIR%%/zweckform3475.lab %%DATADIR%%/zweckform3657.lab -%%EXAMPLESDIR%%/clubs/README -%%EXAMPLESDIR%%/clubs/hsc2sql.awk -%%EXAMPLESDIR%%/clubs/hscmember.txt -%%EXAMPLESDIR%%/onlinelog/README -%%EXAMPLESDIR%%/onlinelog/search.php -%%EXAMPLESDIR%%/onlinelog/test.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clubs/README +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clubs/hsc2sql.awk +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clubs/hscmember.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/onlinelog/README +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/onlinelog/search.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/onlinelog/test.txt %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG +%%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/MANUAL %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/RELEASENOTES %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%DATADIR%% -@dirrm %%EXAMPLESDIR%%/clubs -@dirrm %%EXAMPLESDIR%%/onlinelog -@dirrm %%EXAMPLESDIR%% +%%PORTDATA%%@dirrm %%DATADIR%% +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/clubs +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/onlinelog +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%