Date: Wed, 7 Jul 1999 18:03:22 -0700 (PDT) From: cschuber@uumail.gov.bc.ca To: FreeBSD-gnats-submit@freebsd.org Subject: ports/12558: New Plan Port Message-ID: <199907080103.SAA27030@cwsys.cwsent.com>
next in thread | raw e-mail | index | archive | help
>Number: 12558
>Category: ports
>Synopsis: new plan port
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Jul 7 18:10:01 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator: Cy Schubert
>Release: FreeBSD 3.2-RELEASE i386
>Organization:
ITSD Province of BC
>Environment:
FreeBSD cwsys 3.2-RELEASE FreeBSD 3.2-RELEASE #0: Tue Jun 1 23:15:34 PDT 1999 root@cwsys:/opt2/cvs-320/src/sys/compile/CWSYS i386
>Description:
Please apply the following patch to the plan port to upgrade
to plan-1.8.2.
>How-To-Repeat:
n/a
>Fix:
diff -urPN --exclude=CVS --exclude=00_TRANS.TBL /usr/ports/deskutils/plan/Makefile /usr/local/ports-local/plan-990707/Makefile
--- /usr/ports/deskutils/plan/Makefile Sat Jun 19 07:18:49 1999
+++ /usr/local/ports-local/plan-990707/Makefile Wed Jul 7 14:55:00 1999
@@ -1,13 +1,14 @@
# New ports collection makefile for: plan
-# Version required: 1.8.1
+# Version required: 1.7.2
# Date created: 14 April 1996
# Whom: Daniel Eischen <deischen@iworks.InterWorks.org>
#
-# $Id: Makefile,v 1.15 1999/06/19 09:28:47 cpiazza Exp $
+# $Id: Makefile,v 1.14 1998/11/02 03:57:44 steve Exp $
#
+
# Also update ports/japanese/plan/ (ja-plan) when this port is updated
-DISTNAME= plan-1.8.1
+DISTNAME= plan-1.8.2
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
ftp://ftp.fu-berlin.de/pub/unix/graphics/plan/
@@ -16,7 +17,7 @@
MAINTAINER= deischen@iworks.InterWorks.org
REQUIRES_MOTIF= yes
-WRKSRC= ${WRKDIR}/plan-1.8.1/src
+WRKSRC= ${WRKDIR}/plan-1.8.2/src
ALL_TARGET= freebsd
MAN1= netplan.1 plan.1
MAN4= plan.4
diff -urPN --exclude=CVS --exclude=00_TRANS.TBL /usr/ports/deskutils/plan/files/md5 /usr/local/ports-local/plan-990707/files/md5
--- /usr/ports/deskutils/plan/files/md5 Sat Jun 19 07:18:49 1999
+++ /usr/local/ports-local/plan-990707/files/md5 Wed Jul 7 14:57:06 1999
@@ -1 +1 @@
-MD5 (plan-1.8.1.tar.gz) = 236c51f213b23aa60251cf553a4807b9
+MD5 (plan-1.8.2.tar.gz) = 7070567facebf8b1b5eeb38934fa4ad2
diff -urPN --exclude=CVS --exclude=00_TRANS.TBL /usr/ports/deskutils/plan/patches/patch-ab /usr/local/ports-local/plan-990707/patches/patch-ab
--- /usr/ports/deskutils/plan/patches/patch-ab Sat Jun 19 07:18:49 1999
+++ /usr/local/ports-local/plan-990707/patches/patch-ab Wed Jul 7 15:50:37 1999
@@ -1,5 +1,5 @@
---- Makefile.orig Sat May 22 01:19:06 1999
-+++ Makefile Thu Jun 17 11:41:07 1999
+--- Makefile.orig Wed Jul 7 13:24:27 1999
++++ Makefile Wed Jul 7 15:35:23 1999
@@ -7,16 +7,22 @@
# DO NOT put blanks before and after "=", this is parsed and rewritten by the
# configure script.
@@ -7,7 +7,7 @@
+DOCBASE = $(PREFIX)/share/doc/plan
+#
# # user-callable executable (plan)
--DIR=/usr/local/lib
+-DIR=/usr/local/bin
+DIR=$(PREFIX)/bin
# # auxiliary programs (pland, notifier, netplan)
-LIB=/usr/local/lib
@@ -23,7 +23,7 @@
-NETPLANDIR=/usr/local/lib
+NETPLANDIR=$(LIB)
# # unformatted nroff manpage (plan.[14])
--MAN=/usr/man/local/man
+-MAN=/usr/local/man
+MAN=$(PREFIX)/man/man
# # formatted manpage (plan.[14])
CATMAN=/usr/catman/local/cat
@@ -39,8 +39,8 @@
+NOB_GID=65534
# # used by plan to pre-process holiday files,
# # plan will check if this file really exists
- CPP_PATH="/lib/cpp -P -I$(HELP)"
-@@ -45,6 +51,10 @@
+ CPP_PATH='/lib/cpp -P -I$(HELP)'
+@@ -47,6 +53,10 @@
# # uncomment this for Japanese version of plan
# # JAPAN requires X11R5 and a Japanese env.
JAPANDEFS="-DJAPAN -DESCTOASCII=$(ESCTOJISLATIN) -DLENTOASCII=3 -DLOCALE_SJIS='ja_JP.SJIS' -DLOCALE_EUC='ja_JP.EUC'"
@@ -51,7 +51,7 @@
JAPAN=
# # default holiday locale
HOLIDAY=german
-@@ -218,8 +228,10 @@
+@@ -222,8 +232,10 @@
BSDIG_L2= -L/usr/X11/lib -lc
NBSD_L1 = -L/usr/X11R6/lib -lXm -lXt -lX11
NBSD_L2 = -L/usr/X11R6/lib -lc
@@ -64,7 +64,7 @@
LINUX_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lSM -lXm -lXt -lX11 -lXpm -lc -lXext -lSM -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
-@@ -285,7 +297,8 @@
+@@ -291,7 +303,8 @@
@echo " make bsdi BSDI/386"
@echo " make bsdig BSDI/386 with gcc"
@echo " make netbsd NetBSD/i386 1.0A (maybe others too)"
@@ -74,7 +74,7 @@
@echo " make svr4 SVR4 Using gcc"
@echo " make news4 Sony NEWS-OS4.x"
@echo " make news4g Sony NEWS-OS4.x with gcc"
-@@ -414,6 +427,9 @@
+@@ -421,6 +434,9 @@
freebsd:
env CF="$(FBSD_C)" L1F="$(FBSD_L1)" L2F="$(FBSD_L2)" MYCC=${CC} make all
@@ -84,7 +84,7 @@
svr4:
env CF="$(SVR4_C)" L1F="$(SVR4_L1)" L2F="$(SVR4_L2)" MYCC=gcc make all
-@@ -522,7 +538,7 @@
+@@ -533,7 +549,7 @@
$(MYCC) $(OPT) $(CF) $(JAPAN) $(INCDIR) -c -DLIB=\"$(LIB)\" $<
holiday.o: holiday.c $(MAKEFILE)
@@ -93,7 +93,7 @@
util.o: util.c $(MAKEFILE)
$(MYCC) $(OPT) $(CF) $(JAPAN) $(INCDIR) -c -DPATH=\"$(LIB):$(DIR):$(HELP)\" $<
-@@ -553,31 +569,25 @@
+@@ -564,31 +580,25 @@
#---------------------------------------------------------------
install:
@@ -108,7 +108,7 @@
- -(test x'$(JAPAN)' != x && chmod 644 $(LIB)/plan_calSJ.ps) || exit 0
+ ${INSTALL} -d $(DOCBASE)
+ ${INSTALL} -d $(EXAMPLES)
-+ ${BSD_INSTALL_PROGRAM} pland $(DIR)
++ ${BSD_INSTALL_PROGRAM} pland $(DIR)
+ ${BSD_INSTALL_PROGRAM} notifier netplan plan $(DIR)
+ ${BSD_INSTALL_SCRIPT} ../misc/Killpland $(DIR)
+ ${BSD_INSTALL_MAN} ../language/plan.help ../misc/plan_cal.ps \
@@ -121,12 +121,15 @@
- -(test -x `which nroff` && nroff -man ../misc/plan.1 >../misc/plan.1cat) || exit 0
- -(test -x `which nroff` && nroff -man ../misc/plan.4 >../misc/plan.4cat) || exit 0
- -(test -x `which nroff` && nroff -man ../misc/netplan.1 >../misc/netplan.1cat) || exit 0
- -(test -d $(MAN)1 && cp ../misc/plan.1 $(MAN)1/plan.1) || exit 0
- -(test -d $(MAN)4 && cp ../misc/plan.4 $(MAN)4/plan.4) || exit 0
- -(test -d $(MAN)1 && cp ../misc/netplan.1 $(MAN)1/netplan.1) || exit 0
-- -(test -d $(CATMAN)1 && cp ../misc/plan.1cat $(CATMAN)1/plan.1) || exit 0
-- -(test -d $(CATMAN)4 && cp ../misc/plan.4cat $(CATMAN)4/plan.4) || exit 0
-- -(test -d $(CATMAN)1 && cp ../misc/netplan.1cat $(CATMAN)1/netplan.1) || exit 0
+- -(test -d $(MAN)1 && cp ../misc/plan.1 $(MAN)1/plan) || exit 0
++ -(test -d $(MAN)1 && cp ../misc/plan.1 $(MAN)1/) || exit 0
+- -(test -d $(MAN)4 && cp ../misc/plan.4 $(MAN)4/plan) || exit 0
++ -(test -d $(MAN)4 && cp ../misc/plan.4 $(MAN)4/) || exit 0
+- -(test -d $(MAN)1 && cp ../misc/netplan.1 $(MAN)1/netplan) || exit 0
++ -(test -d $(MAN)1 && cp ../misc/netplan.1 $(MAN)1/) || exit 0
+- -(test -d $(CATMAN)1 && cp ../misc/plan.1cat $(CATMAN)1/plan) || exit 0
+- -(test -d $(CATMAN)4 && cp ../misc/plan.4cat $(CATMAN)4/plan) || exit 0
+- -(test -d $(CATMAN)1 && cp ../misc/netplan.1cat $(CATMAN)1/netplan) || exit 0
- -(test -f ${HOME}/.holiday || cp ../holiday/holiday_$(HOLIDAY) ${HOME}/.holiday) || exit 0
- -(test `uname` = IRIX -o `uname` = IRIX64 && mkdir $$HOME/.icons) || exit 0
- -(test `uname` = IRIX -o `uname` = IRIX64 && cp ../misc/Plan.icon $$HOME/.icons/Plan.icon) || exit 0
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199907080103.SAA27030>