4 files changed, 89 insertions, 18 deletions

diff --git a/net/adasockets/Makefile b/net/adasockets/Makefile
index 34cf649abd79..fa22c0034af4 100644
--- a/net/adasockets/Makefile
+++ b/net/adasockets/Makefile
@@ -5,21 +5,26 @@
 # $FreeBSD$
 #
 
-PORTNAME=	adasockets
-PORTVERSION=	1.8.4
-CATEGORIES=	net
-MASTER_SITES=	http://www.rfc1149.net/download/adasockets/
+PORTNAME=		adasockets
+PORTVERSION=		1.8.4.7
+CATEGORIES=		net
+MASTER_SITES=		http://www.rfc1149.net/download/adasockets/
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Sockets library for Ada
+MAINTAINER=		john_m_cooper@yahoo.com
+COMMENT=		Sockets library for Ada
 
-BUILD_DEPENDS=	gnatmake:${PORTSDIR}/lang/gnat \
-		texi2dvi:${PORTSDIR}/print/teTeX
+BUILD_DEPENDS=		gnatmake:${PORTSDIR}/lang/gnat \
+			texi2dvi:${PORTSDIR}/print/teTeX
 
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
+USE_AUTOTOOLS=		autoconf:259
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		--disable-examples
+.if defined(NOPORTDOCS)
+CONFIGURE_ARGS+=	--disable-doc
+.endif
+USE_LDCONFIG=		yes
 
-MAN1=		adasockets-config.1
-INFO=		adasockets
+MAN1=			adasockets-config.1
+INFO=			adasockets
 
 .include <bsd.port.mk>
diff --git a/net/adasockets/distinfo b/net/adasockets/distinfo
index 66a77c94ef67..f038146e8e3e 100644
--- a/net/adasockets/distinfo
+++ b/net/adasockets/distinfo
@@ -1,3 +1,3 @@
-MD5 (adasockets-1.8.4.tar.gz) = 4f69c2551f1aa10bb4f16bc1530b514c
-SHA256 (adasockets-1.8.4.tar.gz) = cfd1567f4e8e20142f2fd04bbdd7084a6b9ec9d0be2d3984304056140d3a325a
-SIZE (adasockets-1.8.4.tar.gz) = 570734
+MD5 (adasockets-1.8.4.7.tar.gz) = f5906ca9db42a6133a72cf29ac845eab
+SHA256 (adasockets-1.8.4.7.tar.gz) = 496591ab6eb97597088554492c91500a464afe774a9c56dffc1ba048016e8a3e
+SIZE (adasockets-1.8.4.7.tar.gz) = 621945
diff --git a/net/adasockets/files/patch-doc_Makefile.in b/net/adasockets/files/patch-doc_Makefile.in
new file mode 100644
index 000000000000..dadd5b634ee4
--- /dev/null
+++ b/net/adasockets/files/patch-doc_Makefile.in
@@ -0,0 +1,65 @@
+--- doc/Makefile.in.orig	Fri Nov 26 06:57:18 2004
++++ doc/Makefile.in	Sun Jan 21 22:59:35 2007
+@@ -225,52 +225,6 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ 
+-.texi.info:
+-	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
+-	am__cwd=`pwd` && cd $(srcdir) && \
+-	rm -rf $$backupdir && mkdir $$backupdir && \
+-	for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
+-	  if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
+-	done; \
+-	cd "$$am__cwd"; \
+-	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
+-	 -o $@ $<; \
+-	then \
+-	  rc=0; \
+-	  cd $(srcdir); \
+-	else \
+-	  rc=$$?; \
+-	  cd $(srcdir) && \
+-	  $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
+-	fi; \
+-	rm -rf $$backupdir; exit $$rc
+-
+-.texi.dvi:
+-	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+-	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
+-	$(TEXI2DVI) $<
+-
+-.texi.pdf:
+-	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+-	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
+-	$(TEXI2PDF) $<
+-
+-.texi.html:
+-	rm -rf $(@:.html=.htp)
+-	if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
+-	 -o $(@:.html=.htp) $<; \
+-	then \
+-	  rm -rf $@; \
+-	  if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
+-	    mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \
+-	else \
+-	  if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
+-	    rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
+-	  exit 1; \
+-	fi
+-$(srcdir)/adasockets.info: adasockets.texi $(srcdir)/version.texi $(adasockets_TEXINFOS)
+-adasockets.dvi: adasockets.texi $(srcdir)/version.texi $(adasockets_TEXINFOS)
+-adasockets.html: adasockets.texi $(srcdir)/version.texi $(adasockets_TEXINFOS)
+ $(srcdir)/version.texi:  $(srcdir)/stamp-vti
+ $(srcdir)/stamp-vti: adasockets.texi $(top_srcdir)/configure
+ 	@(dir=.; test -f ./adasockets.texi || dir=$(srcdir); \
+@@ -530,6 +484,9 @@
+ 
+ adasockets.pdf: ${srcdir}/adasockets.texi ${adasockets_TEXINFOS}
+ 	-${TEXI2DVI} --pdf ${srcdir}/adasockets.texi
++
++adasockets.dvi: ${srcdir}/adasockets.texi ${adasockets_TEXINFOS}
++	-${TEXI2DVI} ${srcdir}/adasockets.texi
+ 
+ adasockets.ps: ${srcdir}/adasockets.texi ${adasockets_TEXINFOS}
+ 	-${TEXI2DVI} ${srcdir}/adasockets.texi && \
diff --git a/net/adasockets/pkg-plist b/net/adasockets/pkg-plist
index cb943f408a23..335d8607d02e 100644
--- a/net/adasockets/pkg-plist
+++ b/net/adasockets/pkg-plist
@@ -2,6 +2,7 @@ bin/adasockets-config
 lib/libadasockets.so
 lib/libadasockets.so.0
 lib/libadasockets.a
+lib/libadasockets.la
 lib/adasockets/sockets-constants.ali
 lib/adasockets/sockets-link.ali
 lib/adasockets/sockets-multicast.ali
@@ -25,7 +26,7 @@ lib/adasockets/sockets-utils.ads
 lib/adasockets/sockets-utils.adb
 lib/adasockets/sockets.adb
 lib/adasockets/sockets.ads
-share/doc/adasockets/adasockets.ps
-share/doc/adasockets/adasockets.pdf
+%%PORTDOCS%%%%DOCSDIR%%/adasockets.ps
+%%PORTDOCS%%%%DOCSDIR%%/adasockets.pdf
 @dirrm lib/adasockets
-@dirrm share/doc/adasockets
+%%PORTDOCS%%@dirrm %%DOCSDIR%%