From owner-cvs-ports@FreeBSD.ORG Mon Feb 18 21:48:57 2008 Return-Path: Delivered-To: cvs-ports@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7477816A41A; Mon, 18 Feb 2008 21:48:57 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6A6B213C45E; Mon, 18 Feb 2008 21:48:57 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1ILmvCT094439; Mon, 18 Feb 2008 21:48:57 GMT (envelope-from marius@repoman.freebsd.org) Received: (from marius@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1ILmv96094438; Mon, 18 Feb 2008 21:48:57 GMT (envelope-from marius) Message-Id: <200802182148.m1ILmv96094438@repoman.freebsd.org> From: Marius Strobl Date: Mon, 18 Feb 2008 21:48:57 +0000 (UTC) To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: ports/sysutils/cdrtools-devel Makefile pkg-plist ports/sysutils/cdrtools-devel/files patch-libsiconv-sic_nls.c X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Feb 2008 21:48:57 -0000 marius 2008-02-18 21:48:57 UTC FreeBSD ports repository (src committer) Modified files: sysutils/cdrtools-devel Makefile pkg-plist Added files: sysutils/cdrtools-devel/files patch-libsiconv-sic_nls.c Log: Fix `mkisofs -input-charset`: - The configure script adds dependencies on libiconv and libintl when found so set USE_GETTEXT and USE_ICONV accordingly. If these libraries are not yet installed, these dependencies can be turned off by defining WITHOUT_NLS. There's no easy way to force these dependencies off as the configure script doesn't offer such a knob and modifying its tests is not allowed. - When setting USE_GETTEXT and USE_ICONV, also add OSDEFS to the MAKE_ENV as a hack to pass -I${LOCALBASE}/include as CPPFLAGS so the installed iconv.h is found. - Install the charset conversion tables. - Set ${INS_BASE} to ${LOCALBASE} in DEFAULTS/Defaults.freebsd so the path constructed by libsiconv and mkisofs points to the installed conversion tables. - Fix a bug that caused the 'iconv:' prefix not to be stripped from the implied '-output-charset' when the conversion tables are not found or '-input-charset' is used with the 'iconv:' prefix. Submitted by: jkim Approved by: netchild Revision Changes Path 1.88 +25 -6 ports/sysutils/cdrtools-devel/Makefile 1.1 +45 -0 ports/sysutils/cdrtools-devel/files/patch-libsiconv-sic_nls.c (new) 1.17 +49 -0 ports/sysutils/cdrtools-devel/pkg-plist