summaryrefslogtreecommitdiff
path: root/devel/libshhopt
diff options
context:
space:
mode:
authorAndrey Zakhvatov <andy@FreeBSD.org>1999-09-24 13:54:42 +0000
committerAndrey Zakhvatov <andy@FreeBSD.org>1999-09-24 13:54:42 +0000
commit33c11413f4421892ae9cb831369cbb1cdf4ca42e (patch)
treeabe2fd1c77212148e5113ad48c04ce2244433f74 /devel/libshhopt
parentFix homepage location. Add distribution site. (diff)
Update to version 1.1.5
Notes
Notes: svn path=/head/; revision=21913
Diffstat (limited to '')
-rw-r--r--devel/libshhopt/Makefile16
-rw-r--r--devel/libshhopt/distinfo2
-rw-r--r--devel/libshhopt/files/patch-aa113
3 files changed, 86 insertions, 45 deletions
diff --git a/devel/libshhopt/Makefile b/devel/libshhopt/Makefile
index 2cff0c2cea78..b96922daa299 100644
--- a/devel/libshhopt/Makefile
+++ b/devel/libshhopt/Makefile
@@ -1,19 +1,21 @@
# New ports collection makefile for: libshhopt
-# Version required: 1.1.4
+# Version required: 1.1.5
# Date created: 11 April 1998
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= shhopt-1.1.4
-PKGNAME= libshhopt-1.1.4
-CATEGORIES= devel
-MASTER_SITES= http://home.sol.no/~sverrehu/pub-unix/files/
+DISTNAME= shhopt-1.1.5
+PKGNAME= libshhopt-1.1.5
+CATEGORIES= devel
+MASTER_SITES= ${MASTER_SITE_SUNSITE} \
+ http://home.sol.no/~sverrehu/pub-unix/files/
+MASTER_SITE_SUBDIR= libs
-MAINTAINER= andy@icc.surw.chel.su
+MAINTAINER= andy@icc.surw.chel.su
-USE_GMAKE= yes
+USE_GMAKE= yes
post-install:
${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
diff --git a/devel/libshhopt/distinfo b/devel/libshhopt/distinfo
index c9687c32cb29..86985717628f 100644
--- a/devel/libshhopt/distinfo
+++ b/devel/libshhopt/distinfo
@@ -1 +1 @@
-MD5 (shhopt-1.1.4.tar.gz) = 20b619bc5f4c17e2292578cd4a0e4e20
+MD5 (shhopt-1.1.5.tar.gz) = cc32c7f43ff1e5f0ea45569c4234c1fc
diff --git a/devel/libshhopt/files/patch-aa b/devel/libshhopt/files/patch-aa
index 963686074ff3..e29df246d860 100644
--- a/devel/libshhopt/files/patch-aa
+++ b/devel/libshhopt/files/patch-aa
@@ -1,37 +1,76 @@
---- Makefile.orig Sun Jul 5 12:08:59 1998
-+++ Makefile Fri Apr 2 15:15:59 1999
-@@ -6,10 +6,10 @@
- VERSION = $(VERMAJ).$(VERMIN).$(VERPAT)
-
- # Define SHARED as 1 for Linux shared ELF library
--#SHARED = 1
-+SHARED = 1
-
- ifeq ($(SHARED),1)
--LIBTARGET = lib$(DIST).so.$(VERSION)
-+LIBTARGET = lib$(DIST).so.$(VERMAJ)
- LIBTARGETSO = lib$(DIST).so
- LIBTARGETSOMAJ = $(LIBTARGETSO).$(VERMAJ)
- CCSHRD = -fPIC
-@@ -23,8 +23,8 @@
- INSTBASEDIR = /usr/local
- INSTLIBDIR = $(INSTBASEDIR)/lib
- INSTINCDIR = $(INSTBASEDIR)/include
--INSTALL = install -m 644
--INSTALLPROG = install -m 755
-+INSTALL = install -c -m 644
-+INSTALLPROG = install -c -m 755
- MKDIRP = install -d -m 755
-
- CC = gcc
-@@ -67,9 +67,7 @@
- $(INSTALL) $(LIBTARGET) $(INSTLIBDIR)
- $(INSTALL) $(LIBHEAD) $(INSTINCDIR)
- ifeq ($(SHARED),1)
-- ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSOMAJ)
-- ln -sf $(LIBTARGETSOMAJ) $(INSTLIBDIR)/$(LIBTARGETSO)
-- echo "If you use GNU/Linux, remember to run ldconfig"
-+ ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSO)
- endif
-
- clean:
+*** Makefile Fri Sep 10 23:19:48 1999
+--- /home/andy/tmp/wrk/Makefile Fri Sep 24 17:47:46 1999
+***************
+*** 6,15 ****
+ VERSION = $(VERMAJ).$(VERMIN).$(VERPAT)
+
+ # Define SHARED as 1 for Linux shared ELF library
+! #SHARED = 1
+
+ ifeq ($(SHARED),1)
+! LIBTARGET = lib$(DIST).so.$(VERSION)
+ LIBTARGETSO = lib$(DIST).so
+ LIBTARGETSOMAJ = $(LIBTARGETSO).$(VERMAJ)
+ CCSHRD = -fPIC
+--- 6,15 ----
+ VERSION = $(VERMAJ).$(VERMIN).$(VERPAT)
+
+ # Define SHARED as 1 for Linux shared ELF library
+! SHARED = 1
+
+ ifeq ($(SHARED),1)
+! LIBTARGET = lib$(DIST).so.$(VERMAJ)
+ LIBTARGETSO = lib$(DIST).so
+ LIBTARGETSOMAJ = $(LIBTARGETSO).$(VERMAJ)
+ CCSHRD = -fPIC
+***************
+*** 20,33 ****
+ LIBHEAD = $(DIST).h
+ TARGETS = $(LIBTARGET)
+
+! INSTBASEDIR = /usr/local
+ INSTLIBDIR = $(INSTBASEDIR)/lib
+ INSTINCDIR = $(INSTBASEDIR)/include
+! INSTALL = install -m 644
+! INSTALLPROG = install -m 755
+ MKDIRP = install -d -m 755
+
+! CC = gcc
+ OPTIM = -O2
+
+ INCDIR = -I.
+--- 20,34 ----
+ LIBHEAD = $(DIST).h
+ TARGETS = $(LIBTARGET)
+
+! PREFIX ?= /usr/local
+! INSTBASEDIR = $(PREFIX)
+ INSTLIBDIR = $(INSTBASEDIR)/lib
+ INSTINCDIR = $(INSTBASEDIR)/include
+! INSTALL = install -c -m 644
+! INSTALLPROG = install -c -m 755
+ MKDIRP = install -d -m 755
+
+! CC ?= gcc
+ OPTIM = -O2
+
+ INCDIR = -I.
+***************
+*** 67,75 ****
+ $(INSTALL) $(LIBTARGET) $(INSTLIBDIR)
+ $(INSTALL) $(LIBHEAD) $(INSTINCDIR)
+ ifeq ($(SHARED),1)
+! ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSOMAJ)
+! ln -sf $(LIBTARGETSOMAJ) $(INSTLIBDIR)/$(LIBTARGETSO)
+! echo "If you use GNU/Linux, remember to run ldconfig"
+ endif
+
+ clean:
+--- 68,74 ----
+ $(INSTALL) $(LIBTARGET) $(INSTLIBDIR)
+ $(INSTALL) $(LIBHEAD) $(INSTINCDIR)
+ ifeq ($(SHARED),1)
+! ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSO)
+ endif
+
+ clean: