[1]:

  - Update to 0.19
  - Chase original master site
  - Remove WITHOUT_ADNS option, as the configure script shipped with
    0.19 does not know anything about adns
  - Replace !WITHOUT_{LUA,SQLITE} with WITH_{LUA,SQLITE}_PORT to make
    the included libraries the default choice - the INSTALL file coming
    with the distribution suggests using the bundled libraries to avoid
    problems, and as this software is still under heavy development, I
    think it should be honored
  - Add home page URL to pkg-descr

Moreover:
  - Respect ${CXXFLAGS}
  - Polish the Makefile

PR:		ports/81470 [1]
Submitted by:	Stefan Walter <sw@gegenunendlich.de> [1]
Approved by:	maintainer timeout (21 days)

3 files changed, 18 insertions, 21 deletions

diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index 5ab8e984459b..ed6694e17656 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	monotone
-PORTVERSION=	0.16
+PORTVERSION=	0.19
 CATEGORIES=	devel
-MASTER_SITES=	http://www.venge.net/monotone/  \
+MASTER_SITES=	http://www.venge.net/monotone/downloads/ \
 		http://norton.kettering.edu/freebsd/
 
 MAINTAINER=	mwicks@kettering.edu
@@ -17,6 +17,7 @@ COMMENT=	A distributed version control system with digital signatures
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt		\
 		boost_regex.2:${PORTSDIR}/devel/boost
 
+USE_REINPLACE=	yes
 USE_ICONV=	yes
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -24,10 +25,7 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-LDFLAGS+=	-L${LOCALBASE}/lib
-CFLAGS+=	-I${LOCALBASE}/include
-CXXFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
 PLIST_FILES=	bin/monotone
 INFO=		monotone
@@ -36,26 +34,23 @@ MAN1=		monotone.1
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
 .endif
-.if !defined(WITHOUT_ADNS)
-LIB_DEPENDS+=	adns.1:${PORTSDIR}/dns/adns
-.else
-CONFIGURE_ARGS+=	--with-bundled-adns
-.endif
-.if !defined(WITHOUT_LUA)
+.if defined(WITH_LUA_PORT)
 LIB_DEPENDS+=	lua.5:${PORTSDIR}/lang/lua
-.else
-CONFIGURE_ARGS+=	--with-bundled-lua
+CONFIGURE_ARGS+=	--with-bundled-lua=no
 .endif
-.if !defined(WITHOUT_SQLITE)
-LIB_DEPENDS+=	sqlite.2:${PORTSDIR}/databases/sqlite2
-.else
-CONFIGURE_ARGS+=	--with-bundled-sqlite
+.if defined(WITH_SQLITE_PORT)
+LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
+CONFIGURE_ARGS+=	--with-bundled-sqlite=no
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-BROKEN=	"Does not compile on FreeBSD-4.11"
+BROKEN=		"Does not compile on FreeBSD 4.x"
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|\($$(CXX) -Wall\)|\1 ${CXXFLAGS}|' \
+		${WRKSRC}/Makefile.in
+
 .include <bsd.port.post.mk>
diff --git a/devel/monotone/distinfo b/devel/monotone/distinfo
index ddd1a34c21e7..0874410534ab 100644
--- a/devel/monotone/distinfo
+++ b/devel/monotone/distinfo
@@ -1,2 +1,2 @@
-MD5 (monotone-0.16.tar.gz) = 66fe3f50a8fe621afc8f355b25201ecb
-SIZE (monotone-0.16.tar.gz) = 3438625
+MD5 (monotone-0.19.tar.gz) = aa549380068613dc04ef5d084bec1b1f
+SIZE (monotone-0.19.tar.gz) = 4796447
diff --git a/devel/monotone/pkg-descr b/devel/monotone/pkg-descr
index a2ab4780f356..b3114937c70f 100644
--- a/devel/monotone/pkg-descr
+++ b/devel/monotone/pkg-descr
@@ -7,3 +7,5 @@ many tedious and error-prone tasks in group software development.
     * Make notes about your opinion of the quality of versions of files.
     * Make decisions about using or ignoring versions, depending on
        the notes you receive from others.
+
+WWW: http://www.venge.net/monotone/