summaryrefslogtreecommitdiffstats
path: root/devel/amulet
diff options
context:
space:
mode:
authorsteve <steve@FreeBSD.org>1998-10-20 01:34:18 +0000
committersteve <steve@FreeBSD.org>1998-10-20 01:34:18 +0000
commita8f996a1ad6103a519f6870179d7db6563751637 (patch)
treeb537d494928acdff9e8e211721d11918d6ab798c /devel/amulet
parenta4b2f971ba73b7f0b1bdd4d9926bf0714b6acea7 (diff)
downloadFreeBSD-ports-a8f996a1ad6103a519f6870179d7db6563751637.zip
FreeBSD-ports-a8f996a1ad6103a519f6870179d7db6563751637.tar.gz
Convert to ELF.
Diffstat (limited to 'devel/amulet')
-rw-r--r--devel/amulet/Makefile18
-rw-r--r--devel/amulet/files/patch-aa24
-rw-r--r--devel/amulet/pkg-plist10
3 files changed, 37 insertions, 15 deletions
diff --git a/devel/amulet/Makefile b/devel/amulet/Makefile
index 79c3573..ed5183b 100644
--- a/devel/amulet/Makefile
+++ b/devel/amulet/Makefile
@@ -3,7 +3,7 @@
# Date created: 26 July 1997
# Whom: Filip Bovyn (bovynf@awe.be)
#
-# $Id: Makefile,v 1.4 1998/08/13 03:32:36 asami Exp $
+# $Id: Makefile,v 1.5 1998/10/12 15:36:27 jseger Exp $
DISTNAME= amulet
PKGNAME= amulet-3.0
@@ -13,8 +13,6 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= bovynf@awe.be
-BROKEN_ELF= libamulet.so: file not recognized: File truncated
-
USE_X_PREFIX= yes
WRKSRC= $(WRKDIR)/amulet
MAKE_ENV= AMULET_DIR=$(WRKSRC) AMULET_VARS_FILE=Makefile.vars.gcc.FreeBSD
@@ -73,10 +71,12 @@ SAMPLES= av\
example2
do-install:
- $(INSTALL_PROGRAM) $(WRKSRC)/lib/libamulet.so.3.0 $(PREFIX)/lib
- $(INSTALL_PROGRAM) $(WRKSRC)/lib/libamulet-release.so.3.0 $(PREFIX)/lib
+ $(INSTALL_PROGRAM) $(WRKSRC)/lib/libamulet.so.$(SO_VERSION) $(PREFIX)/lib
+ $(LN) -sf libamulet.so.$(SO_VERSION) $(PREFIX)/lib/libamulet.so
+ $(INSTALL_PROGRAM) $(WRKSRC)/lib/libamulet-release.so.$(SO_VERSION) $(PREFIX)/lib
+ $(LN) -sf libamulet-release.so.$(SO_VERSION) $(PREFIX)/lib/libamulet-release.so
$(INSTALL_DATA) $(WRKSRC)/lib/libamulet-release.a $(PREFIX)/lib
- $(LDCONFIG) -m $(PREFIX)/lib
+ $(SETENV) OBJFORMAT=$(PORTOBJFORMAT) $(LDCONFIG) -m $(PREFIX)/lib
$(INSTALL_PROGRAM) $(WRKSRC)/bin/gilt $(PREFIX)/bin
$(INSTALL_PROGRAM) $(WRKSRC)/bin/agate $(PREFIX)/bin
${MKDIR} $(PREFIX)/include/amulet
@@ -94,3 +94,9 @@ do-install:
done)
.include <bsd.port.mk>
+
+.if $(PORTOBJFORMAT) == "elf"
+SO_VERSION= 3
+.else
+SO_VERSION= 3.0
+.endif
diff --git a/devel/amulet/files/patch-aa b/devel/amulet/files/patch-aa
index 071d259..0365ed0 100644
--- a/devel/amulet/files/patch-aa
+++ b/devel/amulet/files/patch-aa
@@ -1,6 +1,19 @@
---- bin/Makefile.lib.gcc.shared.orig Mon Jun 23 21:37:02 1997
-+++ bin/Makefile.lib.gcc.shared Mon May 11 22:48:44 1998
-@@ -27,6 +27,7 @@
+--- bin/Makefile.lib.gcc.shared.orig Mon Jun 23 07:37:02 1997
++++ bin/Makefile.lib.gcc.shared Tue Oct 13 19:59:34 1998
+@@ -15,8 +15,11 @@
+ ORE_LIB=$(LIB_DIR)/$(ORE_lib).so
+ AMULET_LIB=$(LIB_DIR)/$(AMULET_lib).so
+
++.if $(PORTOBJFORMAT) == "elf"
++V=$(AM_MAJOR_VERSION)
++.else
+ V=$(AM_MAJOR_VERSION).$(AM_MINOR_VERSION)
+-
++.endif
+
+ BAD_VERSION=gcc version 2\.[56]\.[0-9]
+
+@@ -27,6 +30,7 @@
echo "*** or upgrade to gcc 2.7.0 or later." ; \
echo "" ; false ; \
} fi
@@ -8,12 +21,13 @@
FULL_AMULET_DEPENDENCIES = \
$(OPAL_MODULE) $(INTER_MODULE) $(DEBUG_MODULE) \
-@@ -49,26 +50,22 @@
+@@ -49,26 +53,23 @@
$(AMULET_LIB):: $(AMULET_LIB_DEPENDENCIES)
$(SHARED_CC) $(AM_CFLAGS) $(FULL_AMULET_DEPENDENCIES) \
-o $(LIB_DIR)/$(AMULET_lib).so.$(V)
- cd $(LIB_DIR); for p in $(AMULET_lib).sl $(AMULET_lib).so ; \
- do rm -f $$p ; ln -s $(AMULET_lib).so.$(V) $$p ; done
++ ln -sf $(AMULET_lib).so.$(V) $(AMULET_LIB)
+ touch $(AMULET_LIB)
$(GEM_LIB): $(GEM_LIB_DEPENDENCIES)
@@ -39,7 +53,7 @@
# Use these declarations to compile tests against monolithic shared libs.
-@@ -91,4 +88,4 @@
+@@ -91,4 +92,4 @@
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
.cc.o:
diff --git a/devel/amulet/pkg-plist b/devel/amulet/pkg-plist
index f2df920..4ac4f44 100644
--- a/devel/amulet/pkg-plist
+++ b/devel/amulet/pkg-plist
@@ -1,10 +1,12 @@
bin/gilt
bin/agate
-lib/libamulet.so.3.0
-lib/libamulet-release.so.3.0
+lib/libamulet.so
+lib/libamulet.so.3
+lib/libamulet-release.so
+lib/libamulet-release.so.3
lib/libamulet-release.a
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R %B
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R %B
include/am_inc.h
include/amulet.h
include/amulet/am_io.h
OpenPOWER on IntegriCloud