Date: Sat, 9 Aug 2003 01:25:30 +0300 (EEST) From: Esa Karkkainen <ejk@iki.fi> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Esa Karkkainen <ejk@iki.fi> Subject: ports/55402: Update port: astro/sscalc fix manpage installation to wrong dir Message-ID: <200308082225.h78MPUWp087685@corsair.my.domain> Resent-Message-ID: <200308082230.h78MU7s5025880@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 55402
>Category: ports
>Synopsis: Update port: astro/sscalc fix manpage installation to wrong dir
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Aug 08 15:30:06 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Esa Karkkainen
>Release: FreeBSD 4.8-STABLE i386
>Organization:
Is in state of disintegration
>Environment:
System: FreeBSD 4.8-STABLE Sun Jul 27 16:17:04 EEST 2003
Ports tree: cvsupped Fri Aug 8 13:11:21 EEST 2003
>Description:
The following patch fixes these issues:
*) manpage installation to wrong directory (kris)
*) pkg-descr contains a URL but no WWW (portlint -A)
*) use DOCSDIR macro (portlint -A)
>How-To-Repeat:
N/A
>Fix:
diff -ruN sscalc.orig/Makefile sscalc/Makefile
--- sscalc.orig/Makefile Fri Aug 8 13:07:41 2003
+++ sscalc/Makefile Sat Aug 9 01:00:46 2003
@@ -13,7 +13,7 @@
MAINTAINER= kew@icehouse.net
COMMENT= A sunrise/sunset time calculator
-BROKEN= "Installs manpage into wrong directory"
+MAN1= sscalc.1
pre-fetch:
.if !defined(LAT)
@@ -22,10 +22,13 @@
@${ECHO_MSG} "Compiling in lat/longs"
.endif
-post-install:
- @strip ${PREFIX}/bin/sscalc
- @${MKDIR} ${PREFIX}/share/doc/sscalc
- ${INSTALL_DATA} ${WRKSRC}/cities.txt ${PREFIX}/share/doc/sscalc
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/sscalc
+do-install:
+ ${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/sscalc ${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/sscalc.1 ${MAN1PREFIX}/man/man1
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/cities.txt ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+.endif
.include <bsd.port.mk>
diff -ruN sscalc.orig/pkg-descr sscalc/pkg-descr
--- sscalc.orig/pkg-descr Sat Apr 6 02:28:55 2002
+++ sscalc/pkg-descr Sat Aug 9 00:40:13 2003
@@ -7,3 +7,5 @@
The page was written by Aaron Horiuchi, Chris Lehman and Chris
Cornwall.
+
+WWW: http://www.icehouse.net/kew/
diff -ruN sscalc.orig/pkg-plist sscalc/pkg-plist
--- sscalc.orig/pkg-plist Tue Dec 19 15:36:31 2000
+++ sscalc/pkg-plist Sat Aug 9 00:54:50 2003
@@ -1,4 +1,4 @@
bin/sscalc
-share/doc/sscalc/cities.txt
-share/doc/sscalc/README
-@dirrm share/doc/sscalc
+%%PORTDOCS%%%%DOCSDIR%%/cities.txt
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200308082225.h78MPUWp087685>