From owner-p4-projects@FreeBSD.ORG Thu Aug 6 23:06:18 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46242106566C; Thu, 6 Aug 2009 23:06:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DEDD4106564A for ; Thu, 6 Aug 2009 23:06:17 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CF44F8FC16 for ; Thu, 6 Aug 2009 23:06:17 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n76N6HM6016752 for ; Thu, 6 Aug 2009 23:06:17 GMT (envelope-from delphij@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n76N6Hm2016750 for perforce@freebsd.org; Thu, 6 Aug 2009 23:06:17 GMT (envelope-from delphij@freebsd.org) Date: Thu, 6 Aug 2009 23:06:17 GMT Message-Id: <200908062306.n76N6Hm2016750@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to delphij@freebsd.org using -f From: Xin LI To: Perforce Change Reviews Cc: Subject: PERFORCE change 167077 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Aug 2009 23:06:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=167077 Change 167077 by delphij@charlie on 2009/08/06 23:05:56 - Make usr.bin/ build after a 'make obj'. - While I'm there, remove dependency to libroken, the only reference to it seems to be 'estrdup', which is being handled by code after it. Affected files ... .. //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/iconv/Makefile#5 edit .. //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/iconv/iconv.c#5 edit .. //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/mkcsmapper/Makefile#5 edit .. //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/mkesdb/Makefile#5 edit Differences ... ==== //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/iconv/Makefile#5 (text+ko) ==== @@ -2,7 +2,7 @@ .include -.PATH: ../../lib/libiconv +.PATH: ${.CURDIR}/../../lib/libiconv PROG= iconv SRCS= iconv.c \ @@ -19,12 +19,12 @@ citrus_bcs.c \ citrus_bcs_strtol.c \ citrus_db_hash.c -CFLAGS+= -I. -I${.CURDIR} -I../../lib/libiconv +CFLAGS+= -I. -I${.CURDIR} -I${.CURDIR}/../../lib/libiconv MAN= iconv.1 WARNS?= 6 -LDADD+=-lroken -lcrypt -DPADD+=${LIBROKEN} ${LIBCRYPT} +LDADD+= -lcrypt +DPADD+= ${LIBCRYPT} .include ==== //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/iconv/iconv.c#5 (text+ko) ==== @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -186,11 +185,11 @@ break; case 'f': /* from */ - opt_f = estrdup(optarg); + opt_f = strdup(optarg); break; case 't': /* to */ - opt_t = estrdup(optarg); + opt_t = strdup(optarg); break; default: usage(); ==== //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/mkcsmapper/Makefile#5 (text+ko) ==== @@ -1,12 +1,12 @@ # $NetBSD: Makefile,v 1.6 2009/04/20 16:05:30 drochner Exp $ -.PATH: ../../lib/libiconv ../../lib/libiconv_modules/mapper_std +.PATH: ${.CURDIR}/../../lib/libiconv ${.CURDIR}/../../lib/libiconv_modules/mapper_std PROG= mkcsmapper SRCS= yacc.y lex.l \ citrus_db_factory.c citrus_bcs.c citrus_db_hash.c \ citrus_lookup_factory.c citrus_pivot_factory.c -CFLAGS+= -I. -I../../lib/libiconv -I../../lib/libiconv_modules/mapper_std +CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../lib/libiconv -I${.CURDIR}/../../lib/libiconv_modules/mapper_std NO_MAN= yes WARNS?= 6 ==== //depot/projects/soc2009/gabor_iconv/extracted/usr.bin/mkesdb/Makefile#5 (text+ko) ==== @@ -1,12 +1,12 @@ # $NetBSD: Makefile,v 1.6 2009/04/20 16:05:30 drochner Exp $ -.PATH: ../../lib/libiconv +.PATH: ${.CURDIR}/../../lib/libiconv PROG= mkesdb SRCS= yacc.y lex.l \ citrus_bcs.c citrus_db_factory.c citrus_db_hash.c \ citrus_lookup_factory.c -CFLAGS+= -I. -I../../lib/libiconv +CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../lib/libiconv NO_MAN= yes WARNS?= 6