4 files changed, 5 insertions, 27 deletions

diff --git a/devel/rvm/Makefile b/devel/rvm/Makefile
index 62e107997271..ca26473ad708 100644
--- a/devel/rvm/Makefile
+++ b/devel/rvm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rvm
-PORTVERSION=	1.15
+PORTVERSION=	1.16
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/rvm/src/ \
 		ftp://ftp.wu-wien.ac.at/pub/systems/coda/src/ \
@@ -26,7 +26,7 @@ USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 post-extract:
-.for file in pkgs/Makefile.in
+.for file in Makefile.in
 	@${REINPLACE_CMD} -e \
 		's#(libdir)#{prefix}/libdata#g' ${WRKSRC}/${file}
 .endfor
diff --git a/devel/rvm/distinfo b/devel/rvm/distinfo
index 8d55e1a55376..4f3ddb7badcb 100644
--- a/devel/rvm/distinfo
+++ b/devel/rvm/distinfo
@@ -1,3 +1,3 @@
-MD5 (rvm-1.15.tar.gz) = 69b99e80d6af76d86d2157f8f68be19b
-SHA256 (rvm-1.15.tar.gz) = 8edcf5895e5d8a47e40ba4e3ce71cb677de050793ac0e0c0fdad74877bc74540
-SIZE (rvm-1.15.tar.gz) = 554417
+MD5 (rvm-1.16.tar.gz) = 2165aa17417deec45d8433deeadf935f
+SHA256 (rvm-1.16.tar.gz) = 14549596db2608ab8d4b780e95526caf14f68f7257a1f599973af30c7725884b
+SIZE (rvm-1.16.tar.gz) = 553968
diff --git a/devel/rvm/files/patch-rvm-Makefile.in b/devel/rvm/files/patch-rvm-Makefile.in
deleted file mode 100644
index 0f832110a0a0..000000000000
--- a/devel/rvm/files/patch-rvm-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index b584616b35dc..000000000000
--- a/devel/rvm/files/patch-tests-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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) \