Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 24 May 2003 16:59:18 +0200 (SAST)
From:      Matthew West <mwest@uct.ac.za>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/52644: port upgrade: print/pcal from 4.7 to 4.7.1
Message-ID:  <200305241459.h4OExIiZ069377@casper.cs.uct.ac.za>
Resent-Message-ID: <200305241510.h4OFA9BB040722@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         52644
>Category:       ports
>Synopsis:       port upgrade: print/pcal from 4.7 to 4.7.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 24 08:10:09 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Matthew West
>Release:        FreeBSD 5.0-RELEASE-p1 i386
>Organization:
University of Cape Town
>Environment:

>Description:

upgrades the print/pcal port from 4.7 to 4.7.1, which now has a new
home as the original author's site is no longer available

>How-To-Repeat:

>Fix:

diff -ruN pcal.orig/Makefile pcal/Makefile
--- pcal.orig/Makefile	Fri Feb 21 19:25:22 2003
+++ pcal/Makefile	Sat May 24 16:57:26 2003
@@ -6,17 +6,13 @@
 #
 
 PORTNAME=	pcal
-PORTVERSION=	4.7
+PORTVERSION=	4.7.1
 CATEGORIES=	print
-MASTER_SITES=	http://www.geocities.com/SunsetStrip/Palms/5555/PS/
-DISTNAME=	${PORTNAME}_${PORTVERSION:S/./_/}_tar_Z
-EXTRACT_SUFX=	.txt
+MASTER_SITES=	http://fronzek.akshor.com/pcal/
 
 MAINTAINER=	mwest@uct.ac.za
 COMMENT=	PostScript calendar program
 
-WRKSRC=		${WRKDIR}/pcal.${PORTVERSION}
-PAPERSIZE?=	A4
 WWWSERVER!=	hostname
 
 MAN1=		pcal.1
@@ -27,13 +23,6 @@
 MAKE_ENV+=	CC="${CC}" HOST_CC="${CC}"
 
 ALL_TARGET=	pcal
-
-do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}
-	@(cd ${WRKDIR}; \
-	  uudecode -p ${DISTDIR}/${DISTFILES} | ${TAR} xzf -; \
-	)
 
 pre-install:
 	${MV} ${WRKSRC}/pcal.cgi ${WRKSRC}/pcal.cgi.tmp
diff -ruN pcal.orig/distinfo pcal/distinfo
--- pcal.orig/distinfo	Mon Aug  6 15:13:43 2001
+++ pcal/distinfo	Sat May 24 15:37:19 2003
@@ -1 +1 @@
-MD5 (pcal_4_7_tar_Z.txt) = cef12878d3f6862d0cd1ad4358dcce38
+MD5 (pcal-4.7.1.tar.gz) = 85314da2c4616d40a59c80fc4ee807a0
diff -ruN pcal.orig/files/patch-aa pcal/files/patch-aa
--- pcal.orig/files/patch-aa	Mon Aug  6 15:13:43 2001
+++ pcal/files/patch-aa	Sat May 24 16:10:06 2003
@@ -1,11 +1,11 @@
---- Makefile.orig	Thu Feb 10 01:06:23 2000
-+++ Makefile	Thu Dec 21 09:40:35 2000
+--- Makefile.orig	Tue Jan  7 10:29:28 2003
++++ Makefile	Sat May 24 15:40:57 2003
 @@ -21,8 +21,8 @@
  
  # Set the configuration variables below to taste.
  
--PCALINIT_CC = /bin/cc			# native compiler
--CC	    = /bin/cc			# cross-compiler (if target != host)
+-PCALINIT_CC = /usr/bin/gcc			# native compiler
+-CC	    = /usr/bin/gcc			# cross-compiler (if target != host)
 +PCALINIT_CC = ${CC}			# native compiler
 +CC	    = ${HOST_CC}		# cross-compiler (if target != host)
  
@@ -24,14 +24,3 @@
  
  OBJECTS = pcal.o exprpars.o moonphas.o pcalutil.o readfile.o writefil.o
  
