3 files changed, 42 insertions, 15 deletions

diff --git a/net-mgmt/arts++/Makefile b/net-mgmt/arts++/Makefile
index afeae626b64b..ac5cc6571b40 100644
--- a/net-mgmt/arts++/Makefile
+++ b/net-mgmt/arts++/Makefile
@@ -8,40 +8,38 @@ CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.caida.org/tools/utilities/arts/download/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A network data storage and analysis library from CAIDA
+COMMENT=	Network data storage and analysis library from CAIDA
 
+USES=		gmake
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 CONFIGURE_ARGS=	--enable-shared
 USE_LDCONFIG=	yes
 
-MANL=		artsportagg.l artsports.l artsprotos.l artsnets.l artsdump.l \
-		artsases.l artstoc.l artsagg.l artsprotoagg.l artsnetagg.l \
-		artsasagg.l artsportms.l artsportmagg.l artsintfms.l \
-		artsintfmagg.l artsnexthops.l artsnexthopagg.l artstos.l
-
-NO_STAGE=	yes
-
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/ltconfig
-	@${REINPLACE_CMD} -e 's/make_pair/std::make_pair/' ${WRKSRC}/classes/include/Ipv4PrefixPatricia.hh.in
+	@${REINPLACE_CMD} -e 's/make_pair/std::make_pair/' \
+		${WRKSRC}/classes/include/Ipv4PrefixPatricia.hh.in
+	@${REINPLACE_CMD} -e 's|@mandir@|$${DESTDIR}@mandir@|g'  \
+		-e 's|@bindir@|$${DESTDIR}@bindir@|g'  \
+		${WRKSRC}/apps/*/Makefile.in
+	@${REINPLACE_CMD} -e 's|@libdir@|$${DESTDIR}@libdir@|g'  \
+		-e 's|@includedir@|$${DESTDIR}@includedir@|g'  \
+		${WRKSRC}/classes/*/Makefile.in
 
 post-configure:
 	@${REINPLACE_CMD} -E -e "s,( gcc\*),\1 | g++\*,g" ${WRKSRC}/libtool
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}/html
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 .for f in ChangeLog INSTALL WishList
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
-.for f in *.html
-	@${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}/html
+	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
+	@${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}/html
 .endif
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/arts++/files/patch-ltconfig b/net-mgmt/arts++/files/patch-ltconfig
new file mode 100644
index 000000000000..77d618e40f49
--- /dev/null
+++ b/net-mgmt/arts++/files/patch-ltconfig
@@ -0,0 +1,11 @@
+--- ltconfig.orig	2014-04-21 17:21:57.000000000 -0500
++++ ltconfig
+@@ -1131,7 +1131,7 @@ freebsd1*)
+   dynamic_linker=no
+   ;;
+ 
+-freebsd*)
++dragonfly*|freebsd*)
+   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+   version_type=freebsd-$objformat
+   case $version_type in
diff --git a/net-mgmt/arts++/pkg-plist b/net-mgmt/arts++/pkg-plist
index d13fa92e3511..82bbc0804366 100644
--- a/net-mgmt/arts++/pkg-plist
+++ b/net-mgmt/arts++/pkg-plist
@@ -94,6 +94,24 @@ lib/libArts.a
 lib/libArts.la
 lib/libArts.so
 lib/libArts.so.0
+man/manl/artsportagg.l.gz
+man/manl/artsports.l.gz
+man/manl/artsprotos.l.gz
+man/manl/artsnets.l.gz
+man/manl/artsdump.l.gz
+man/manl/artsases.l.gz
+man/manl/artstoc.l.gz
+man/manl/artsagg.l.gz
+man/manl/artsprotoagg.l.gz
+man/manl/artsnetagg.l.gz
+man/manl/artsasagg.l.gz
+man/manl/artsportms.l.gz
+man/manl/artsportmagg.l.gz
+man/manl/artsintfms.l.gz
+man/manl/artsintfmagg.l.gz
+man/manl/artsnexthops.l.gz
+man/manl/artsnexthopagg.l.gz
+man/manl/artstos.l.gz
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/WishList