summaryrefslogtreecommitdiff
path: root/lang/o2c
diff options
context:
space:
mode:
authorThomas Gellekum <tg@FreeBSD.org>1998-06-16 12:49:03 +0000
committerThomas Gellekum <tg@FreeBSD.org>1998-06-16 12:49:03 +0000
commit361aebb6d74b525e7f65da0ee299cfdfb6225d2b (patch)
tree1f7e5dffa7191ffcd1fb10b89ff7cf9f744c0861 /lang/o2c
parentUm, you can't install a file to a user's home directory (which is most (diff)
Don't install files into the user's home directory.
Notes
Notes: svn path=/head/; revision=11451
Diffstat (limited to 'lang/o2c')
-rw-r--r--lang/o2c/Makefile8
-rw-r--r--lang/o2c/files/patch-aa20
-rw-r--r--lang/o2c/pkg-message4
-rw-r--r--lang/o2c/pkg-plist1
4 files changed, 23 insertions, 10 deletions
diff --git a/lang/o2c/Makefile b/lang/o2c/Makefile
index bca6d9192995..b4feee956c76 100644
--- a/lang/o2c/Makefile
+++ b/lang/o2c/Makefile
@@ -3,7 +3,7 @@
# Date created: December 3, 1997
# Whom: Oliver Breuninger <ob@seicom.NET>
#
-# $Id: Makefile,v 1.1.1.1 1998/06/12 12:08:08 tg Exp $
+# $Id: Makefile,v 1.2 1998/06/16 12:06:13 asami Exp $
DISTNAME= o2c-1.16
CATEGORIES= lang
@@ -12,8 +12,6 @@ MASTER_SITES= ftp://ftp.uni-kl.de/pub/informatik/software/ \
MAINTAINER= ob@seicom.NET
-BROKEN= attempts to install file to home directory
-
MAKE_ENV= MAKEOBJDIR=.
MAN1= o2b.1 o2c.1 o2ef.1 o2whereis.1
@@ -24,4 +22,8 @@ post-extract:
post-patch:
@/usr/bin/perl -pi -e "s|@PREFIX@|${PREFIX}|g;" ${WRKSRC}/system/o2c.red.template
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/system/o2c.red.template ${PREFIX}/lib/o2c-1.16
+ @${CAT} ${PKGDIR}/MESSAGE
+
.include <bsd.port.mk>
diff --git a/lang/o2c/files/patch-aa b/lang/o2c/files/patch-aa
index 24c0732a3dee..f63ba0f5dc4e 100644
--- a/lang/o2c/files/patch-aa
+++ b/lang/o2c/files/patch-aa
@@ -1,6 +1,7 @@
--- Makefile.orig Fri Mar 28 13:15:40 1997
-+++ Makefile Wed Dec 3 17:21:31 1997
-@@ -5,8 +5,7 @@
++++ Makefile Tue Jun 16 14:28:16 1998
+@@ -4,10 +4,9 @@
+ # in "compiler/OMachine.Mod" accordingly.
# where to install the binaries?
-BIN = $(HOME)/bin
@@ -12,17 +13,24 @@
+LIBPATH = ${PREFIX}/lib/o2c-1.16
# you shouldn't have to change anything below
-@@ -29,5 +28,5 @@
+
+@@ -28,7 +27,7 @@
+ fi
-rm -f o2c_stage0 o2c_stage1 o2c_stage2 o2c all
# check the hardcoded type sizes against the C types
- gcc -o sizes system/sizes.c
+ gcc -o sizes system/sizes.c -Isystem
./sizes
# build compiler executable from the distributed C sources
-@@ -63,5 +62,11 @@
+ $(MAKE) -f makefile_o2c CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' build
+@@ -62,26 +61,31 @@
+ ./o2c -MORv --redir system/o2c.red.template UpdateLib
mv o2c o2c_stage2
-install: all
+- if [ ! -f $(HOME)/.o2c.red ]; then \
+- cp system/o2c.red.template $(HOME)/.o2c.red; \
+- fi
+install.man:
+ for i in $(COMMANDS) ; do \
+ cp docs/$$i.1 $(MANPATH)/man1/$$i.1 ; \
@@ -30,9 +38,6 @@
+ done
+
+install: all install.man
- if [ ! -f $(HOME)/.o2c.red ]; then \
- cp system/o2c.red.template $(HOME)/.o2c.red; \
-@@ -69,18 +74,20 @@
chmod -R ugo+rX *
-rm -f o2c
- ln o2c_stage2 o2c
@@ -61,3 +66,4 @@
+ -rm -f sizes
-rm -f o2c_stage0 o2c_stage1 o2c_stage2 o2c all UpdateLib
-rm -rf obj.distrib
+ -for i in $(COMMANDS) UpdateLib ; do rm -f $$i obj/_$$i.[co] ; done
diff --git a/lang/o2c/pkg-message b/lang/o2c/pkg-message
new file mode 100644
index 000000000000..5a11ae8dfb1c
--- /dev/null
+++ b/lang/o2c/pkg-message
@@ -0,0 +1,4 @@
+
+You may want to install /usr/local/lib/o2c-1.16/o2c.red.template
+as .o2c.red into your home directory.
+
diff --git a/lang/o2c/pkg-plist b/lang/o2c/pkg-plist
index 6922b6f4dd4e..2c3b97052004 100644
--- a/lang/o2c/pkg-plist
+++ b/lang/o2c/pkg-plist
@@ -39,6 +39,7 @@ lib/o2c-1.16/X11.Mod
lib/o2c-1.16/Xresource.Mod
lib/o2c-1.16/Xutil.Mod
lib/o2c-1.16/XYplane.Mod
+lib/o2c-1.16/o2c.red.template
man/man1/o2b.1.gz
man/man1/o2c.1.gz
man/man1/o2ef.1.gz