-@@ -112,6 +112,10 @@
- 	$(D_TEXT) $(D_LINK) $(D_ALINK) $(D_VLINK) \
- 	$(D_HOLIDAY_PRE) $(D_HOLIDAY_POST) $(D_BLANK_STYLE) \
- 	$(D_SEARCH_PCAL_DIR)
-+
-+.if defined(PAPERSIZE) && $(PAPERSIZE) == A4 # default Letter (OK?)
-+COPTS += -DA4PAPER
-+.endif
- 
- $(PCAL):	$(OBJECTS)
- 	$(CC) $(LDFLAGS) -o $(PCAL) $(OBJECTS) -lm
diff -ruN pcal.orig/files/patch-ac pcal/files/patch-ac
--- pcal.orig/files/patch-ac	Mon Aug  6 15:13:43 2001
+++ pcal/files/patch-ac	Sat May 24 16:16:24 2003
@@ -1,11 +1,11 @@
---- pcal.html.orig	Thu Feb 10 01:06:23 2000
-+++ pcal.html	Wed Dec 20 17:38:53 2000
+--- pcal.html.orig	Wed Feb  9 18:06:23 2000
++++ pcal.html	Sat May 24 15:42:13 2003
 @@ -12,7 +12,7 @@
  
  -->
  <HEAD>
 -<TITLE>pcal v4.6</TITLE>
-+<TITLE>pcal v4.7</TITLE>
++<TITLE>pcal v4.7.1</TITLE>
  </HEAD>
  
  <BODY>
diff -ruN pcal.orig/files/patch-ad pcal/files/patch-ad
--- pcal.orig/files/patch-ad	Mon Aug  6 15:13:44 2001
+++ pcal/files/patch-ad	Sat May 24 16:16:39 2003
@@ -1,11 +1,11 @@
---- pcalw.html.orig	Thu Feb 10 01:06:23 2000
-+++ pcalw.html	Wed Dec 20 17:38:56 2000
+--- pcalw.html.orig	Wed Feb  9 18:06:23 2000
++++ pcalw.html	Sat May 24 15:42:43 2003
 @@ -12,14 +12,14 @@
  
  -->
  <HEAD>
 -<TITLE>pcal v4.6 (single-year mode)</TITLE>
-+<TITLE>pcal v4.7 (single-year mode)</TITLE>
++<TITLE>pcal v4.7.1 (single-year mode)</TITLE>
  </HEAD>
  <BODY>
  <H2 ALIGN=CENTER>Generate single-page PostScript calendar for entire year</H2>
diff -ruN pcal.orig/files/patch-ae pcal/files/patch-ae
--- pcal.orig/files/patch-ae	Mon Aug  6 15:13:44 2001
+++ pcal/files/patch-ae	Sat May 24 16:16:56 2003
@@ -1,5 +1,5 @@
---- pcal.man.orig	Thu Dec 21 10:10:45 2000
-+++ pcal.man	Thu Dec 21 10:11:15 2000
+--- pcal.man.orig	Wed Feb  9 18:06:23 2000
++++ pcal.man	Sat May 24 15:37:18 2003
 @@ -443,14 +443,14 @@
  `&#NNN;' (NNN = any three decimal digits) are also supported.  These will
  be propagated intact (be sure to escape the `#' in `&#NNN;') if the output
diff -ruN pcal.orig/pkg-descr pcal/pkg-descr
--- pcal.orig/pkg-descr	Mon Aug  6 15:13:43 2001
+++ pcal/pkg-descr	Sat May 24 16:42:54 2003
@@ -3,7 +3,7 @@
 "calendar" for entries with leading dates matching dates on the
 calendar, and prints any following text under the appropriate day.
 
-WWW: http://www.geocities.com/SunsetStrip/Palms/5555/PS/
+WWW: http://fronzek.akshor.com/pcal/
 
 --
 mwest@uct.ac.za
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305241459.h4OExIiZ069377>