- Update to 0.13.1;

- Change PREFIX to be X11BASE. The reason why it should be in X11BASE is that
  sawfish (primary user of librep) installs shared object into one of the
  librep's directories, so they have to live in the same BASE to make PLISTs
  working. The way it was done looks like a little hack, because I don't
  want to use USE_X_PREFIX (the port really doesn't require libX11), so I had
  to manually set MTREE_FILE.

4 files changed, 40 insertions, 6 deletions

diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index 3ce15e69dc0d..af37ba195682 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	librep
-PORTVERSION=	0.13
+PORTVERSION=	0.13.1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,5 +24,22 @@ INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lxpg4 -lintl"
+CONFIGURE_ARGS=	--with-aclocaldir=${PREFIX}/share/aclocal
 
-.include <bsd.port.mk>
+# Don't use USE_X_PREFIX - the port doesn't really require X11 to run.
+# The reason why it should be in X11BASE is that sawfish (primary user of
+# librep) installs shared object into one of the librep's directories, so
+# they have to live in the same BASE to make PLISTs working.
+# This looks like a little hack, because we have to tweak MTREE_FILE as well,
+# thus partially duplicating bsd.port.mk, but what other choices do we have???
+PREFIX?=	${X11BASE}
+
+.include <bsd.port.pre.mk>
+
+.if ${XFREE86_VERSION} == 3
+MTREE_FILE=	/etc/mtree/BSD.x11.dist
+.else
+MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/lang/librep/distinfo b/lang/librep/distinfo
index dd9afac9ed51..91daf559b2cb 100644
--- a/lang/librep/distinfo
+++ b/lang/librep/distinfo
@@ -1 +1 @@
-MD5 (librep-0.13.tar.gz) = 9e170f6268ebd6987954675b7372c0e7
+MD5 (librep-0.13.1.tar.gz) = 7b7613a1ed7d23e7944db75be0bb95dd
diff --git a/lang/librep2/Makefile b/lang/librep2/Makefile
index 3ce15e69dc0d..af37ba195682 100644
--- a/lang/librep2/Makefile
+++ b/lang/librep2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	librep
-PORTVERSION=	0.13
+PORTVERSION=	0.13.1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,5 +24,22 @@ INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lxpg4 -lintl"
+CONFIGURE_ARGS=	--with-aclocaldir=${PREFIX}/share/aclocal
 
-.include <bsd.port.mk>
+# Don't use USE_X_PREFIX - the port doesn't really require X11 to run.
+# The reason why it should be in X11BASE is that sawfish (primary user of
+# librep) installs shared object into one of the librep's directories, so
+# they have to live in the same BASE to make PLISTs working.
+# This looks like a little hack, because we have to tweak MTREE_FILE as well,
+# thus partially duplicating bsd.port.mk, but what other choices do we have???
+PREFIX?=	${X11BASE}
+
+.include <bsd.port.pre.mk>
+
+.if ${XFREE86_VERSION} == 3
+MTREE_FILE=	/etc/mtree/BSD.x11.dist
+.else
+MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/lang/librep2/distinfo b/lang/librep2/distinfo
index dd9afac9ed51..91daf559b2cb 100644
--- a/lang/librep2/distinfo
+++ b/lang/librep2/distinfo
@@ -1 +1 @@
-MD5 (librep-0.13.tar.gz) = 9e170f6268ebd6987954675b7372c0e7
+MD5 (librep-0.13.1.tar.gz) = 7b7613a1ed7d23e7944db75be0bb95dd