FreeBSD Bugzilla – Attachment 100176 Details for
Bug 139430
[PATCH] deskutils/plan: update to 1.10.1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
plan-1.10.1.patch
plan-1.10.1.patch (text/plain), 7.41 KB, created by
Sylvio César Teixeira Amorim
on 2009-10-08 15:00:12 UTC
(
hide
)
Description:
plan-1.10.1.patch
Filename:
MIME Type:
Creator:
Sylvio César Teixeira Amorim
Created:
2009-10-08 15:00:12 UTC
Size:
7.41 KB
patch
obsolete
>Index: Makefile >=================================================================== >RCS file: /home/ncvs/ports/deskutils/plan/Makefile,v >retrieving revision 1.34 >diff -u -u -r1.34 Makefile >--- Makefile 13 Mar 2009 23:27:13 -0000 1.34 >+++ Makefile 8 Oct 2009 13:52:39 -0000 >@@ -7,8 +7,7 @@ > # Also update ports/japanese/plan/ (ja-plan) when this port is updated > > PORTNAME= plan >-PORTVERSION= 1.9 >-PORTREVISION= 1 >+PORTVERSION= 1.10.1 > CATEGORIES+= deskutils > MASTER_SITES= ftp://plan.ftp.fu-berlin.de/ > MASTER_SITE_SUBDIR= applications >Index: distinfo >=================================================================== >RCS file: /home/ncvs/ports/deskutils/plan/distinfo,v >retrieving revision 1.14 >diff -u -u -r1.14 distinfo >--- distinfo 13 May 2006 17:27:38 -0000 1.14 >+++ distinfo 8 Oct 2009 13:52:39 -0000 >@@ -1,3 +1,3 @@ >-MD5 (plan-1.9.tar.gz) = ab9e6b67c7b087f130c030aa779ef01d >-SHA256 (plan-1.9.tar.gz) = 08092cdacdc15ec78bdcfb5e51a598e9b32c52c93c97905cec578f1171e14cf3 >-SIZE (plan-1.9.tar.gz) = 441599 >+MD5 (plan-1.10.1.tar.gz) = 0de80b5074ca77b20801ed689e82a5a8 >+SHA256 (plan-1.10.1.tar.gz) = 05aaaada18f34949dc38e207300a8f975c1eb60b93502e10db68822b59b4184f >+SIZE (plan-1.10.1.tar.gz) = 462560 >Index: pkg-plist >=================================================================== >RCS file: /home/ncvs/ports/deskutils/plan/pkg-plist,v >retrieving revision 1.14 >diff -u -u -r1.14 pkg-plist >--- pkg-plist 13 May 2006 17:27:38 -0000 1.14 >+++ pkg-plist 8 Oct 2009 13:52:40 -0000 >@@ -40,6 +40,7 @@ > %%PORTDOCS%%%%DOCSDIR%%/plan.lang.french > %%PORTDOCS%%%%DOCSDIR%%/plan.lang.german > %%PORTDOCS%%%%DOCSDIR%%/plan.lang.italian >+%%PORTDOCS%%%%DOCSDIR%%/plan.lang.polish > %%PORTDOCS%%%%DOCSDIR%%/plan.lang.spanish > @exec /bin/mkdir -p %D/%%DATADIR%%/netplan.dir > @dirrmtry %%DATADIR%%/netplan.dir >Index: files/patch-Makefile >=================================================================== >RCS file: /home/ncvs/ports/deskutils/plan/files/patch-Makefile,v >retrieving revision 1.3 >diff -u -u -r1.3 patch-Makefile >--- files/patch-Makefile 19 Apr 2008 17:47:34 -0000 1.3 >+++ files/patch-Makefile 8 Oct 2009 13:52:40 -0000 >@@ -1,5 +1,5 @@ >---- Makefile.orig Mon Feb 7 03:11:34 2005 >-+++ Makefile Mon Dec 11 16:30:57 2006 >+--- 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. > # >@@ -45,7 +45,7 @@ > 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\" >++ -DLOCALE_SJIS=\"ja_JP.SJIS\" -DLOCALE_EUC=\"ja_JP.EUC\" > +.else > JAPAN= > +.endif >@@ -68,7 +68,7 @@ > -DSTDLIBMALLOC > OBSD_C = -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\ > -DNO_MOTIF -DSTDLIBMALLOC >-@@ -219,10 +223,10 @@ >+@@ -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 >@@ -76,14 +76,14 @@ > -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 -lSM -lXm -lXt -lX11 -lXpm -lc -lXext -lSM -lICE -lX11 >++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 >-@@ -287,7 +291,7 @@ >+@@ -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)" >@@ -92,7 +92,7 @@ > @echo " make openbsd OpenBSD" > @echo " make svr4 SVR4 Using gcc" > @echo " make news4 Sony NEWS-OS4.x" >-@@ -525,7 +529,7 @@ >+@@ -542,7 +546,7 @@ > $(CCLINE) -c -DLIB=\"$(LIB)\" $< > > holiday.o: holiday.c $(MAKEFILE) >@@ -101,16 +101,16 @@ > > util.o: util.c $(MAKEFILE) > $(CCLINE) -c -DPATH=\"$(LIB):$(DIR):$(HELP)\" $< >-@@ -600,10 +604,10 @@ >- LIST = README HISTORY holiday/* language/* misc/* src/resources.h.bigfonts web/* >+@@ -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 = -I/usr/X11R6/include -D_POSIX_SOURCE -DNOLOCK -DLINUX >-+gCF = -I$(LOCALBASE)/include -D_POSIX_SOURCE -DNOLOCK -DLINUX >- gL1F = -L$(LDIR) -lSM $(LDIR)/libXm.a -lXt -lX11 $(LDIR)/libXpm.a -lc -lXext -lSM -lICE -lXp -lX11 >+-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 >- >+ >Index: files/patch-aa >=================================================================== >RCS file: files/patch-aa >diff -N files/patch-aa >--- files/patch-aa 23 Mar 2003 23:23:59 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,14 +0,0 @@ >---- 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> >Index: files/patch-ag >=================================================================== >RCS file: files/patch-ag >diff -N files/patch-ag >--- files/patch-ag 19 Jun 1999 09:29:06 -0000 1.4 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,11 +0,0 @@ >---- sublist.c.orig Sun May 2 12:23:15 1999 >-+++ sublist.c Thu Jun 17 13:09:05 1999 >-@@ -23,7 +23,7 @@ >- #define regcmp re_comp >- #define regex re_exec >- #endif >--#if defined(linux) || defined(__EMX__) >-+#if defined(linux) || defined(__EMX__) || defined(POSIX_REGEX) >- #define regcmp regcomp >- #define regex regexec >- #endif >Index: files/patch-servmenu.c >=================================================================== >RCS file: files/patch-servmenu.c >diff -N files/patch-servmenu.c >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ files/patch-servmenu.c 8 Oct 2009 13:52:40 -0000 >@@ -0,0 +1,11 @@ >+--- servmenu.c.orig 2005-05-18 16:01:40.000000000 -0300 >++++ servmenu.c 2009-10-05 22:16:45.000000000 -0300 >+@@ -8,7 +8,7 @@ >+ >+ #include <stdio.h> >+ #include <time.h> >+-#ifndef MACOSX >++#ifndef STDLIBMALLOC >+ #include <malloc.h> >+ #else >+ #include <stdlib.h> >Index: files/patch-sublist.c >=================================================================== >RCS file: files/patch-sublist.c >diff -N files/patch-sublist.c >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ files/patch-sublist.c 8 Oct 2009 13:52:40 -0000 >@@ -0,0 +1,11 @@ >+--- sublist.c.orig Sun May 2 12:23:15 1999 >++++ sublist.c Thu Jun 17 13:09:05 1999 >+@@ -23,7 +23,7 @@ >+ #define regcmp re_comp >+ #define regex re_exec >+ #endif >+-#if defined(linux) || defined(__EMX__) >++#if defined(linux) || defined(__EMX__) || defined(POSIX_REGEX) >+ #define regcmp regcomp >+ #define regex regexec >+ #endif
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 139430
: 100176