Bug 102546

Summary: [PATCH] deskutils/calcurse - Update to version 1.5
Product: Ports & Packages Reporter: Herbert J. Skuhra <herbert>
Component: Individual Port(s)Assignee: Pav Lucistnik <pav>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description Herbert J. Skuhra 2006-08-26 20:50:20 UTC 
The below patch updates deskutils/calcurse to version 1.5.
It's also available at:
	 http://norway.ath.cx/calcurse_1_5.diff

Fix: ----
 
 PORTNAME=		calcurse
-PORTVERSION=		1.3
+PORTVERSION=		1.5
 CATEGORIES=		deskutils
-MASTER_SITES=		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	arved
+MASTER_SITES=		ftp://ftp2.culot.org/culot/
 
 MAINTAINER=		h.skuhra@gmail.com
 COMMENT=		A text-based personal organizer
@@ -18,7 +17,12 @@
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--prefix=${PREFIX}
 
-MAN1=			calcurse.1
-PLIST_FILES=		bin/${PORTNAME}
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=		NLS="@comment "
+.else
+USE_GETTEXT=		yes
+PLIST_SUB+=		NLS=""
+.endif
 
 .include <bsd.port.mk>


------AhttPhLXGj1jwclYw0bpHs3a3WxwBYzhUcdzJ5n9bNxCpOKl
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

diff -ruN deskutils/calcurse.bak/Makefile deskutils/calcurse/Makefile
--- deskutils/calcurse.bak/Makefile	Sat Aug 26 18:33:30 2006
+++ deskutils/calcurse/Makefile	Sat Aug 26 19:28:50 2006
@@ -5,10 +5,9 @@
 # $FreeBSD: ports/deskutils/calcurse/Makefile,v 1.3 2006/04/15
13:39:16 arved Exp $
Comment 1 Herbert J. Skuhra 2006-08-26 21:02:25 UTC 
Sorry, I added marks at the wrong position. Here is the correct patch:

diff -ruN deskutils/calcurse.bak/Makefile deskutils/calcurse/Makefile
--- deskutils/calcurse.bak/Makefile	Sat Aug 26 18:33:30 2006
+++ deskutils/calcurse/Makefile	Sat Aug 26 19:28:50 2006
@@ -5,10 +5,9 @@
 # $FreeBSD: ports/deskutils/calcurse/Makefile,v 1.3 2006/04/15
13:39:16 arved Exp $ 
 PORTNAME=		calcurse
-PORTVERSION=		1.3
+PORTVERSION=		1.5
 CATEGORIES=		deskutils
-MASTER_SITES=		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	arved
+MASTER_SITES=		ftp://ftp2.culot.org/culot/
 
 MAINTAINER=		h.skuhra@gmail.com
 COMMENT=		A text-based personal organizer
@@ -18,7 +17,12 @@
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--prefix=${PREFIX}
 
-MAN1=			calcurse.1
-PLIST_FILES=		bin/${PORTNAME}
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=		NLS="@comment "
+.else
+USE_GETTEXT=		yes
+PLIST_SUB+=		NLS=""
+.endif
 
 .include <bsd.port.mk>
diff -ruN deskutils/calcurse.bak/distinfo deskutils/calcurse/distinfo
--- deskutils/calcurse.bak/distinfo	Sat Aug 26 18:33:30 2006
+++ deskutils/calcurse/distinfo	Sat Aug 26 18:35:23 2006
@@ -1,3 +1,3 @@
-MD5 (calcurse-1.3.tar.gz) = cab22db910f8136522b06d02fd0fc536
-SHA256 (calcurse-1.3.tar.gz) =
ddf5a2aea26c218bccb923a2cea7b6213c3abb49326ca08511cc5fc874077544 -SIZE
(calcurse-1.3.tar.gz) = 115961 +MD5 (calcurse-1.5.tar.gz) =
3e51b793b78abf5679f81195e1eb86ad +SHA256 (calcurse-1.5.tar.gz) =
4066158bde454ea763fb9a03ad46a4436507cc949bf1c103d9f910a7bf0df693 +SIZE
(calcurse-1.5.tar.gz) = 282581 diff -ruN
deskutils/calcurse.bak/pkg-plist deskutils/calcurse/pkg-plist ---
deskutils/calcurse.bak/pkg-plist	Thu Jan  1 01:00:00 1970 +++
deskutils/calcurse/pkg-plist	Sat Aug 26 19:31:40 2006 @@ -0,0
+1,12 @@ +bin/calcurse
+man/man1/calcurse.1
+%%NLS%%/share/locale/de/LC_MESSAGES/calcurse.mo
+%%NLS%%/share/locale/en/LC_MESSAGES/calcurse.mo
+%%NLS%%/share/locale/fr/LC_MESSAGES/calcurse.mo
+@dirrmtry man/man1
+%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/de
+%%NLS%%@dirrmtry share/locale/en/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/en
+%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fr
Comment 2 Pav Lucistnik freebsd_committer freebsd_triage 2006-08-28 14:00:51 UTC 
State Changed
From-To: open->feedback

Sadly, followup patch does not survived the transmission, it seems. 

There are problems with it anyway: 
- man pages must be listed in Makefile! put MAN1 back and remove it from pkg-plist 
- please don't remove shared locale directories, which are listed in /etc/mtree/BSD.local.dist 

Please fix and resend
Comment 3 Pav Lucistnik freebsd_committer freebsd_triage 2006-08-28 14:00:51 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->pav

Track
Comment 4 Pav Lucistnik freebsd_committer freebsd_triage 2006-08-28 18:41:33 UTC 
State Changed
From-To: feedback->closed

Committed, thanks!