diff options
author | tijl <tijl@FreeBSD.org> | 2014-09-18 17:51:18 +0800 |
---|---|---|
committer | tijl <tijl@FreeBSD.org> | 2014-09-18 17:51:18 +0800 |
commit | 685e47c8dd1541deea68ef6c18f574fbb7dcaa42 (patch) | |
tree | 79cbd5d1e51a5090ff9b9d930fd5934c2fe55461 /converters/enca | |
parent | ffe7c5f15762ac6fa17a617df159a6d9a627b0b0 (diff) | |
download | freebsd-ports-gnome-685e47c8dd1541deea68ef6c18f574fbb7dcaa42.tar.gz freebsd-ports-gnome-685e47c8dd1541deea68ef6c18f574fbb7dcaa42.tar.zst freebsd-ports-gnome-685e47c8dd1541deea68ef6c18f574fbb7dcaa42.zip |
- Replace patch with USES=pathfix and post-patch command
- Remove old libtool patch
- Remove post-patch command that isn't needed with staging
Diffstat (limited to 'converters/enca')
-rw-r--r-- | converters/enca/Makefile | 11 | ||||
-rw-r--r-- | converters/enca/files/patch-Makefile.in | 32 | ||||
-rw-r--r-- | converters/enca/files/patch-configure | 10 |
3 files changed, 5 insertions, 48 deletions
diff --git a/converters/enca/Makefile b/converters/enca/Makefile index eade2612a514..726dd2d03b44 100644 --- a/converters/enca/Makefile +++ b/converters/enca/Makefile @@ -17,17 +17,16 @@ RUN_DEPENDS= umap:${PORTSDIR}/converters/p5-Unicode-Map8 LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= gmake libtool pkgconfig iconv tar:bzip2 -GNU_CONFIGURE= yes +USES= gmake iconv libtool pathfix pkgconfig tar:bzip2 USE_LDCONFIG= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} - CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= DOCS -post-patch:: - @${REINPLACE_CMD} -e 's/$$(LN_S)/$$(LN_S) -f/' ${WRKSRC}/src/Makefile.in +post-patch: + @${REINPLACE_CMD} '/SUBDIRS =/s/test//' ${WRKSRC}/src/Makefile.in .include <bsd.port.mk> diff --git a/converters/enca/files/patch-Makefile.in b/converters/enca/files/patch-Makefile.in deleted file mode 100644 index c8cfb3be0991..000000000000 --- a/converters/enca/files/patch-Makefile.in +++ /dev/null @@ -1,32 +0,0 @@ ---- Makefile.in.orig 2010-02-09 11:23:03.000000000 +0100 -+++ Makefile.in 2010-12-30 21:08:30.000000000 +0100 -@@ -245,6 +245,7 @@ - infodir = @infodir@ - install_sh = @install_sh@ - libdir = @libdir@ -+libdatadir = $(exec_prefix)/libdata - libexecdir = @libexecdir@ - localedir = @localedir@ - localstatedir = @localstatedir@ -@@ -264,10 +265,10 @@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --@MAINTAINER_MODE_FALSE@SUBDIRS = tools script lib src devel-docs test -+@MAINTAINER_MODE_FALSE@SUBDIRS = tools script lib src devel-docs - - # @(#) $Id: Makefile.am,v 1.35 2005/11/24 10:21:32 yeti Exp $ --@MAINTAINER_MODE_TRUE@SUBDIRS = tools data script lib src devel-docs test -+@MAINTAINER_MODE_TRUE@SUBDIRS = tools data script lib src devel-docs - man_MANS = man/enca.1 - DISTCHECK_CONFIGURE_FLAGS = --enable-maintainer-mode - ACLOCAL_AMFLAGS = -I m4 -@@ -299,7 +300,7 @@ - man/enca.1 \ - $(M4TESTS) - --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = $(libdatadir)/pkgconfig - pkgconfig_DATA = enca.pc - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/converters/enca/files/patch-configure b/converters/enca/files/patch-configure deleted file mode 100644 index 9cf2cb6629ca..000000000000 --- a/converters/enca/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig 2010-02-09 11:23:03.000000000 +0100 -+++ configure 2010-12-30 21:12:31.000000000 +0100 -@@ -7156,6 +7156,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ltmain" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' |