head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.54 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.52 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.50 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.48 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.46 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.44 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.42 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.40 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.38 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.36 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.34 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.32 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.30 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.28 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.26 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.24 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.22 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.20 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.18 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.16 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.14 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.12 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.10 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.8 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.6 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.4 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 buildlink2-base:1.3 netbsd-1-3-PATCH003:1.1; locks; strict; comment @# @; 1.3 date 99.01.29.19.48.35; author tron; state dead; branches; next 1.2; 1.2 date 98.11.12.14.53.31; author agc; state Exp; branches; next 1.1; 1.1 date 98.09.04.08.09.53; author frueauf; state Exp; branches; next ; desc @@ 1.3 log @Move plan to category misc per PR pkg/6909 by Klaus Klein. @ text @$NetBSD: patch-aa,v 1.2 1998/11/12 14:53:31 agc Exp $ --- Makefile.orig Sat May 9 22:21:09 1998 +++ Makefile Thu Sep 3 23:15:04 1998 @@@@ -6,18 +6,18 @@@@ # DO NOT put a blank between the path and the #, or you'll get compile errors. # -DIR = /usr/local/bin# # user-callable executable (plan) -LIB = /usr/local/lib# # auxiliary programs (pland, notifier, netplan) -HELP = $(LIB)# # help file (plan.help) +DIR = ${X11BASE}/bin# # user-callable executable (plan) +LIB = ${X11BASE}/libexec/plan# # auxiliary programs (pland, notifier, netplan) +HELP = ${X11BASE}/share/plan# # help file (plan.help) NETPLANDIR = $(LIB)# # netplan expects netplan.dir/ here # NETPLANDIR = "/var/lib/plan"# # use this for Debian Linux -MAN = /usr/man/local/man# # unformatted nroff manpage (plan.[14]) +MAN = ${X11BASE}/man/man# # unformatted nroff manpage (plan.[14]) # MAN = /usr/local/man/man# # for linux -CATMAN = /usr/catman/local/cat# # formatted manpage (plan.[14]) +CATMAN = ${X11BASE}/cat/cat# # formatted manpage (plan.[14]) INCDIR =# # extra cc options, e.g. "-I/var/include" -NOB_UID = 60001# # numerical user ID of account -NOB_GID = 60001# # default numerical group ID of account -CPP_PATH="/lib/cpp -P -I$(HELP)"# used by plan to pre-process holiday files, +NOB_UID = 39# # numerical user ID of account +NOB_GID = 39# # default numerical group ID of account +CPP_PATH="/usr/bin/cpp -P -I$(HELP)"# used by plan to pre-process holiday files, # # plan will check if this file really exists ESCTOISOLATIN=\"\\033\(B\"# # switching to ISO8859-1 ESCTOJISLATIN=\"\\033\(J\"# # switching to JIS X0201-1976 roman @@@@ -28,7 +28,7 @@@@ # -DLOCALE_SJIS=\"ja_JP.SJIS\" -DLOCALE_EUC=\"ja_JP.EUC\" # # JAPAN requires X11R5 and a Japanese env. -DEBUG = -g +#DEBUG = -g #DEBUG = -O2# # do NOT define -O2 on DEC OSF/1 machines! #DEBUG = @@@@ -113,8 +113,7 @@@@ USL_C = -DNOKILL0 -I/usr/X/include BSDI_C = -DBSD -DRABBITS -I/usr/X11/include -DFLOCK -DNOREGEX -Dbsdi 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 +NBSD_C = ${CFLAGS} -ansi -I${X11BASE}/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX FBSD_C = -ansi -I/usr/X11R6/include -DBSD -DNOLOCK -DNOREGEX -DRABBITS\ -DSTDLIBMALLOC LINUX_C = -I/usr/X11R6/include -D_POSIX_SOURCE -DNOLOCK -DLINUX @@@@ -195,8 +194,8 @@@@ BSDI_L2 = -lc BSDIG_L1= -L/usr/X11/lib -lXm -lXt -lX11 BSDIG_L2= -L/usr/X11/lib -lc -NBSD_L1 = -L/usr/X11R6/lib -lXm -lXt -lX11 -NBSD_L2 = -L/usr/X11R6/lib -lc +NBSD_L1 = -L${X11BASE}/lib -lXm -lXt -lX11 +NBSD_L2 = -L${X11BASE}/lib -lc FBSD_L1 = -L/usr/X11R6/lib -lXm -lXt -lX11 -lXext 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 @@@@ -528,31 +527,19 @@@@ #--------------------------------------------------------------- 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 + ${BSD_INSTALL_PROGRAM} plan $(DIR) + ${BSD_INSTALL_PROGRAM} pland notifier netplan $(LIB) + ${BSD_INSTALL_DATA} ../misc/plan_cal.ps $(LIB) + ${BSD_INSTALL_DATA} ../misc/plan.help $(HELP) -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 + -mkdir -p $(LIB)/netplan.dir -chmod 700 $(LIB)/netplan.dir - -(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 -f ${HOME}/.holiday || cp ../holiday/holiday_german ${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 + -(test -d $(MAN)1 && ${BSD_INSTALL_MAN} ../misc/plan.1 $(MAN)1/plan.1) || exit 0 + -(test -d $(MAN)4 && ${BSD_INSTALL_MAN} ../misc/plan.4 $(MAN)4/plan.4) || exit 0 + -(test -d $(MAN)1 && ${BSD_INSTALL_MAN} ../misc/netplan.1 $(MAN)1/netplan.1) || exit 0 @@echo "" - @@echo "use ../holiday/* as templates for your ~/.holiday file" + @@echo "Use " ${X11BASE}"/share/plan/holiday/* as templates for your ~/.holiday file." clean: -rm -f *.o @ 1.2 log @Add missing NetBSD RCS Id. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Initial addition of plan-1.7.2, a schedule planner based on X/Motif. @ text @d1 2 @