5 files changed, 41 insertions, 18 deletions

diff --git a/devel/rvm/Makefile b/devel/rvm/Makefile
index beac163abdf8..0985b32ca210 100644
--- a/devel/rvm/Makefile
+++ b/devel/rvm/Makefile
@@ -6,22 +6,30 @@
 #
 
 PORTNAME=	rvm
-PORTVERSION=	1.14
+PORTVERSION=	1.15
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/rvm/src/ \
 		ftp://ftp.wu-wien.ac.at/pub/systems/coda/src/ \
 		ftp://ftp.planetmirror.com/pub/coda/src/ \
 		ftp://ftp.nctu.edu.tw/mirror/Coda/src/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	wenheping@gmail.com
 COMMENT=	A persistent VM library
 
 LIB_DEPENDS=	lwp.2:${PORTSDIR}/devel/lwp
 
 USE_GMAKE=	yes
+USE_GNOME=	pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
 USE_LDCONFIG=	yes
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+post-extract:
+.for file in pkgs/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's#(libdir)#{prefix}/libdata#g' ${WRKSRC}/${file}
+.endfor
+
 .include <bsd.port.mk>
diff --git a/devel/rvm/distinfo b/devel/rvm/distinfo
index dff2bce371e5..8d55e1a55376 100644
--- a/devel/rvm/distinfo
+++ b/devel/rvm/distinfo
@@ -1,3 +1,3 @@
-MD5 (rvm-1.14.tar.gz) = 41273e290e77a11d15a488f81d118bc7
-SHA256 (rvm-1.14.tar.gz) = 287e56cc565e076ccf40fbcdddd7bf0185bea7df776e90753a8579522b2aa03e
-SIZE (rvm-1.14.tar.gz) = 535982
+MD5 (rvm-1.15.tar.gz) = 69b99e80d6af76d86d2157f8f68be19b
+SHA256 (rvm-1.15.tar.gz) = 8edcf5895e5d8a47e40ba4e3ce71cb677de050793ac0e0c0fdad74877bc74540
+SIZE (rvm-1.15.tar.gz) = 554417
diff --git a/devel/rvm/files/patch-rvm-Makefile.in b/devel/rvm/files/patch-rvm-Makefile.in
new file mode 100644
index 000000000000..0f832110a0a0
--- /dev/null
+++ b/devel/rvm/files/patch-rvm-Makefile.in
@@ -0,0 +1,11 @@
+--- rvm/Makefile.in.orig	2008-04-15 17:13:27.000000000 +0000
++++ rvm/Makefile.in	2008-04-15 17:13:46.000000000 +0000
+@@ -84,7 +84,7 @@
+ rvmutl_SOURCES = rvmutl.c
+ rvmutl_OBJECTS = rvmutl-rvmutl.$(OBJEXT)
+ rvmutl_DEPENDENCIES = librvmlwp.la
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(includedir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
diff --git a/devel/rvm/files/patch-tests-Makefile.in b/devel/rvm/files/patch-tests-Makefile.in
new file mode 100644
index 000000000000..b584616b35dc
--- /dev/null
+++ b/devel/rvm/files/patch-tests-Makefile.in
@@ -0,0 +1,11 @@
+--- tests/Makefile.in.orig	2008-04-15 17:14:06.000000000 +0000
++++ tests/Makefile.in	2008-04-15 17:14:38.000000000 +0000
+@@ -60,7 +60,7 @@
+ am_testrvm_OBJECTS = testrvm.$(OBJEXT)
+ testrvm_OBJECTS = $(am_testrvm_OBJECTS)
+ testrvm_DEPENDENCIES = $(top_builddir)/rvm/librvmlwp.la
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(includedir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
diff --git a/devel/rvm/pkg-plist b/devel/rvm/pkg-plist
index 51c695f91d6b..c65b91c48089 100644
--- a/devel/rvm/pkg-plist
+++ b/devel/rvm/pkg-plist
@@ -2,26 +2,19 @@ include/rvm/rds.h
 include/rvm/rvm.h
 include/rvm/rvm_segment.h
 include/rvm/rvm_statistics.h
-lib/librds.a
-lib/librds.la
-lib/librds.so
-lib/librds.so.3
 lib/librdslwp.a
 lib/librdslwp.la
 lib/librdslwp.so
 lib/librdslwp.so.3
-lib/librvm.a
-lib/librvm.la
-lib/librvm.so
-lib/librvm.so.3
 lib/librvmlwp.a
 lib/librvmlwp.la
 lib/librvmlwp.so
 lib/librvmlwp.so.3
-lib/libseg.a
-lib/libseg.la
-lib/libseg.so
-lib/libseg.so.3
+lib/libseglwp.a
+lib/libseglwp.la
+lib/libseglwp.so
+lib/libseglwp.so.3
+libdata/pkgconfig/rvmlwp.pc
 sbin/rdsinit
 sbin/rvmutl
 @dirrm include/rvm