Attachment #100176 for bug #139430

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

Lines 7-14 Link Here

(-)Makefile (-2 / +1 lines)
7	# Also update ports/japanese/plan/ (ja-plan) when this port is updated	7	# Also update ports/japanese/plan/ (ja-plan) when this port is updated
8		8
9	PORTNAME= plan	9	PORTNAME= plan
10	PORTVERSION= 1.9	10	PORTVERSION= 1.10.1
11	PORTREVISION= 1
12	CATEGORIES+= deskutils	11	CATEGORIES+= deskutils
13	MASTER_SITES= ftp://plan.ftp.fu-berlin.de/	12	MASTER_SITES= ftp://plan.ftp.fu-berlin.de/
14	MASTER_SITE_SUBDIR= applications	13	MASTER_SITE_SUBDIR= applications

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (plan-1.9.tar.gz) = ab9e6b67c7b087f130c030aa779ef01d	1	MD5 (plan-1.10.1.tar.gz) = 0de80b5074ca77b20801ed689e82a5a8
2	SHA256 (plan-1.9.tar.gz) = 08092cdacdc15ec78bdcfb5e51a598e9b32c52c93c97905cec578f1171e14cf3	2	SHA256 (plan-1.10.1.tar.gz) = 05aaaada18f34949dc38e207300a8f975c1eb60b93502e10db68822b59b4184f
3	SIZE (plan-1.9.tar.gz) = 441599	3	SIZE (plan-1.10.1.tar.gz) = 462560

Lines 40-45 Link Here

(-)pkg-plist (+1 lines)
40	%%PORTDOCS%%%%DOCSDIR%%/plan.lang.french	40	%%PORTDOCS%%%%DOCSDIR%%/plan.lang.french
41	%%PORTDOCS%%%%DOCSDIR%%/plan.lang.german	41	%%PORTDOCS%%%%DOCSDIR%%/plan.lang.german
42	%%PORTDOCS%%%%DOCSDIR%%/plan.lang.italian	42	%%PORTDOCS%%%%DOCSDIR%%/plan.lang.italian
		43	%%PORTDOCS%%%%DOCSDIR%%/plan.lang.polish
43	%%PORTDOCS%%%%DOCSDIR%%/plan.lang.spanish	44	%%PORTDOCS%%%%DOCSDIR%%/plan.lang.spanish
44	@exec /bin/mkdir -p %D/%%DATADIR%%/netplan.dir	45	@exec /bin/mkdir -p %D/%%DATADIR%%/netplan.dir
45	@dirrmtry %%DATADIR%%/netplan.dir	46	@dirrmtry %%DATADIR%%/netplan.dir




--- Makefile.orig	2007-07-03 15:08:52.000000000 -0300
+++ Makefile	2009-10-05 22:12:11.000000000 -0300
@@ -8,19 +8,19 @@
 # after "=", this is parsed and rewritten by the configure script.
 #

 JAPANDEFS='-DJAPAN -DESCTOASCII=$(ESCTOJISLATIN) -DLENTOASCII=3 -DLOCALE_SJIS=ja_JP.SJIS -DLOCALE_EUC=ja_JP.EUC'
+.if defined(JAPANESE)
+JAPAN=-DJAPAN -DESCTOASCII=$(ESCTOJISLATIN) -DLENTOASCII=3 \
+	-DLOCALE_SJIS=\"ja_JP.SJIS\" -DLOCALE_EUC=\"ja_JP.EUC\"
+.else
 JAPAN=
+.endif

 	  -DSTDLIBMALLOC
 OBSD_C	= -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\
 	  -DNO_MOTIF -DSTDLIBMALLOC
@@ -221,10 +225,10 @@
 BSDIG_L2= -L/usr/X11/lib -lc
 NBSD_L1	= -L/usr/X11R6/lib -lXm -lXt -lX11
 NBSD_L2	= -L/usr/X11R6/lib -lc

