upgrade to 1.1.7

PR:		38217
Submitted by:	Ports Fury

4 files changed, 16 insertions, 76 deletions

diff --git a/devel/libshhopt/Makefile b/devel/libshhopt/Makefile
index fee2462e0249..512c99580b07 100644
--- a/devel/libshhopt/Makefile
+++ b/devel/libshhopt/Makefile
@@ -7,24 +7,24 @@
 #
 
 PORTNAME=	libshhopt
-PORTVERSION=	1.1.6
+PORTVERSION=	1.1.7
 CATEGORIES=	devel
 MASTER_SITES=	http://shh.thathost.com/pub-unix/files/
 DISTNAME=	shhopt-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_GMAKE=	yes
+MAKEFILE=	${FILESDIR}/Makefile.lib
 INSTALLS_SHLIB=	yes
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/libshhopt
-	@ ${INSTALL_DATA} ${WRKSRC}/CREDITS ${PREFIX}/share/doc/libshhopt
-	@ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/libshhopt
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/CREDITS ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${FILESDIR}/Makefile ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/example.c ${EXAMPLESDIR}
 .endif
-	@ ${MKDIR} ${PREFIX}/share/examples/libshhopt
-	@ ${INSTALL_DATA} ${FILESDIR}/Makefile ${PREFIX}/share/examples/libshhopt
-	@ ${INSTALL_DATA} ${WRKSRC}/example.c ${PREFIX}/share/examples/libshhopt
 
 .include <bsd.port.mk>
diff --git a/devel/libshhopt/distinfo b/devel/libshhopt/distinfo
index fca8cd27bd72..72bc825330b7 100644
--- a/devel/libshhopt/distinfo
+++ b/devel/libshhopt/distinfo
@@ -1 +1 @@
-MD5 (shhopt-1.1.6.tar.gz) = 99a2bb2b25bd0fe97a32fc2c9d829fed
+MD5 (shhopt-1.1.7.tar.gz) = caf24206354296e8a48771aea1f47fbd
diff --git a/devel/libshhopt/files/patch-aa b/devel/libshhopt/files/patch-aa
deleted file mode 100644
index 14920a3547b6..000000000000
--- a/devel/libshhopt/files/patch-aa
+++ /dev/null
@@ -1,61 +0,0 @@
---- Makefile.orig	Fri Mar 10 08:45:19 2000
-+++ Makefile	Sun Apr 29 23:26:59 2001
-@@ -6,7 +6,7 @@
- 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)
-@@ -20,19 +20,19 @@
- LIBHEAD		= $(DIST).h
- TARGETS		= $(LIBTARGET)
- 
--INSTBASEDIR	= /usr/local
-+INSTBASEDIR	= ${PREFIX}
- INSTLIBDIR	= $(INSTBASEDIR)/lib
- INSTINCDIR	= $(INSTBASEDIR)/include
--INSTALL		= install -m 644
--INSTALLPROG	= install -m 755
--MKDIRP		= install -d -m 755
-+INSTALL		= ${BSD_INSTALL_DATA}
-+INSTALLPROG	= ${BSD_INSTALL_PROGRAM}
-+MKDIRP		= mkdir -p
- 
--CC		= gcc
--OPTIM		= -O2
-+#CC		= gcc
-+OPTIM		= $(CFLAGS)
- 
- INCDIR		= -I.
- 
--CCOPT		= -s -Wall $(OPTIM) $(INCDIR)
-+CCOPT		= $(INCDIR) $(CFLAGS)
- 
- # Object files to store in the library
- LIBOBJS		= shhopt.o
-@@ -45,7 +45,7 @@
- # separately.  This error is harmless.
- $(LIBTARGET): $(LIBOBJS)
- ifeq ($(SHARED),1)
--	$(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGET) $(LIBOBJS)
-+	$(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGETSOMAJ) $(LIBOBJS)
- else
- 	ar rc $(LIBTARGET) $(LIBOBJS)
- 	ranlib $(LIBTARGET) || true
-@@ -64,12 +64,10 @@
- 
- install: $(LIBTARGET)
- 	$(MKDIRP) $(INSTLIBDIR) $(INSTINCDIR)
--	$(INSTALL) $(LIBTARGET) $(INSTLIBDIR)
-+	$(INSTALL) $(LIBTARGETSOMAJ) $(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:
diff --git a/devel/libshhopt/pkg-plist b/devel/libshhopt/pkg-plist
index cc5ef6fd4ee5..e2af964b9520 100644
--- a/devel/libshhopt/pkg-plist
+++ b/devel/libshhopt/pkg-plist
@@ -1,10 +1,11 @@
 @comment $FreeBSD$
 include/shhopt.h
+lib/libshhopt.a
 lib/libshhopt.so
 lib/libshhopt.so.1
-share/doc/libshhopt/CREDITS
-share/doc/libshhopt/README
-share/examples/libshhopt/Makefile
-share/examples/libshhopt/example.c
-@dirrm share/doc/libshhopt
-@dirrm share/examples/libshhopt
+%%PORTDOCS%%share/doc/libshhopt/CREDITS
+%%PORTDOCS%%share/doc/libshhopt/README
+%%PORTDOCS%%share/examples/libshhopt/Makefile
+%%PORTDOCS%%share/examples/libshhopt/example.c
+%%PORTDOCS%%@dirrm share/examples/libshhopt
+%%PORTDOCS%%@dirrm share/doc/libshhopt