From ekarkkai@pp.htv.fi  Fri Aug  8 15:25:36 2003
Return-Path: <ekarkkai@pp.htv.fi>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 185ED37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  8 Aug 2003 15:25:36 -0700 (PDT)
Received: from cs78133222.pp.htv.fi (cs78133222.pp.htv.fi [62.78.133.222])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5509E43F93
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  8 Aug 2003 15:25:34 -0700 (PDT)
	(envelope-from ekarkkai@pp.htv.fi)
Received: from corsair.my.domain (corsair.my.domain [192.168.1.10])
	by cs78133222.pp.htv.fi (8.12.9/8.12.9) with ESMTP id h78MPVS7000400;
	Sat, 9 Aug 2003 01:25:31 +0300 (EEST)
	(envelope-from ekarkkai@pp.htv.fi)
Received: from corsair.my.domain (localhost [127.0.0.1])
	by corsair.my.domain (8.12.9/8.12.9) with ESMTP id h78MPVX7087686;
	Sat, 9 Aug 2003 01:25:31 +0300 (EEST)
	(envelope-from ejk@corsair.my.domain)
Received: (from ejk@localhost)
	by corsair.my.domain (8.12.9/8.12.9/Submit) id h78MPUWp087685;
	Sat, 9 Aug 2003 01:25:30 +0300 (EEST)
Message-Id: <200308082225.h78MPUWp087685@corsair.my.domain>
Date: Sat, 9 Aug 2003 01:25:30 +0300 (EEST)
From: Esa Karkkainen <ejk@iki.fi>
Reply-To: Esa Karkkainen <ejk@iki.fi>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Esa Karkkainen <ejk@iki.fi>, Keith Walker <kew@icehouse.net>
Subject: Update port: astro/sscalc fix manpage installation to wrong dir
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>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:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 08 15:30:06 PDT 2003
>Closed-Date:    Tue Aug 19 03:36:54 PDT 2003
>Last-Modified:  Tue Aug 19 03:36:54 PDT 2003
>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:

From: "Kang Liu" <lazykang@hotmail.com>
To: freebsd-gnats-submit@FreeBSD.org, ejk@iki.fi
Cc:  
Subject: Re: ports/55402: Update port: astro/sscalc fix manpage installation to wrong dir
Date: Sun, 17 Aug 2003 21:33:13 +0800

 I think you forget to dump PORTREVISION.
 
 --- Makefile.orig	Fri Aug  8 12:40:38 2003
 +++ Makefile	Sun Aug 17 21:30:32 2003
 @@ -7,13 +7,14 @@
 
 PORTNAME=	sscalc
 PORTVERSION=	1.0
 +PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	http://www.icehouse.net/kew/
 
 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 +23,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>
 
 _________________________________________________________________
 Help STOP SPAM with the new MSN 8 and get 2 months FREE*  
 http://join.msn.com/?page=features/junkmail
 
State-Changed-From-To: open->closed  
State-Changed-By: krion 
State-Changed-When: Tue Aug 19 03:36:30 PDT 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=55402 
>Unformatted:
