ports/76220: port upgrade: print/pcal from 4.7.1 to 4.8.0
Matthew West
mwest at uct.ac.za
Thu Jan 13 19:40:31 UTC 2005
>Number: 76220
>Category: ports
>Synopsis: port upgrade: print/pcal from 4.7.1 to 4.8.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Jan 13 19:40:29 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Matthew West
>Release: FreeBSD 5.3-RELEASE-p2 i386
>Organization:
University of Cape Town
>Environment:
>Description:
this patch upgrades print/pcal from 4.7.1 to 4.8.0
files changed: Makefile, distinfo, files/patch-a[a-d]
files added: pkg-plist
files removed: patch-ae
the upgrade to 4.8.0 also addresses the security problem detailed at:
http://www.vuxml.org/freebsd/58fc2752-5f74-11d9-a9e7-0001020eed82.html
>How-To-Repeat:
>Fix:
--- pcal.diff begins here ---
diff -ruN pcal.orig/Makefile pcal/Makefile
--- pcal.orig/Makefile Thu Jan 13 21:23:13 2005
+++ pcal/Makefile Thu Jan 13 21:32:21 2005
@@ -6,24 +6,22 @@
#
PORTNAME= pcal
-PORTVERSION= 4.7.1
+PORTVERSION= 4.8.0
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
+EXTRACT_SUFX= .tgz
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= mwest at uct.ac.za
COMMENT= PostScript calendar program
-DEPRECATED= http://vuxml.FreeBSD.org/58fc2752-5f74-11d9-a9e7-0001020eed82.html
-EXPIRATION_DATE=2005-02-13
-
USE_REINPLACE= yes
-MAKE_ENV= CC="${CC}" HOST_CC="${CC}" PAPERSIZE="${PAPERSIZE}"
-ALL_TARGET= pcal
+MAKE_ENV= CC="${CC}" HOST_CC="${CC}"
+ALL_TARGET=
+USE_GMAKE= yes
MAN1= pcal.1
-PLIST_FILES= bin/pcal libexec/pcal.cgi
-PORTDOCS= ReadMe pcal.html pcalw.html
+PORTDOCS= ReadMe.txt pcal.html pcalw.html
WWWSERVER!= hostname
@@ -31,21 +29,23 @@
post-patch:
@${REINPLACE_CMD} -e \
- 's|@@PREFIX@@|${PREFIX}|g' ${WRKSRC}/pcal.cgi
+ 's|@@PREFIX@@|${PREFIX}|g' ${WRKSRC}/html/pcal.cgi
@${REINPLACE_CMD} -e \
- 's|@@WWWSERVER@@|${WWWSERVER}|g' ${WRKSRC}/pcal.html
+ 's|@@WWWSERVER@@|${WWWSERVER}|g' ${WRKSRC}/html/pcal.html
@${REINPLACE_CMD} -e \
- 's|@@WWWSERVER@@|${WWWSERVER}|g' ${WRKSRC}/pcalw.html
+ 's|@@WWWSERVER@@|${WWWSERVER}|g' ${WRKSRC}/html/pcalw.html
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/pcal ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/pcal.cgi ${PREFIX}/libexec
- ${INSTALL_MAN} ${WRKSRC}/pcal.man ${MANPREFIX}/man/man1/pcal.1
+ ${INSTALL_PROGRAM} ${WRKSRC}/exec/pcal ${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/html/pcal.cgi ${PREFIX}/libexec
+ ${INSTALL_MAN} ${WRKSRC}/doc/pcal.man ${MANPREFIX}/man/man1/pcal.1
+ @${MKDIR} ${EXAMPLESDIR}
+ ${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/ReadMe ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/pcal.html ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/pcalw.html ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/ReadMe.txt ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/html/pcal.html ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/html/pcalw.html ${DOCSDIR}
.endif
.include <bsd.port.post.mk>
diff -ruN pcal.orig/distinfo pcal/distinfo
--- pcal.orig/distinfo Mon Mar 15 12:18:37 2004
+++ pcal/distinfo Thu Jan 13 17:23:59 2005
@@ -1,2 +1,2 @@
-MD5 (pcal-4.7.1.tar.gz) = 07d8e3b92affc4940c4401d9a8274075
-SIZE (pcal-4.7.1.tar.gz) = 291594
+MD5 (pcal-4.8.0.tgz) = 0bd20cec495926c81b5cd03b637d7a62
+SIZE (pcal-4.8.0.tgz) = 266615
diff -ruN pcal.orig/files/patch-aa pcal/files/patch-aa
--- pcal.orig/files/patch-aa Tue Jun 3 17:27:04 2003
+++ pcal/files/patch-aa Thu Jan 13 17:28:29 2005
@@ -1,20 +1,20 @@
---- 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 = /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)
-
- # Set COMPRESS to your preferred compression utility (compress, gzip, etc.),
- # Z to the file suffix that it generates (.Z, .gz, etc.), and UUC to the file
-@@ -58,9 +58,9 @@
- # PACK = pack
-
- # directories for installing executable and man page(s)
+--- Makefile.orig Thu Dec 16 00:54:16 2004
++++ Makefile Thu Jan 13 17:28:01 2005
+@@ -73,8 +73,8 @@
+ D_BUILD_ENV = -DBUILD_ENV_UNIX
+ PCAL = pcal
+ PCALINIT = pcalinit
+- CC = /usr/bin/gcc
+- PCALINIT_CC = /usr/bin/gcc
++ CC = ${HOST_CC}
++ PCALINIT_CC = ${CC}
+ PACK = compress
+ # PACK = pack
+ # PACK = gzip
+@@ -101,9 +101,9 @@
+ OBJDIR = obj
+ EXECDIR = exec
+ DOCDIR = doc
-BINDIR = /usr/local/bin
-MANDIR = /usr/man/man1
-CATDIR = /usr/man/cat1
@@ -22,5 +22,5 @@
+MANDIR = ${PREFIX}/man/man1
+CATDIR = ${PREFIX}/cat1
- OBJECTS = pcal.o exprpars.o moonphas.o pcalutil.o readfile.o writefil.o
-
+ #
+ # Compiling for DOS/DJGPP requires different directories for the installed
diff -ruN pcal.orig/files/patch-ab pcal/files/patch-ab
--- pcal.orig/files/patch-ab Mon Aug 6 15:13:43 2001
+++ pcal/files/patch-ab Thu Jan 13 17:30:13 2005
@@ -1,6 +1,6 @@
---- pcal.cgi.orig Wed Dec 20 15:43:36 2000
-+++ pcal.cgi Wed Dec 20 15:45:35 2000
-@@ -27,8 +27,8 @@
+--- html/pcal.cgi.orig Thu Dec 16 01:18:24 2004
++++ html/pcal.cgi Thu Jan 13 17:29:50 2005
+@@ -29,8 +29,8 @@
# common calendar file on your system (note that the user can't use his/her
# own calendar file since most servers will execute pcal.cgi as 'nobody')
@@ -10,4 +10,4 @@
+file=@@PREFIX@@/share/misc/calendar
# set DEBUG=1 to echo debugging output as HTML text
- DEBUG=0
+ # DEBUG=0
diff -ruN pcal.orig/files/patch-ac pcal/files/patch-ac
--- pcal.orig/files/patch-ac Tue Jun 3 17:27:04 2003
+++ pcal/files/patch-ac Thu Jan 13 17:34:13 2005
@@ -1,15 +1,6 @@
---- 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.1</TITLE>
- </HEAD>
-
- <BODY>
-@@ -21,7 +21,7 @@
+--- html/pcal.html.orig Thu Dec 16 01:18:24 2004
++++ html/pcal.html Thu Jan 13 17:31:10 2005
+@@ -20,7 +20,7 @@
<!-- start of form -->
diff -ruN pcal.orig/files/patch-ad pcal/files/patch-ad
--- pcal.orig/files/patch-ad Tue Jun 3 17:27:04 2003
+++ pcal/files/patch-ad Thu Jan 13 17:34:30 2005
@@ -1,14 +1,6 @@
---- 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.1 (single-year mode)</TITLE>
- </HEAD>
- <BODY>
- <H2 ALIGN=CENTER>Generate single-page PostScript calendar for entire year</H2>
+--- html/pcalw.html.orig Thu Dec 16 01:18:24 2004
++++ html/pcalw.html Thu Jan 13 17:31:55 2005
+@@ -20,7 +20,7 @@
<!-- start of form -->
diff -ruN pcal.orig/pkg-plist pcal/pkg-plist
--- pcal.orig/pkg-plist Thu Jan 1 02:00:00 1970
+++ pcal/pkg-plist Thu Jan 13 21:03:24 2005
@@ -0,0 +1,18 @@
+bin/pcal
+libexec/pcal.cgi
+%%EXAMPLESDIR%%/calendar_au.txt
+%%EXAMPLESDIR%%/calendar_de.txt
+%%EXAMPLESDIR%%/calendar_ee.txt
+%%EXAMPLESDIR%%/calendar_fi.txt
+%%EXAMPLESDIR%%/calendar_fr.txt
+%%EXAMPLESDIR%%/calendar_gr.txt
+%%EXAMPLESDIR%%/calendar_no.txt
+%%EXAMPLESDIR%%/calendar_nz.txt
+%%EXAMPLESDIR%%/calendar_uk.txt
+%%EXAMPLESDIR%%/fonttest_e
+%%EXAMPLESDIR%%/fonttest_koi8u
+%%EXAMPLESDIR%%/fonttest_l
+%%EXAMPLESDIR%%/fonttest_r
+%%EXAMPLESDIR%%/moon98
+%%EXAMPLESDIR%%/pcal-cfg.txt
+ at dirrm %%EXAMPLESDIR%%
--- pcal.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list