- Use MAKE_ARGS instead of patch

- Drop patch-configure since USE_LIBTOOL has been here for quite some time now
svn path=/head/; revision=134198
2024-11-22 00:35:15 +00:00 · 2005-04-26 12:53:36 +00:00 · 2005-04-26 12:53:36 +00:00 · 32bd9200d0 · 2021-03-31 03:12:20 +00:00
commit 32bd9200d0
parent d00065c3e1
3 changed files with 1 additions and 21 deletions
--- a/textproc/wv/Makefile
+++ b/textproc/wv/Makefile
@ -29,6 +29,7 @@ USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-exporter --with-libwmf=${LOCALBASE}
 MAKEFILE=	GNUmakefile
+MAKE_ARGS=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
 INSTALLS_SHLIB=	yes

 MAN1=	wvAbw.1 wvCleanLatex.1 wvDVI.1 wvHtml.1 wvLatex.1 wvMime.1 wvPDF.1 \
--- a/textproc/wv/files/patch-GNUmakefile.in
+++ b/textproc/wv/files/patch-GNUmakefile.in
@ -1,11 +0,0 @@
--- GNUmakefile.in.orig	Sat Sep 13 09:37:27 2003
-+++ GNUmakefile.in	Sun Sep 14 18:12:59 2003
-@@ -281,7 +281,7 @@
- 
- OTHERSCRIPTS = wvMime
- 
-pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- 
- pkgconfig_DATA = wv-1.0.pc
- 
--- a/textproc/wv/files/patch-configure
+++ b/textproc/wv/files/patch-configure
@ -1,10 +0,0 @@
--- configure.orig	Fri Jun 13 23:27:28 2003
-+++ configure	Thu Jun 19 20:20:46 2003
-@@ -7533,6 +7533,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'