4 files changed, 54 insertions, 6 deletions

diff --git a/security/nettle/Makefile b/security/nettle/Makefile
index f6fb3929b209..40f0c810b755 100644
--- a/security/nettle/Makefile
+++ b/security/nettle/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	nettle
 PORTVERSION=	1.7
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.lysator.liu.se/~nisse/archive/ \
 		ftp://ftp.lysator.liu.se/pub/security/lsh/
@@ -20,12 +21,25 @@ LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		MAKEINFO="makeinfo --no-split"
+CONFIGURE_ARGS=	--enable-shared
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALLS_SHLIB=	yes
+
+DOCS=		NEWS README TODO nettle.html
+EXAMPLES=	examples/README examples/*.c examples/*.h
+INFO=		nettle
 
 post-extract:
 	@${RM} -f ${WRKSRC}/nettle.info*
 
+post-install:
+	@${MKDIR} ${EXAMPLESDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+.endif
+
 .include <bsd.port.mk>
diff --git a/security/nettle/files/patch-Makefile.in b/security/nettle/files/patch-Makefile.in
new file mode 100644
index 000000000000..5e9e5bd2c686
--- /dev/null
+++ b/security/nettle/files/patch-Makefile.in
@@ -0,0 +1,10 @@
+--- Makefile.in.orig	Fri Oct 24 14:28:03 2003
++++ Makefile.in	Fri Oct 24 14:29:11 2003
+@@ -1067,7 +1067,6 @@ $(SHLIBFORLINK): $(SHLIBOBJECTS)
+ install-shared: $(SHLIBFORLINK)
+ 	$(INSTALL_DATA) $(SHLIBFORLINK) $(DESTDIR)$(libdir)/$(SHLIBFILE)
+ 	(cd $(DESTDIR)$(libdir) \
+-		&& ln -sf $(SHLIBFILE) $(SHLIBSONAME) \
+ 		&& ln -sf $(SHLIBFILE) $(SHLIBFORLINK) )
+ 
+ %.html : %.texinfo
diff --git a/security/nettle/files/patch-configure b/security/nettle/files/patch-configure
new file mode 100644
index 000000000000..96c78f36792e
--- /dev/null
+++ b/security/nettle/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Fri Oct 24 14:27:53 2003
++++ configure	Fri Oct 24 14:28:43 2003
+@@ -3160,7 +3160,7 @@ fi
+ SHLIBCFLAGS="-fpic"
+ SHLIBFORLINK=libnettle.so
+ SHLIBSONAME='$(SHLIBFORLINK).$(SHLIBMAJOR)'
+-SHLIBFILE='$(SHLIBSONAME).$(SHLIBMINOR)'
++SHLIBFILE='$(SHLIBSONAME)'
+ SHLIBLINK='$(CC) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME)'
+ 
+ echo "enable_shared: $enable_shared"
diff --git a/security/nettle/pkg-plist b/security/nettle/pkg-plist
index eca86158d207..efb4a6b17d3e 100644
--- a/security/nettle/pkg-plist
+++ b/security/nettle/pkg-plist
@@ -24,8 +24,21 @@ include/nettle/sexp.h
 include/nettle/sha.h
 include/nettle/twofish.h
 include/nettle/yarrow.h
-@unexec install-info --delete %D/info/nettle.info %D/info/dir
-info/nettle.info
-@exec install-info %D/info/nettle.info %D/info/dir
-lib/libnettle.a
 @dirrm include/nettle
+lib/libnettle.a
+lib/libnettle.so.1
+lib/libnettle.so
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/nettle.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%EXAMPLESDIR%%/README
+%%EXAMPLESDIR%%/io.c
+%%EXAMPLESDIR%%/nettle-benchmark.c
+%%EXAMPLESDIR%%/nettle-openssl.c
+%%EXAMPLESDIR%%/rsa-keygen.c
+%%EXAMPLESDIR%%/rsa-sign.c
+%%EXAMPLESDIR%%/rsa-verify.c
+%%EXAMPLESDIR%%/io.h
+@dirrm %%EXAMPLESDIR%%