From owner-freebsd-ports Sun Oct 25 19:10:06 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id TAA16414 for freebsd-ports-outgoing; Sun, 25 Oct 1998 19:10:06 -0800 (PST) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id TAA16406 for ; Sun, 25 Oct 1998 19:10:04 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id TAA09832; Sun, 25 Oct 1998 19:10:00 -0800 (PST) Received: (from nobody@localhost) by hub.freebsd.org (8.8.8/8.8.8) id TAA16261; Sun, 25 Oct 1998 19:08:58 -0800 (PST) (envelope-from nobody) Message-Id: <199810260308.TAA16261@hub.freebsd.org> Date: Sun, 25 Oct 1998 19:08:58 -0800 (PST) From: deischen@iworks.InterWorks.org To: freebsd-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: www-1.0 Subject: ports/8449: Upgrade of plan port to 1.7.2 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 8449 >Category: ports >Synopsis: Upgrade of plan port to 1.7.2 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Oct 25 19:10:00 PST 1998 >Last-Modified: >Originator: Dan Eischen >Organization: >Release: 3.0-current >Environment: FreeBSD rigel 3.0-BETA FreeBSD 3.0-BETA #2: Sun Oct 18 13:45:32 EDT 1998 deischen@rigel:/opt/b/src/src/sys/compile/rigel i386 >Description: This is an upgrade of the plan port from version 1.7.1 to 1.7.2. Minor diffs only. >How-To-Repeat: Trying to make the current (1.7.1) port fails because the plan-1.7.1 tarball is no longer available. >Fix: Apply patch: diff -cr plan.orig/Makefile plan/Makefile *** plan.orig/Makefile Sun Oct 25 17:22:26 1998 --- plan/Makefile Sun Oct 25 17:57:54 1998 *************** *** 1,5 **** # New ports collection makefile for: plan ! # Version required: 1.7.1 # Date created: 14 April 1996 # Whom: Daniel Eischen # --- 1,5 ---- # New ports collection makefile for: plan ! # Version required: 1.7.2 # Date created: 14 April 1996 # Whom: Daniel Eischen # *************** *** 8,14 **** # Also update ports/japanese/plan/ (ja-plan) when this port is updated ! DISTNAME= plan-1.7.1 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_XCONTRIB} \ ftp://ftp.fu-berlin.de/pub/unix/graphics/plan/ --- 8,14 ---- # Also update ports/japanese/plan/ (ja-plan) when this port is updated ! DISTNAME= plan-1.7.2 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_XCONTRIB} \ ftp://ftp.fu-berlin.de/pub/unix/graphics/plan/ *************** *** 17,23 **** MAINTAINER= deischen@iworks.InterWorks.org REQUIRES_MOTIF= yes ! WRKSRC= ${WRKDIR}/${DISTNAME}/src ALL_TARGET= freebsd MAN1= netplan.1 plan.1 MAN4= plan.4 --- 17,23 ---- MAINTAINER= deischen@iworks.InterWorks.org REQUIRES_MOTIF= yes ! WRKSRC= ${WRKDIR}/src ALL_TARGET= freebsd MAN1= netplan.1 plan.1 MAN4= plan.4 diff -cr plan.orig/files/md5 plan/files/md5 *** plan.orig/files/md5 Sun Oct 25 17:22:26 1998 --- plan/files/md5 Sun Oct 25 17:26:26 1998 *************** *** 1 **** ! MD5 (plan-1.7.1.tar.gz) = c296b4b1aa34b9acab7e17d88c00f0be --- 1 ---- ! MD5 (plan-1.7.2.tar.gz) = 0dac73da57e85d101d6060cb222a938f diff -cr plan.orig/patches/patch-ab plan/patches/patch-ab *** plan.orig/patches/patch-ab Sun Oct 25 17:22:26 1998 --- plan/patches/patch-ab Sun Oct 25 17:49:02 1998 *************** *** 1,5 **** ! *** Makefile.orig Sun Feb 22 02:53:33 1998 ! --- Makefile Sun Mar 22 00:04:06 1998 *************** *** 6,34 **** # DO NOT put a blank between the path and the #, or you'll get compile errors. --- 1,5 ---- ! *** Makefile.orig Sat May 9 16:21:09 1998 ! --- Makefile Sun Oct 25 17:48:20 1998 *************** *** 6,34 **** # DO NOT put a blank between the path and the #, or you'll get compile errors. *************** *** 37,49 **** ! DOCBASE = $(PREFIX)/share/doc/plan# ! ! ! DIR = $(PREFIX)/bin# # user-callable executable (plan) ! ! LIB = $(PREFIX)/share# # auxiliary programs (pland, notifier, netplan) ! ! EXAMPLES = $(DOCBASE)/examples# # Example holiday files ! ! DOCS = $(DOCBASE)# # doc files ! ! HELP = $(DOCBASE)# # help file (plan.help) ! ! #MAN = /usr/man/local/man# # unformatted nroff manpage (plan.[14]) ! ! MAN = $(PREFIX)/man/man# # for linux and freebsd NETPLANDIR = $(LIB)# # netplan expects netplan.dir/ here # NETPLANDIR = "/var/lib/plan"# # use this for Debian Linux CATMAN = /usr/catman/local/cat# # formatted manpage (plan.[14]) --- 37,49 ---- ! DOCBASE = $(PREFIX)/share/doc/plan# ! ! ! DIR = $(PREFIX)/bin# # user-callable executable (plan) ! ! LIB = $(PREFIX)/share# # auxiliary programs (pland, notifier, netplan) ! ! EXAMPLES = $(DOCBASE)/examples# # Example holiday files ! ! DOCS = $(DOCBASE)# # doc files ! ! HELP = $(DOCBASE)# # help file (plan.help) ! ! #MAN = /usr/man/local/man# # unformatted nroff manpage (plan.[14]) ! ! MAN = $(PREFIX)/man/man# # for linux and freebsd NETPLANDIR = $(LIB)# # netplan expects netplan.dir/ here # NETPLANDIR = "/var/lib/plan"# # use this for Debian Linux CATMAN = /usr/catman/local/cat# # formatted manpage (plan.[14]) *************** *** 59,65 **** # JAPAN # uncomment this for Japanese version of plan ! .if defined(JAPANESE) ! JAPAN = -DJAPAN -DESCTOASCII=$(ESCTOJISLATIN) -DLENTOASCII=3 \ ! ! -DLOCALE_SJIS=\"ja_JP.SJIS\" -DLOCALE_EUC=\"ja_JP.EUC\" ! .endif # # JAPAN requires X11R5 and a Japanese env. --- 59,65 ---- # JAPAN # uncomment this for Japanese version of plan ! .if defined(JAPANESE) ! JAPAN = -DJAPAN -DESCTOASCII=$(ESCTOJISLATIN) -DLENTOASCII=3 \ ! ! -DLOCALE_SJIS=\"ja_JP.SJIS\" -DLOCALE_EUC=\"ja_JP.EUC\" ! .endif # # JAPAN requires X11R5 and a Japanese env. *************** *** 68,93 **** #DEBUG = *************** ! *** 115,121 **** ! BSDIG_C = -DBSD -DRABBITS -I/usr/X11/include -DFLOCK -DNOREGEX -Dbsdi -ansi ! NBSD_C = -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\ ! -DNO_MOTIF ! ! FBSD_C = -ansi -I/usr/X11R6/include -DBSD -DNOLOCK -DNOREGEX -DRABBITS\ ! -DSTDLIBMALLOC ! LINUX_C = -I/usr/X11R6/include -D_POSIX_SOURCE -DNOLOCK -DLINUX ! SVR4_C = -DSVR4 -DSYSV -DOLDTZ -DUSERAND -DPID_T=long -DNOMSEP ! --- 121,129 ---- ! BSDIG_C = -DBSD -DRABBITS -I/usr/X11/include -DFLOCK -DNOREGEX -Dbsdi -ansi ! NBSD_C = -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\ ! -DNO_MOTIF ! ! FBSD_C = $(CFLAGS) -ansi -I$(X11BASE)/include -DBSD -DFLOCK -DPOSIX_REGEX -DRABBITS\ ! ! -DSTDLIBMALLOC ! ! OBSD_C = $(CFLAGS) -ansi -I$(X11BASE)/include -DBSD -DFLOCK -DPOSIX_REGEX -DRABBITS\ ! -DSTDLIBMALLOC ! LINUX_C = -I/usr/X11R6/include -D_POSIX_SOURCE -DNOLOCK -DLINUX ! SVR4_C = -DSVR4 -DSYSV -DOLDTZ -DUSERAND -DPID_T=long -DNOMSEP ! *************** ! *** 195,202 **** BSDIG_L2= -L/usr/X11/lib -lc NBSD_L1 = -L/usr/X11R6/lib -lXm -lXt -lX11 NBSD_L2 = -L/usr/X11R6/lib -lc --- 68,74 ---- #DEBUG = *************** ! *** 197,204 **** BSDIG_L2= -L/usr/X11/lib -lc NBSD_L1 = -L/usr/X11R6/lib -lXm -lXt -lX11 NBSD_L2 = -L/usr/X11R6/lib -lc *************** *** 95,125 **** ! FBSD_L2 = -L/usr/X11R6/lib -lc LINUX_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lSM -lXm -lXt -lX11 -lXpm -lc -lXext -lSM -lICE -lX11 LINUX_L2= -lc ! SVR4_L1 = -lXm -lXt -lX11 -lgen -lsocket -lnsl --- 203,212 ---- BSDIG_L2= -L/usr/X11/lib -lc NBSD_L1 = -L/usr/X11R6/lib -lXm -lXt -lX11 NBSD_L2 = -L/usr/X11R6/lib -lc ! ! FBSD_L1 = -L$(X11BASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext -lc ! ! FBSD_L2 = -lc ! ! OBSD_L1 = -L$(X11BASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext -lc ! ! OBSD_L2 = -lc LINUX_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lSM -lXm -lXt -lX11 -lXpm -lc -lXext -lSM -lICE -lX11 LINUX_L2= -lc ! SVR4_L1 = -lXm -lXt -lX11 -lgen -lsocket -lnsl *************** ! *** 259,264 **** ! --- 269,275 ---- @echo " make bsdig BSDI/386 with gcc" @echo " make netbsd NetBSD/i386 1.0A (maybe others too)" - @echo " make freebsd FreeBSD 2.x" + @echo " make openbsd OpenBSD 2.x" @echo " make svr4 SVR4 Using gcc" @echo " make news4 Sony NEWS-OS4.x" - @echo " make news4g Sony NEWS-OS4.x with gcc" *************** ! *** 386,391 **** ! --- 397,405 ---- freebsd: env CF="$(FBSD_C)" L1F="$(FBSD_L1)" L2F="$(FBSD_L2)" MYCC=${CC} make all --- 76,106 ---- ! FBSD_L2 = -L/usr/X11R6/lib -lc 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 --- 203,212 ---- BSDIG_L2= -L/usr/X11/lib -lc NBSD_L1 = -L/usr/X11R6/lib -lXm -lXt -lX11 NBSD_L2 = -L/usr/X11R6/lib -lc ! ! FBSD_L1 = -L$(X11BASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext -lc ! ! FBSD_L2 = -lc ! ! OBSD_L1 = -L$(X11BASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext -lc ! ! OBSD_L2 = -lc 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 *************** ! *** 263,268 **** ! --- 271,277 ---- ! @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 2.x" + @echo " make freebsd FreeBSD 2.x" @echo " make svr4 SVR4 Using gcc" @echo " make news4 Sony NEWS-OS4.x" *************** ! *** 391,396 **** ! --- 400,408 ---- freebsd: env CF="$(FBSD_C)" L1F="$(FBSD_L1)" L2F="$(FBSD_L2)" MYCC=${CC} make all *************** *** 130,136 **** env CF="$(SVR4_C)" L1F="$(SVR4_L1)" L2F="$(SVR4_L2)" MYCC=gcc make all *************** ! *** 489,495 **** $(MYCC) $(DEBUG) $(CF) $(JAPAN) $(INCDIR) -c -DLIB=\"$(LIB)\" $< holiday.o: holiday.c $(MAKEFILE) --- 111,117 ---- env CF="$(SVR4_C)" L1F="$(SVR4_L1)" L2F="$(SVR4_L2)" MYCC=gcc make all *************** ! *** 497,503 **** $(MYCC) $(DEBUG) $(CF) $(JAPAN) $(INCDIR) -c -DLIB=\"$(LIB)\" $< holiday.o: holiday.c $(MAKEFILE) *************** *** 138,144 **** util.o: util.c $(MAKEFILE) $(MYCC) $(DEBUG) $(CF) $(JAPAN) $(INCDIR) -c -DPATH=\"$(LIB):$(DIR):$(HELP)\" $< ! --- 503,509 ---- $(MYCC) $(DEBUG) $(CF) $(JAPAN) $(INCDIR) -c -DLIB=\"$(LIB)\" $< holiday.o: holiday.c $(MAKEFILE) --- 119,125 ---- util.o: util.c $(MAKEFILE) $(MYCC) $(DEBUG) $(CF) $(JAPAN) $(INCDIR) -c -DPATH=\"$(LIB):$(DIR):$(HELP)\" $< ! --- 509,515 ---- $(MYCC) $(DEBUG) $(CF) $(JAPAN) $(INCDIR) -c -DLIB=\"$(LIB)\" $< holiday.o: holiday.c $(MAKEFILE) *************** *** 147,165 **** util.o: util.c $(MAKEFILE) $(MYCC) $(DEBUG) $(CF) $(JAPAN) $(INCDIR) -c -DPATH=\"$(LIB):$(DIR):$(HELP)\" $< *************** ! *** 520,550 **** #--------------------------------------------------------------- install: ! cp plan $(DIR) ! -rm -f $(DIR)/pland $(DIR)/notifier ! cp pland notifier netplan ../misc/plan_cal.ps $(LIB) ! ! -(test x$(JAPAN) != x && cp ../misc/plan_calSJ.ps $(LIB)) || exit 0 ! cp ../misc/plan.help $(HELP) ! -strip $(DIR)/plan $(LIB)/pland $(LIB)/notifier $(LIB)/netplan ! -chmod 755 $(DIR)/plan $(LIB)/pland $(LIB)/notifier $(LIB)/netplan ! -chmod 644 $(HELP)/plan.help $(LIB)/plan_cal.ps ! ! -(test x$(JAPAN) != x && chmod 644 $(LIB)/plan_calSJ.ps) || exit 0 -mkdir $(LIB)/netplan.dir -chmod 700 $(LIB)/netplan.dir - -(test -x `which nroff` && nroff -man ../misc/plan.1 >../misc/plan.1cat) || exit 0 --- 128,146 ---- util.o: util.c $(MAKEFILE) $(MYCC) $(DEBUG) $(CF) $(JAPAN) $(INCDIR) -c -DPATH=\"$(LIB):$(DIR):$(HELP)\" $< *************** ! *** 528,558 **** #--------------------------------------------------------------- install: ! cp plan $(DIR) ! -rm -f $(DIR)/pland $(DIR)/notifier ! cp pland notifier netplan ../misc/plan_cal.ps $(LIB) ! ! -(test x'$(JAPAN)' != x && cp ../misc/plan_calSJ.ps $(LIB)) || exit 0 ! cp ../misc/plan.help $(HELP) ! -strip $(DIR)/plan $(LIB)/pland $(LIB)/notifier $(LIB)/netplan ! -chmod 755 $(DIR)/plan $(LIB)/pland $(LIB)/notifier $(LIB)/netplan ! -chmod 644 $(HELP)/plan.help $(LIB)/plan_cal.ps ! ! -(test x'$(JAPAN)' != x && chmod 644 $(LIB)/plan_calSJ.ps) || exit 0 -mkdir $(LIB)/netplan.dir -chmod 700 $(LIB)/netplan.dir - -(test -x `which nroff` && nroff -man ../misc/plan.1 >../misc/plan.1cat) || exit 0 *************** *** 179,185 **** clean: -rm -f *.o ! --- 534,557 ---- #--------------------------------------------------------------- install: --- 160,166 ---- clean: -rm -f *.o ! --- 540,563 ---- #--------------------------------------------------------------- install: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message