Date: Mon, 11 Nov 2013 20:43:54 -0800 (PST) From: Douglas William Thrift <douglas@douglasthrift.net> To: FreeBSD-gnats-submit@freebsd.org Cc: douglas@douglasthrift.net Subject: ports/183882: Update port: www/anyterm Fix build with iconv on 10-BETA/11-CURRENT Message-ID: <201311120443.rAC4hoQW007708@slowhand.douglasthrift.net> Resent-Message-ID: <201311120450.rAC4o0IL002227@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 183882
>Category: ports
>Synopsis: Update port: www/anyterm Fix build with iconv on 10-BETA/11-CURRENT
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Nov 12 04:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Douglas William Thrift
>Release: FreeBSD 9.2-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD journeyman-freebsd.douglasthrift.net 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Thu Sep 26 22:50:31 UTC 2013 root@bake.isc.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
Fix build with iconv in base and add STAGE support for www/anyterm.
>How-To-Repeat:
>Fix:
--- anyterm.2013-11-12T043247Z.diff begins here ---
diff -Nrux .svn -x work /usr/ports/www/anyterm/Makefile anyterm/Makefile
--- /usr/ports/www/anyterm/Makefile 2013-09-20 16:36:50.000000000 -0700
+++ anyterm/Makefile 2013-11-10 17:54:51.000000000 -0800
@@ -1,4 +1,4 @@
-# Created by: Douglas Thrift
+# Created by: Douglas Thrift <douglas@douglasthrift.net>
# $FreeBSD: www/anyterm/Makefile 327776 2013-09-20 23:36:50Z bapt $
PORTNAME= anyterm
@@ -16,26 +16,25 @@
BUILD_DEPENDS= ${LOCALBASE}/include/boost/function.hpp:${PORTSDIR}/devel/boost-libs
-MAN1= anytermd.1
USE_RC_SUBR= anytermd
USE_BZIP2= yes
USE_GMAKE= yes
USES= iconv
USE_GCC= any
ALL_TARGET= default_target
-PLIST_FILES= sbin/anytermd
+PLIST_FILES= man/man1/anytermd.1.gz \
+ sbin/anytermd
-NO_STAGE= yes
post-patch:
@${REINPLACE_CMD} -e 's|/private/etc/apache2|${FILESDIR}|' \
${WRKSRC}/scripts/mimetype.sh
@${REINPLACE_CMD} -e 's|^CPP_FLAGS=|&-I${LOCALBASE}/include |' \
- -e 's|^LINK_FLAGS=|&-L${LOCALBASE}/lib |' ${WRKSRC}/common.mk
+ -e 's|^LINK_FLAGS=|&-L${ICONV_PREFIX}/lib ${ICONV_LIB} |' ${WRKSRC}/common.mk
@${REINPLACE_CMD} -e 's|^COMPILE_FLAGS=|&-I${LOCALBASE}/include |' \
${WRKSRC}/libpbe/common.mk
do-install:
- @${INSTALL_PROGRAM} ${WRKSRC}/anytermd ${PREFIX}/sbin/anytermd
- @${INSTALL_MAN} ${WRKSRC}/anytermd.1 ${MANPREFIX}/man/man1/anytermd.1
+ @${INSTALL_PROGRAM} ${WRKSRC}/anytermd ${STAGEDIR}${PREFIX}/sbin/anytermd
+ @${INSTALL_MAN} ${WRKSRC}/anytermd.1 ${STAGEDIR}${MANPREFIX}/man/man1/anytermd.1
.include <bsd.port.mk>
diff -Nrux .svn -x work /usr/ports/www/anyterm/files/patch-common.mk anyterm/files/patch-common.mk
--- /usr/ports/www/anyterm/files/patch-common.mk 2012-07-14 07:29:18.000000000 -0700
+++ anyterm/files/patch-common.mk 1969-12-31 16:00:00.000000000 -0800
@@ -1,11 +0,0 @@
---- common.mk.orig 2009-11-20 00:32:31.545770710 -0800
-+++ common.mk 2009-11-20 00:32:51.669545361 -0800
-@@ -51,7 +51,7 @@
- LINK_FLAGS=${GCC_FLAGS} ${DEBUG_FLAGS} \
- -lutil
-
--ifeq (${UNAME_S},OpenBSD)
-+ifeq (${UNAME_S},FreeBSD)
- LINK_FLAGS+=-liconv
- endif
-
--- anyterm.2013-11-12T043247Z.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311120443.rAC4hoQW007708>