Attachment #70795 for bug #103224

View | Details | Raw Unified | Return to bug 103224
Collapse All | Expand All

Lines 6-12 Link Here

(-)pcal/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= pcal	8	PORTNAME= pcal
9	PORTVERSION= 4.9.1	9	PORTVERSION= 4.10.0
10	CATEGORIES= print	10	CATEGORIES= print
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}

Lines 1-3 Link Here

(-)pcal/distinfo (-3 / +3 lines)
1	MD5 (pcal-4.9.1.tgz) = 7646ae0b539466696484f311d79b2b02	1	MD5 (pcal-4.10.0.tgz) = 8d423d5ae202278a6b6d655244bd6e39
2	SHA256 (pcal-4.9.1.tgz) = 9115ca1ac9db3e9f5639b0786c9184d346638e206ec413d2bf4be0ff8742fd18	2	SHA256 (pcal-4.10.0.tgz) = 6c0518155c08ba526690d8f07037fb741a9fd89310d9cc9e171a7b0d228ab09e
3	SIZE (pcal-4.9.1.tgz) = 218977	3	SIZE (pcal-4.10.0.tgz) = 287562




--- Makefile.orig	Wed Sep 13 07:59:12 2006
+++ Makefile	Wed Sep 13 08:09:36 2006
@@ -113,8 +113,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
@@ -144,9 +144,9 @@
 	MANDIR = $(DJDIR)/man/man1
 	CATDIR = $(DJDIR)/man/cat1
 else   # Unix
-	BINDIR = /usr/local/bin
-	MANDIR = /usr/man/man1
-	CATDIR = /usr/man/cat1
+	BINDIR = ${PREFIX}/bin
+	MANDIR = ${PREFIX}/man/man1
+	CATDIR = ${PREFIX}/cat1
 endif
 
 OBJECTS = $(OBJDIR)/pcal.o \
 # Compiling for DOS/DJGPP requires different directories for the installed

Lines 8-13 Link Here

(-)pcal/pkg-plist (+1 lines)
8	%%EXAMPLESDIR%%/calendar_fr.txt	8	%%EXAMPLESDIR%%/calendar_fr.txt
9	%%EXAMPLESDIR%%/calendar_gr.txt	9	%%EXAMPLESDIR%%/calendar_gr.txt
10	%%EXAMPLESDIR%%/calendar_hu.txt	10	%%EXAMPLESDIR%%/calendar_hu.txt
		11	%%EXAMPLESDIR%%/calendar_nl.txt
11	%%EXAMPLESDIR%%/calendar_no.txt	12	%%EXAMPLESDIR%%/calendar_no.txt
12	%%EXAMPLESDIR%%/calendar_nz.txt	13	%%EXAMPLESDIR%%/calendar_nz.txt
13	%%EXAMPLESDIR%%/calendar_uk.txt	14	%%EXAMPLESDIR%%/calendar_uk.txt

Return to bug 103224

Lines 1-26 Link Here

(-)pcal/files/patch-aa (-25 / +25 lines)
1	--- Makefile.orig Thu Dec 16 00:54:16 2004	1	--- Makefile.orig Wed Sep 13 07:59:12 2006
2	+++ Makefile Thu Jan 13 17:28:01 2005	2	+++ Makefile Wed Sep 13 08:09:36 2006
3	@@ -73,8 +73,8 @@	3	@@ -113,8 +113,8 @@
4	D_BUILD_ENV = -DBUILD_ENV_UNIX	4	D_BUILD_ENV = -DBUILD_ENV_UNIX
5	PCAL = pcal	5	PCAL = pcal
6	PCALINIT = pcalinit	6	PCALINIT = pcalinit
7	- CC = /usr/bin/gcc	7	- CC = /usr/bin/gcc
8	- PCALINIT_CC = /usr/bin/gcc	8	- PCALINIT_CC = /usr/bin/gcc
9	+ CC = ${HOST_CC}	9	+ CC = ${HOST_CC}
10	+ PCALINIT_CC = ${CC}	10	+ PCALINIT_CC = ${CC}
11	PACK = compress	11	PACK = compress
12	# PACK = pack	12	# PACK = pack
13	# PACK = gzip	13	# PACK = gzip
14	@@ -101,9 +101,9 @@	14	@@ -144,9 +144,9 @@
15	OBJDIR = obj	15	MANDIR = $(DJDIR)/man/man1
16	EXECDIR = exec	16	CATDIR = $(DJDIR)/man/cat1
17	DOCDIR = doc	17	else # Unix
18	-BINDIR = /usr/local/bin	18	- BINDIR = /usr/local/bin
19	-MANDIR = /usr/man/man1	19	- MANDIR = /usr/man/man1
20	-CATDIR = /usr/man/cat1	20	- CATDIR = /usr/man/cat1
21	+BINDIR = ${PREFIX}/bin	21	+ BINDIR = ${PREFIX}/bin
22	+MANDIR = ${PREFIX}/man/man1	22	+ MANDIR = ${PREFIX}/man/man1
23	+CATDIR = ${PREFIX}/cat1	23	+ CATDIR = ${PREFIX}/cat1
		24	endif
24		25
25	#	26	OBJECTS = $(OBJDIR)/pcal.o \
26	# Compiling for DOS/DJGPP requires different directories for the installed