-FBSD_L2	= -L/usr/X11R6/lib -lc
-OBSD_L1	= -L/usr/local/lib -lXm -L/usr/X11R6/lib -lXt -lX11
-OBSD_L2	= -lc
+FBSD_L1	= -L$(LOCALBASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext
+FBSD_L2	=
+OBSD_L1	= -L$(LOCALBASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext
+OBSD_L2	=
 LINUX_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lXm -lXt -lX11 -lXpm -lc -lXext -lICE -lX11
 LINUX_L2= -lc
 SLINUX_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lSM /usr/X11R6/lib/libXm.a -lXt -lX11 /usr/X11R6/lib/libXpm.a -lc -lXext -lSM -lICE -lX11
@@ -291,7 +295,7 @@
 	@echo "  make bsdi      BSDI/386"
 	@echo "  make bsdig     BSDI/386 with gcc"
 	@echo "  make netbsd    NetBSD/i386 1.0A (maybe others too)"

 	@echo "  make openbsd	OpenBSD"
 	@echo "  make svr4      SVR4 Using gcc"
 	@echo "  make news4     Sony NEWS-OS4.x"
@@ -542,7 +546,7 @@
 	$(CCLINE) -c -DLIB=\"$(LIB)\" $<
 
 holiday.o: holiday.c $(MAKEFILE)

 
 util.o: util.c $(MAKEFILE)
 	$(CCLINE) -c -DPATH=\"$(LIB):$(DIR):$(HELP)\" $<
@@ -617,10 +621,10 @@
 LIST	= README HISTORY plan.spec holiday/* language/* misc/* src/resources.h.bigfonts web/*
 SRC	= Makefile $(P_SRC) daemon.c $(N_SRC) $(S_SRC) $(INC) $(S_INC) configure
 
-LDIR	= /usr/X11R6/lib
+LDIR	= $(LOCALBASE)/lib
 BINDIR	= plan-$(VERSION)
 gMYCC	= gcc
-gCF	= -m32 -I/usr/X11R6/include -D_POSIX_SOURCE -DNOLOCK -DLINUX -Dlinux
+gCF	= -m32 -I$(LOCALBASE)/include -D_POSIX_SOURCE -DNOLOCK -DLINUX -Dlinux
 gL1F	= -L$(LDIR) $(LDIR)/libXm.a -lXt -lX11 $(LDIR)/libXpm.a -lc -lXext -lICE -lXp -lX11
 gL2F	= -lc
 




--- servmenu.c.orig	Tue Mar  2 14:02:17 1999
+++ servmenu.c	Fri Mar 29 11:24:14 2002
@@ -8,7 +8,11 @@
 
 #include <stdio.h>
 #include <time.h>
+#ifndef STDLIBMALLOC
 #include <malloc.h>
+#else
+#include <stdlib.h>
+#endif
 #include <Xm/Xm.h>
 #include <Xm/DialogS.h>
 #include <Xm/Form.h>

Removed Link Here

(-)files/patch-ag (-11 lines)
1	--- sublist.c.orig Sun May 2 12:23:15 1999
2	+++ sublist.c Thu Jun 17 13:09:05 1999
3	@@ -23,7 +23,7 @@
4	#define regcmp re_comp
5	#define regex re_exec
6	#endif
7	-#if defined(linux) \|\| defined(__EMX__)
8	+#if defined(linux) \|\| defined(__EMX__) \|\| defined(POSIX_REGEX)
9	#define regcmp regcomp
10	#define regex regexec
11	#endif

Added Link Here

(-)files/patch-servmenu.c (+11 lines)
1	--- servmenu.c.orig 2005-05-18 16:01:40.000000000 -0300
2	+++ servmenu.c 2009-10-05 22:16:45.000000000 -0300
3	@@ -8,7 +8,7 @@
4
5	#include <stdio.h>
6	#include <time.h>
7	-#ifndef MACOSX
8	+#ifndef STDLIBMALLOC
9	#include <malloc.h>
10	#else
11	#include <stdlib.h>

Added Link Here

(-)files/patch-sublist.c (+11 lines)
1	--- sublist.c.orig Sun May 2 12:23:15 1999
2	+++ sublist.c Thu Jun 17 13:09:05 1999
3	@@ -23,7 +23,7 @@
4	#define regcmp re_comp
5	#define regex re_exec
6	#endif
7	-#if defined(linux) \|\| defined(__EMX__)
8	+#if defined(linux) \|\| defined(__EMX__) \|\| defined(POSIX_REGEX)
9	#define regcmp regcomp
10	#define regex regexec
11	#endif

Return to bug 139430

Lines 1-5 Link Here

(-)files/patch-Makefile (-17 / +17 lines)
1	--- Makefile.orig Mon Feb 7 03:11:34 2005	1	--- Makefile.orig 2007-07-03 15:08:52.000000000 -0300
2	+++ Makefile Mon Dec 11 16:30:57 2006	2	+++ Makefile 2009-10-05 22:12:11.000000000 -0300
3	@@ -8,19 +8,19 @@	3	@@ -8,19 +8,19 @@
4	# after "=", this is parsed and rewritten by the configure script.	4	# after "=", this is parsed and rewritten by the configure script.
5	#	5	#
Lines 45-51 Link Here
45	JAPANDEFS='-DJAPAN -DESCTOASCII=$(ESCTOJISLATIN) -DLENTOASCII=3 -DLOCALE_SJIS=ja_JP.SJIS -DLOCALE_EUC=ja_JP.EUC'	45	JAPANDEFS='-DJAPAN -DESCTOASCII=$(ESCTOJISLATIN) -DLENTOASCII=3 -DLOCALE_SJIS=ja_JP.SJIS -DLOCALE_EUC=ja_JP.EUC'
46	+.if defined(JAPANESE)	46	+.if defined(JAPANESE)
47	+JAPAN=-DJAPAN -DESCTOASCII=$(ESCTOJISLATIN) -DLENTOASCII=3 \	47	+JAPAN=-DJAPAN -DESCTOASCII=$(ESCTOJISLATIN) -DLENTOASCII=3 \
48	+ -DLOCALE_SJIS=\"ja_JP.SJIS\" -DLOCALE_EUC=\"ja_JP.EUC\"	48	+ -DLOCALE_SJIS=\"ja_JP.SJIS\" -DLOCALE_EUC=\"ja_JP.EUC\"
49	+.else	49	+.else
50	JAPAN=	50	JAPAN=
51	+.endif	51	+.endif
Lines 68-74 Link Here
68	-DSTDLIBMALLOC	68	-DSTDLIBMALLOC
69	OBSD_C = -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\	69	OBSD_C = -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\
70	-DNO_MOTIF -DSTDLIBMALLOC	70	-DNO_MOTIF -DSTDLIBMALLOC
71	@@ -219,10 +223,10 @@	71	@@ -221,10 +225,10 @@
72	BSDIG_L2= -L/usr/X11/lib -lc	72	BSDIG_L2= -L/usr/X11/lib -lc
73	NBSD_L1 = -L/usr/X11R6/lib -lXm -lXt -lX11	73	NBSD_L1 = -L/usr/X11R6/lib -lXm -lXt -lX11
74	NBSD_L2 = -L/usr/X11R6/lib -lc	74	NBSD_L2 = -L/usr/X11R6/lib -lc
Lines 76-89 Link Here
76	-FBSD_L2 = -L/usr/X11R6/lib -lc	76	-FBSD_L2 = -L/usr/X11R6/lib -lc
77	-OBSD_L1 = -L/usr/local/lib -lXm -L/usr/X11R6/lib -lXt -lX11	77	-OBSD_L1 = -L/usr/local/lib -lXm -L/usr/X11R6/lib -lXt -lX11
78	-OBSD_L2 = -lc	78	-OBSD_L2 = -lc
79	+FBSD_L1 = -L$(LOCALBASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext	79	+FBSD_L1 = -L$(LOCALBASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext
80	+FBSD_L2 =	80	+FBSD_L2 =
81	+OBSD_L1 = -L$(LOCALBASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext	81	+OBSD_L1 = -L$(LOCALBASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext
82	+OBSD_L2 =	82	+OBSD_L2 =
83	LINUX_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lSM -lXm -lXt -lX11 -lXpm -lc -lXext -lSM -lICE -lX11	83	LINUX_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lXm -lXt -lX11 -lXpm -lc -lXext -lICE -lX11
84	LINUX_L2= -lc	84	LINUX_L2= -lc
85	SLINUX_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lSM /usr/X11R6/lib/libXm.a -lXt -lX11 /usr/X11R6/lib/libXpm.a -lc -lXext -lSM -lICE -lX11	85	SLINUX_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lSM /usr/X11R6/lib/libXm.a -lXt -lX11 /usr/X11R6/lib/libXpm.a -lc -lXext -lSM -lICE -lX11
86	@@ -287,7 +291,7 @@	86	@@ -291,7 +295,7 @@
87	@echo " make bsdi BSDI/386"	87	@echo " make bsdi BSDI/386"
88	@echo " make bsdig BSDI/386 with gcc"	88	@echo " make bsdig BSDI/386 with gcc"
89	@echo " make netbsd NetBSD/i386 1.0A (maybe others too)"	89	@echo " make netbsd NetBSD/i386 1.0A (maybe others too)"
Lines 92-98 Link Here
92	@echo " make openbsd OpenBSD"	92	@echo " make openbsd OpenBSD"
93	@echo " make svr4 SVR4 Using gcc"	93	@echo " make svr4 SVR4 Using gcc"
94	@echo " make news4 Sony NEWS-OS4.x"	94	@echo " make news4 Sony NEWS-OS4.x"
95	@@ -525,7 +529,7 @@	95	@@ -542,7 +546,7 @@
96	$(CCLINE) -c -DLIB=\"$(LIB)\" $<	96	$(CCLINE) -c -DLIB=\"$(LIB)\" $<
97		97
98	holiday.o: holiday.c $(MAKEFILE)	98	holiday.o: holiday.c $(MAKEFILE)
Lines 101-116 Link Here
101		101
102	util.o: util.c $(MAKEFILE)	102	util.o: util.c $(MAKEFILE)
103	$(CCLINE) -c -DPATH=\"$(LIB):$(DIR):$(HELP)\" $<	103	$(CCLINE) -c -DPATH=\"$(LIB):$(DIR):$(HELP)\" $<
104	@@ -600,10 +604,10 @@	104	@@ -617,10 +621,10 @@
105	LIST = README HISTORY holiday/* language/* misc/* src/resources.h.bigfonts web/*	105	LIST = README HISTORY plan.spec holiday/* language/* misc/* src/resources.h.bigfonts web/*
106	SRC = Makefile $(P_SRC) daemon.c $(N_SRC) $(S_SRC) $(INC) $(S_INC) configure	106	SRC = Makefile $(P_SRC) daemon.c $(N_SRC) $(S_SRC) $(INC) $(S_INC) configure
107		107
108	-LDIR = /usr/X11R6/lib	108	-LDIR = /usr/X11R6/lib
109	+LDIR = $(LOCALBASE)/lib	109	+LDIR = $(LOCALBASE)/lib
110	BINDIR = plan-$(VERSION)	110	BINDIR = plan-$(VERSION)
111	gMYCC = gcc	111	gMYCC = gcc
112	-gCF = -I/usr/X11R6/include -D_POSIX_SOURCE -DNOLOCK -DLINUX	112	-gCF = -m32 -I/usr/X11R6/include -D_POSIX_SOURCE -DNOLOCK -DLINUX -Dlinux
113	+gCF = -I$(LOCALBASE)/include -D_POSIX_SOURCE -DNOLOCK -DLINUX	113	+gCF = -m32 -I$(LOCALBASE)/include -D_POSIX_SOURCE -DNOLOCK -DLINUX -Dlinux
114	gL1F = -L$(LDIR) -lSM $(LDIR)/libXm.a -lXt -lX11 $(LDIR)/libXpm.a -lc -lXext -lSM -lICE -lXp -lX11	114	gL1F = -L$(LDIR) $(LDIR)/libXm.a -lXt -lX11 $(LDIR)/libXpm.a -lc -lXext -lICE -lXp -lX11
115	gL2F = -lc	115	gL2F = -lc
116		116

Removed Link Here

(-)files/patch-aa (-14 lines)
1	--- servmenu.c.orig Tue Mar 2 14:02:17 1999
2	+++ servmenu.c Fri Mar 29 11:24:14 2002
3	@@ -8,7 +8,11 @@
4
5	#include <stdio.h>
6	#include <time.h>
7	+#ifndef STDLIBMALLOC
8	#include <malloc.h>
9	+#else
10	+#include <stdlib.h>
11	+#endif
12	#include <Xm/Xm.h>
13	#include <Xm/DialogS.h>
14	#include <Xm/Form.h>