Update port to 1.1.6

PR:		17488
Submitted by:	Maintainer

4 files changed, 55 insertions, 83 deletions

diff --git a/devel/libshhopt/Makefile b/devel/libshhopt/Makefile
index b96922daa299..345c8d62806a 100644
--- a/devel/libshhopt/Makefile
+++ b/devel/libshhopt/Makefile
@@ -1,17 +1,15 @@
 # New ports collection makefile for:	libshhopt
-# Version required:			1.1.5
+# Version required:			1.1.6
 # Date created:				11 April 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		shhopt-1.1.5
-PKGNAME=		libshhopt-1.1.5
+DISTNAME=		shhopt-1.1.6
+PKGNAME=		libshhopt-1.1.6
 CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_SUNSITE} \
-			http://home.sol.no/~sverrehu/pub-unix/files/
-MASTER_SITE_SUBDIR=	libs
+MASTER_SITES=		http://home.sol.no/~sverrehu/pub-unix/files/
 
 MAINTAINER=		andy@icc.surw.chel.su
 
diff --git a/devel/libshhopt/distinfo b/devel/libshhopt/distinfo
index 86985717628f..fca8cd27bd72 100644
--- a/devel/libshhopt/distinfo
+++ b/devel/libshhopt/distinfo
@@ -1 +1 @@
-MD5 (shhopt-1.1.5.tar.gz) = cc32c7f43ff1e5f0ea45569c4234c1fc
+MD5 (shhopt-1.1.6.tar.gz) = 99a2bb2b25bd0fe97a32fc2c9d829fed
diff --git a/devel/libshhopt/files/patch-aa b/devel/libshhopt/files/patch-aa
index e29df246d860..842646df3318 100644
--- a/devel/libshhopt/files/patch-aa
+++ b/devel/libshhopt/files/patch-aa
@@ -1,76 +1,48 @@
-*** 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:
+--- Makefile	Fri Mar 10 11:45:19 2000
++++ /home/andy/tmp/wrk/Makefile	Sun Mar 19 16:34:15 2000
+@@ -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
+@@ -20,15 +20,16 @@
+ LIBHEAD		= $(DIST).h
+ TARGETS		= $(LIBTARGET)
+ 
+-INSTBASEDIR	= /usr/local
++PREFIX		?= /usr/local
++INSTBASEDIR	= $(PREFIX)
+ 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
+-OPTIM		= -O2
++CC		?= gcc
++OPTIM		= $(CFLAGS)
+ 
+ INCDIR		= -I.
+ 
+@@ -67,9 +68,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:
diff --git a/devel/libshhopt/pkg-descr b/devel/libshhopt/pkg-descr
index a51c53734ac2..1cd1a11b5296 100644
--- a/devel/libshhopt/pkg-descr
+++ b/devel/libshhopt/pkg-descr
@@ -1,3 +1,5 @@
 shhopt - library for parsing command line options. It contains
 C-functions for parsing command line options, both traditional
 one-character options, and GNU'ish --long-options.
+
+WWW: http://home.sol.no/~sverrehu/pub-unix/