- Update to 2.6.1

- While I am here use SFE macro

PR:		ports/133496
Submitted by:	Ashish SHUKLA <wahjava@gmail.com>
Approved by:	maintainer timeout (two weeks), tabthorpe (co-mentor)

4 files changed, 20 insertions, 28 deletions

diff --git a/finance/ledger/Makefile b/finance/ledger/Makefile
index c8fe09e3643a..939f883cf0a1 100644
--- a/finance/ledger/Makefile
+++ b/finance/ledger/Makefile
@@ -6,13 +6,11 @@
 #
 
 PORTNAME=	ledger
-PORTVERSION=	2.4.1
+PORTVERSION=	2.6.1
 CATEGORIES=	finance
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED} \
-		http://www.badplandude.com/~wcarey/ledger/
-MASTER_SITE_SUBDIR=ledger
+MASTER_SITES=	SFE
 
-MAINTAINER=     woodycarey@hotmail.com
+MAINTAINER=	woodycarey@hotmail.com
 COMMENT=	John Wiegley's command line accounting program
 
 LIB_DEPENDS=	gmp:${PORTSDIR}/math/libgmp4 \
@@ -20,6 +18,7 @@ LIB_DEPENDS=	gmp:${PORTSDIR}/math/libgmp4 \
 		xmltok:${PORTSDIR}/www/libwww \
 		xmlparse:${PORTSDIR}/www/libwww
 
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/w3c-libwww
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -28,25 +27,14 @@ CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 NO_INSTALL_MANPAGES=	yes
 INFO=	ledger
 
-# we need to write our own do-install, as the configure script produces
-# a Makefile which respects $prefix, not ${PREFIX} during the install
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/ledger.info ${PREFIX}/info/
-	${INSTALL_PROGRAM} ${WRKSRC}/ledger	${PREFIX}/bin/
-	${INSTALL_DATA} ${WRKSRC}/libledger.a ${PREFIX}/lib/
-	${MKDIR} ${PREFIX}/include/ledger
-	${INSTALL_DATA} ${WRKSRC}/*.h ${PREFIX}/include/ledger/
+post-install:
 	${MKDIR} ${EXAMPLESDIR}
 	${MKDIR} ${EXAMPLESDIR}/scripts
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${EXAMPLESDIR}/scripts/
 	${INSTALL_DATA} ${WRKSRC}/sample.dat ${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/setup.py ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/ledger.el ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/ledger.vim ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/ledger.texi ${EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/main.py ${EXAMPLESDIR}
-
-post-install:
+	${RM} -f ${PREFIX}/share/emacs/site-lisp/*.elc
 	${CAT} pkg-message
 
 .include <bsd.port.mk>
diff --git a/finance/ledger/distinfo b/finance/ledger/distinfo
index f23f5680245a..02f796ff50a9 100644
--- a/finance/ledger/distinfo
+++ b/finance/ledger/distinfo
@@ -1,3 +1,3 @@
-MD5 (ledger-2.4.1.tar.gz) = 5c0b653ef3298b9fb851c372c604c509
-SHA256 (ledger-2.4.1.tar.gz) = 5c9fc75e5fbb91e72a6bc75ea255ae34579c3705a6ba0a2f6a1b9a656bce5464
-SIZE (ledger-2.4.1.tar.gz) = 617727
+MD5 (ledger-2.6.1.tar.gz) = 7d2ebb3fbc0ca14e34f4aada9fe764a0
+SHA256 (ledger-2.6.1.tar.gz) = 96830d77d3aa6bf6c5778f5dd52169f9b5203fb7daad0e12831abeb35b14f27a
+SIZE (ledger-2.6.1.tar.gz) = 658288
diff --git a/finance/ledger/pkg-descr b/finance/ledger/pkg-descr
index 94064a0d772c..45976f31b8ef 100644
--- a/finance/ledger/pkg-descr
+++ b/finance/ledger/pkg-descr
@@ -2,7 +2,7 @@
 as a ledger, yet provides powerful facilities for working with commodities, 
 accounts, transactions, etc. It will read Gnucash data files directly. 
 
-WWW: http://www.newartisans.com/ledger.html
+WWW: http://wiki.github.com/jwiegley/ledger
 
  - Woody Carey
 woodycarey@hotmail.com
diff --git a/finance/ledger/pkg-plist b/finance/ledger/pkg-plist
index 80c4c43d0453..6f77329c2fb1 100644
--- a/finance/ledger/pkg-plist
+++ b/finance/ledger/pkg-plist
@@ -4,6 +4,7 @@ include/ledger/amount.h
 include/ledger/balance.h
 include/ledger/binary.h
 include/ledger/config.h
+include/ledger/csv.h
 include/ledger/datetime.h
 include/ledger/debug.h
 include/ledger/derive.h
@@ -17,12 +18,10 @@ include/ledger/mask.h
 include/ledger/ofx.h
 include/ledger/option.h
 include/ledger/parser.h
-include/ledger/py_eval.h
-include/ledger/pyfstream.h
-include/ledger/pyledger.h
 include/ledger/qif.h
 include/ledger/quotes.h
 include/ledger/reconcile.h
+include/ledger/report.h
 include/ledger/textual.h
 include/ledger/timing.h
 include/ledger/util.h
@@ -30,17 +29,22 @@ include/ledger/valexpr.h
 include/ledger/value.h
 include/ledger/walk.h
 include/ledger/xml.h
+lib/libamounts.a
+lib/libamounts.la
+lib/libamounts.so
+lib/libamounts.so.0
+lib/libledger-2.6.1.so
 lib/libledger.a
-%%EXAMPLESDIR%%/ledger.el
-%%EXAMPLESDIR%%/ledger.texi
+lib/libledger.la
+lib/libledger.so
 %%EXAMPLESDIR%%/ledger.vim
-%%EXAMPLESDIR%%/main.py
 %%EXAMPLESDIR%%/sample.dat
 %%EXAMPLESDIR%%/scripts/README
 %%EXAMPLESDIR%%/scripts/bal
 %%EXAMPLESDIR%%/scripts/bal-huquq
 %%EXAMPLESDIR%%/scripts/entry
 %%EXAMPLESDIR%%/scripts/getquote
+%%EXAMPLESDIR%%/scripts/ledger-du
 %%EXAMPLESDIR%%/scripts/report
 %%EXAMPLESDIR%%/scripts/tc
 %%EXAMPLESDIR%%/scripts/ti