aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>1998-02-01 13:09:58 +0800
committerobrien <obrien@FreeBSD.org>1998-02-01 13:09:58 +0800
commit9ee5fed4944bb4dbd7ef9292e87b0dcb716a8068 (patch)
tree2bbba0387b34ff223f81a9ed68e2caae05d286f8
parent5de5227736117e4eb6608b8e90df5e795e23b12d (diff)
downloadfreebsd-ports-gnome-9ee5fed4944bb4dbd7ef9292e87b0dcb716a8068.tar.gz
freebsd-ports-gnome-9ee5fed4944bb4dbd7ef9292e87b0dcb716a8068.tar.zst
freebsd-ports-gnome-9ee5fed4944bb4dbd7ef9292e87b0dcb716a8068.zip
Clean up patches.
Use WRKSRC rather than extrainious Makefile.
-rw-r--r--deskutils/plan/Makefile10
-rw-r--r--deskutils/plan/files/patch-ab77
-rw-r--r--deskutils/plan/files/patch-ag30
-rw-r--r--deskutils/plan/pkg-plist5
4 files changed, 67 insertions, 55 deletions
diff --git a/deskutils/plan/Makefile b/deskutils/plan/Makefile
index 451854ed11e5..7f3a022dbdb8 100644
--- a/deskutils/plan/Makefile
+++ b/deskutils/plan/Makefile
@@ -3,18 +3,24 @@
# Date created: 14 April 1996
# Whom: Daniel Eischen <deischen@iworks.InterWorks.org>
#
-# $Id: Makefile,v 1.5 1997/03/11 23:40:08 asami Exp $
+# $Id: Makefile,v 1.6 1997/06/20 13:29:02 tg Exp $
#
DISTNAME= plan-1.6.1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
+MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
+ ftp://ftp.fu-berlin.de/pub/unix/graphics/plan/
MASTER_SITE_SUBDIR= applications
MAINTAINER= deischen@iworks.InterWorks.org
REQUIRES_MOTIF= yes
+WRKSRC= ${WRKDIR}/${DISTNAME}/src
+ALL_TARGET= freebsd
MAN1= netplan.1 plan.1
MAN4= plan.4
+post-install:
+ @${MKDIR} ${PREFIX}/share/netplan.dir
+
.include <bsd.port.mk>
diff --git a/deskutils/plan/files/patch-ab b/deskutils/plan/files/patch-ab
index 9accb6ffb473..33f3dd9eb927 100644
--- a/deskutils/plan/files/patch-ab
+++ b/deskutils/plan/files/patch-ab
@@ -1,6 +1,6 @@
---- src/Makefile.orig Sun Apr 13 21:50:29 1997
-+++ src/Makefile Thu Jun 19 14:11:42 1997
-@@ -6,16 +6,22 @@
+--- Makefile.orig Sun Apr 13 12:50:29 1997
++++ Makefile Sat Jan 31 13:43:03 1998
+@@ -6,29 +6,35 @@
# DO NOT put a blank between the path and the #, or you'll get compile errors.
#
@@ -9,17 +9,15 @@
-HELP = $(LIB)# # help file (plan.help)
-MAN = /usr/man/local/man# # unformatted nroff manpage (plan.[14])
-# MAN = /usr/local/man/man# # for linux
-+PLANBASE = /usr/local#
-+DOCBASE = $(PLANBASE)/share/doc/plan#
-+NETPLAN = $(PLANBASE)/share# # netplan directory
++DOCBASE = $(PREFIX)/share/doc/plan#
+
-+DIR = $(PLANBASE)/bin# # user-callable executable (plan)
-+LIB = $(DIR)# # auxiliary programs (pland, notifier, netplan)
++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 = $(PLANBASE)/man/man# # for linux and freebsd
++MAN = $(PREFIX)/man/man# # for linux and freebsd
CATMAN = /usr/catman/local/cat# # formatted manpage (plan.[14])
INCDIR =# # extra cc options, e.g. "-I/var/include"
-NOB_UID = 60001# # numerical user ID of <nobody> account
@@ -31,8 +29,15 @@
# # plan will check if this file really exists
ESCTOISOLATIN=\"\\033\(B\"# # switching to ISO8859-1
ESCTOJISLATIN=\"\\033\(J\"# # switching to JIS X0201-1976 roman
-@@ -26,9 +32,9 @@
- # -DLOCALE_SJIS=\"ja_JP.SJIS\" -DLOCALE_EUC=\"ja_JP.EUC\"
+ # LENTOASCII # length of ESCTOASCII
+ # LOCALE_SJIS, LOCALE_EUC # locale names for Japanese
+ # JAPAN # uncomment this for Japanese version of plan
+-#JAPAN = -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\"
++.endif
# # JAPAN requires X11R5 and a Japanese env.
-DEBUG = -s
@@ -52,44 +57,51 @@
#
# Note for HP systems: if you have the PROG-AUX option, remove -DNOREGEX
# from HP_C, and add -lPW to HP_L1. On Suns, try removing -DNOREGEX (and
-@@ -105,6 +113,9 @@
+@@ -105,6 +113,10 @@
BSDIG_C = -ansi -I/usr/X11/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX -Dbsdi
NBSD_C = -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\
-DNO_MOTIF
-+FBSD_C = $(CFLAGS) -ansi -I/usr/X11R6/include -DBSD -DFLOCK -DRABBITS -Dfreebsd -DSTDLIBMALLOC
++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
+IBM_C = -O -I/usr/include/X11 -D_ALL_SOURCE -DIBM -DAIXV3 -DNOMSEP -DRABBITS
+PS2_C = -O -I/usr/include/X11 -D_POSIX_SOURCE\
LINUX_C = -D_POSIX_SOURCE -DNOLOCK -DLINUX
SVR4_C = -DSVR4 -DSYSV -DOLDTZ -DUSERAND -DPID_T=long -DNOMSEP
NEWS_C = -DNEWSOS4 -DNOMSEP -DSUN -DBSD -DRABBITS -DPID_T="int" -Dconst=""
-@@ -181,6 +192,8 @@
+@@ -181,6 +193,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_L1 = -L/usr/X11R6/lib ${MOTIFLIB} -lXt -lX11 -lXext -lc
++FBSD_L1 = -L$(X11BASE)/lib ${MOTIFLIB} -lXt -lX11 -lXext -lc
+FBSD_L2 = -lc
++OBSD_L1 = -L$(X11BASE)/lib ${MOTIFLIB} -lXt -lX11 -lXext -lc
++OBSD_L2 = -lc
LINUX_L1= -L/usr/lib/X11R6/lib -lXm -lXt -lX11 -lXpm -lc -lXext
LINUX_L2= -lc
SVR4_L1 = -lXm -lXt -lX11 -lgen -lsocket -lnsl
-@@ -240,6 +253,7 @@
+@@ -240,6 +256,8 @@
@echo " make bsdi BSDI/386"
@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 freebsd FreeBSD
++ @echo " make openbsd OpenBSD
@echo " make svr4 SVR4 Using gcc"
@echo " make news4 Sony NEWS-OS4.x"
@echo " make news4g Sony NEWS-OS4.x with gcc"
-@@ -349,6 +363,9 @@
+@@ -349,6 +367,12 @@
netbsd:
env CF="$(NBSD_C)" L1F="$(NBSD_L1)" L2F="$(NBSD_L2)" MYCC=gcc $(MAKE) all
+freebsd:
-+ env CF="$(FBSD_C)" L1F="$(FBSD_L1)" L2F="$(FBSD_L2)" MYCC=${CC} make all
++ env CF="$(FBSD_C)" L1F="$(FBSD_L1)" L2F="$(FBSD_L2)" MYCC=${CC} $(MAKE) all
++
++openbsd:
++ env CF="$(OBSD_C)" L1F="$(OBSD_L1)" L2F="$(OBSD_L2)" MYCC=${CC} $(MAKE) all
+
svr4:
env CF="$(SVR4_C)" L1F="$(SVR4_L1)" L2F="$(SVR4_L2)" MYCC=gcc make all
-@@ -451,13 +468,13 @@
+@@ -451,13 +475,13 @@
$(MYCC) $(DEBUG) $(CF) $(JAPAN) $(INCDIR) -c -DLIB=\"$(LIB)\" $<
holiday.o: holiday.c Makefile
@@ -105,7 +117,7 @@
# $(MYCC) $(DEBUG) $(CF) -DNOBODY_UID=`grep nobody /etc/passwd | head -1 | awk -F: '{print $$3}'` -DNOBODY_GID=`grep nobody /etc/passwd | head -1 | awk -F: '{print $$4}'` $(INCDIR) -c -DLIB=\"$(LIB)\" $<
parser.c: parser.y
-@@ -480,31 +497,25 @@
+@@ -480,15 +504,15 @@
#---------------------------------------------------------------
install:
@@ -118,20 +130,19 @@
- -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
-- -mkdir $(LIB)/netplan.dir
-- -chmod 777 $(LIB)/netplan.dir
+ ${INSTALL} -d $(DOCBASE)
+ ${INSTALL} -d $(EXAMPLES)
-+ ${INSTALL} -c pland $(DIR)
-+ ${INSTALL} -c -m 755 notifier netplan plan ../misc/Killpland $(LIB)
-+ ${INSTALL} -c -m 644 ../misc/plan.help ../misc/plan_cal.ps \
++ ${BSD_INSTALL_PROGRAM} pland $(DIR)
++ ${BSD_INSTALL_PROGRAM} notifier netplan plan $(DIR)
++ ${BSD_INSTALL_SCRIPT} ../misc/Killpland $(DIR)
++ ${BSD_INSTALL_MAN} ../misc/plan.help ../misc/plan_cal.ps \
+ ../misc/Monochrome ../misc/BlackWhite $(DOCS)
-+ ${INSTALL} -c -m 755 ../misc/Mkdoc ../misc/Mkdoc.nawk $(DOCS)
-+ ${INSTALL} -d $(NETPLAN)/netplan.dir
-+ -chmod 777 $(NETPLAN)/netplan.dir
++ ${BSD_INSTALL_SCRIPT} -c -m 755 ../misc/Mkdoc ../misc/Mkdoc.nawk $(DOCS)
++ -test x$(JAPAN) != x && ${BSD_INSTALL_MAN} ../misc/plan_calSJ.ps $(DOCS)
+ -mkdir $(LIB)/netplan.dir
+ -chmod 777 $(LIB)/netplan.dir
-test -x `which nroff` && nroff -man ../misc/plan.1 >../misc/plan.1cat
- -test -x `which nroff` && nroff -man ../misc/plan.4 >../misc/plan.4cat
- -test -x `which nroff` && nroff -man ../misc/netplan.1 >../misc/netplan.1cat
+@@ -497,14 +521,10 @@
-test -d $(MAN)1 && cp ../misc/plan.1 $(MAN)1/plan.1
-test -d $(MAN)4 && cp ../misc/plan.4 $(MAN)4/plan.4
-test -d $(MAN)1 && cp ../misc/netplan.1 $(MAN)1/netplan.1
@@ -143,8 +154,8 @@
- -test `uname` = IRIX && cp ../misc/Plan.icon $$HOME/.icons/Plan.icon
- @echo ""
- @echo "use ../holiday/* as templates for your ~/.holiday file"
-+ ${INSTALL} -c -m 644 ../README $(DOCBASE)
-+ ${INSTALL} -c -m 644 ../holiday/holiday_* $(EXAMPLES)
++ ${BSD_INSTALL_MAN} ../README $(DOCBASE)
++ ${BSD_INSTALL_DATA} ../holiday/holiday_* $(EXAMPLES)
+ ${ECHO} ""
+ ${ECHO} "Use " $(EXAMPLES)"/holiday/* as templates for your ~/.holiday file"
diff --git a/deskutils/plan/files/patch-ag b/deskutils/plan/files/patch-ag
index 159180dc2c77..0572fbd53c20 100644
--- a/deskutils/plan/files/patch-ag
+++ b/deskutils/plan/files/patch-ag
@@ -1,19 +1,11 @@
-*** src/sublist.c.orig Sun Apr 14 16:38:13 1996
---- src/sublist.c Sun Apr 14 16:38:34 1996
-***************
-*** 23,29 ****
- #define regcmp re_comp
- #define regex re_exec
- #endif
-! #ifdef linux
- #define regcmp regcomp
- #define regex regexec
- #endif
---- 23,29 ----
- #define regcmp re_comp
- #define regex re_exec
- #endif
-! #if defined(linux) || defined(freebsd)
- #define regcmp regcomp
- #define regex regexec
- #endif
+--- sublist.c.orig Sat Oct 19 06:00:32 1996
++++ sublist.c Sat Jan 31 10:55:57 1998
+@@ -23,7 +23,7 @@
+ #define regcmp re_comp
+ #define regex re_exec
+ #endif
+-#ifdef linux
++#if defined(linux) || defined(POSIX_REGEX)
+ #define regcmp regcomp
+ #define regex regexec
+ #endif
diff --git a/deskutils/plan/pkg-plist b/deskutils/plan/pkg-plist
index 42f830b0c117..e77b365f2269 100644
--- a/deskutils/plan/pkg-plist
+++ b/deskutils/plan/pkg-plist
@@ -1,7 +1,7 @@
bin/plan
+bin/pland
bin/netplan
bin/notifier
-bin/pland
bin/Killpland
share/doc/plan/Mkdoc
share/doc/plan/Mkdoc.nawk
@@ -9,8 +9,10 @@ share/doc/plan/plan.help
share/doc/plan/plan_cal.ps
share/doc/plan/examples/holiday_australia
share/doc/plan/examples/holiday_bavarian
+share/doc/plan/examples/holiday_belgium
share/doc/plan/examples/holiday_canada
share/doc/plan/examples/holiday_dutch
+share/doc/plan/examples/holiday_finnish
share/doc/plan/examples/holiday_french
share/doc/plan/examples/holiday_frswiss
share/doc/plan/examples/holiday_german
@@ -27,6 +29,7 @@ share/doc/plan/README
man/man1/netplan.1.gz
man/man1/plan.1.gz
man/man4/plan.4.gz
+@exec /bin/mkdir -p share/netplan.dir
@dirrm share/netplan.dir
@dirrm share/doc/plan/examples
@dirrm share/doc/plan