aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvs <vs@FreeBSD.org>2005-04-26 20:53:36 +0800
committervs <vs@FreeBSD.org>2005-04-26 20:53:36 +0800
commit8bfc8ee7319d5b0f137f817a27421b818c2222fe (patch)
treeed5d116cff6027b93994962f6684fb6c181d2b69
parente81783e464e4e944ccc265352b84ddd18ec654cb (diff)
downloadfreebsd-ports-gnome-8bfc8ee7319d5b0f137f817a27421b818c2222fe.tar.gz
freebsd-ports-gnome-8bfc8ee7319d5b0f137f817a27421b818c2222fe.tar.zst
freebsd-ports-gnome-8bfc8ee7319d5b0f137f817a27421b818c2222fe.zip
- Use MAKE_ARGS instead of patch
- Drop patch-configure since USE_LIBTOOL has been here for quite some time now
-rw-r--r--textproc/wv/Makefile1
-rw-r--r--textproc/wv/files/patch-GNUmakefile.in11
-rw-r--r--textproc/wv/files/patch-configure10
3 files changed, 1 insertions, 21 deletions
diff --git a/textproc/wv/Makefile b/textproc/wv/Makefile
index 66ba9bb93ed7..3fea3b925b5e 100644
--- 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 \
diff --git a/textproc/wv/files/patch-GNUmakefile.in b/textproc/wv/files/patch-GNUmakefile.in
deleted file mode 100644
index 559f8235c128..000000000000
--- a/textproc/wv/files/patch-GNUmakefile.in
+++ /dev/null
@@ -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
-
diff --git a/textproc/wv/files/patch-configure b/textproc/wv/files/patch-configure
deleted file mode 100644
index 7dc89cfbe49e..000000000000
--- a/textproc/wv/files/patch-configure
+++ /dev/null
@@ -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'