diff options
author | Alexis Ballier <aballier@gentoo.org> | 2010-03-11 11:02:32 +0000 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2010-03-11 11:02:32 +0000 |
commit | d80a4b11c2a971811f03ca09429397f5bd3c7b79 (patch) | |
tree | 230926b959175ecffecf3e8fb98326c193f5006c /sys-freebsd/freebsd-ubin | |
parent | Version bump. Use pregenerated docs and install to correct path wrt #294276. (diff) | |
download | historical-d80a4b11c2a971811f03ca09429397f5bd3c7b79.tar.gz historical-d80a4b11c2a971811f03ca09429397f5bd3c7b79.tar.bz2 historical-d80a4b11c2a971811f03ca09429397f5bd3c7b79.zip |
remove old
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'sys-freebsd/freebsd-ubin')
6 files changed, 8 insertions, 487 deletions
diff --git a/sys-freebsd/freebsd-ubin/ChangeLog b/sys-freebsd/freebsd-ubin/ChangeLog index e27db0d716ae..a87704743782 100644 --- a/sys-freebsd/freebsd-ubin/ChangeLog +++ b/sys-freebsd/freebsd-ubin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-freebsd/freebsd-ubin -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.63 2009/10/08 08:00:32 aballier Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.64 2010/03/11 10:55:15 aballier Exp $ + + 11 Mar 2010; Alexis Ballier <aballier@gentoo.org> + -files/freebsd-ubin-6.1-gcc41.patch, -freebsd-ubin-6.2-r2.ebuild, + -files/freebsd-ubin-6.2-make-sinclude.patch, + -files/freebsd-ubin-6.2-rpcgen-gcc4.1.patch, -freebsd-ubin-7.1-r1.ebuild: + remove old 08 Oct 2009; Alexis Ballier <aballier@gentoo.org> freebsd-ubin-7.1-r1.ebuild, freebsd-ubin-7.2.ebuild: diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.1-gcc41.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.1-gcc41.patch deleted file mode 100644 index 00d7a9e96b22..000000000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.1-gcc41.patch +++ /dev/null @@ -1,35 +0,0 @@ -Index: fbsd-6.1/usr.bin/window/wwgets.c -=================================================================== ---- fbsd-6.1.orig/usr.bin/window/wwgets.c -+++ fbsd-6.1/usr.bin/window/wwgets.c -@@ -43,6 +43,8 @@ static char rcsid[] = - #include "ww.h" - #include "char.h" - -+static void rub(); -+ - wwgets(buf, n, w) - char *buf; - int n; -@@ -51,7 +53,6 @@ register struct ww *w; - register char *p = buf; - register int c; - char uc = w->ww_unctrl; -- static void rub(); - - w->ww_unctrl = 0; - for (;;) { -Index: fbsd-6.1/usr.bin/xlint/xlint/xlint.c -=================================================================== ---- fbsd-6.1.orig/usr.bin/xlint/xlint/xlint.c -+++ fbsd-6.1/usr.bin/xlint/xlint/xlint.c -@@ -402,7 +402,8 @@ main(int argc, char *argv[]) - break; - - case 'p': -- appcstrg(&lcflags, "-Wtraditional -Wno-system-headers"); -+ appcstrg(&lcflags, "-Wtraditional"); -+ appcstrg(&lcflags, "-Wno-system-headers"); - appcstrg(&l1flags, "-p"); - appcstrg(&l2flags, "-p"); - if (*deflibs != NULL) { diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.2-make-sinclude.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.2-make-sinclude.patch deleted file mode 100644 index 73256172fff0..000000000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.2-make-sinclude.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- usr.bin/make/parse.c.orig 2007-09-04 14:39:07 +0100 -+++ usr.bin/make/parse.c 2007-09-04 14:51:00 +0100 -@@ -1602,8 +1602,8 @@ - * ParseTraditionalInclude -- - * Push to another file. - * -- * The input is the line minus the "include". The file name is -- * the string following the "include". -+ * The input is the current line. The file name(s) are -+ * following the "include". - * - * Results: - * None -@@ -1614,10 +1614,12 @@ - *--------------------------------------------------------------------- - */ - static void --ParseTraditionalInclude(char *file) -+ParseTraditionalInclude(char *line) - { - char *fullname; /* full pathname of file */ - char *cp; /* current position in file spec */ -+ int silent = (line[0] != 'i') ? 1 : 0; -+ char *file = &line[silent + 7]; - - /* - * Skip over whitespace -@@ -1665,7 +1667,9 @@ - } - - if (fullname == NULL) { -- Parse_Error(PARSE_FATAL, "Could not find %s", file); -+ if (!silent) { -+ Parse_Error(PARSE_FATAL, "Could not find %s", file); -+ } - /* XXXHB free(file) */ - return; - } -@@ -2416,14 +2420,16 @@ - } - } - #ifdef SYSVINCLUDE -- } else if (strncmp(line, "include", 7) == 0 && -- isspace((unsigned char)line[7]) && -- strchr(line, ':') == NULL) { -+ } else if (((strncmp(line, "include", 7) == 0 && -+ isspace((unsigned char) line[7])) || -+ ((line[0] == 's' || line[0] == '-') && -+ strncmp(&line[1], "include", 7) == 0 && -+ isspace((unsigned char) line[8]))) && -+ strchr(line, ':') == NULL) { - /* - * It's an S3/S5-style "include". - */ -- ParseTraditionalInclude(line + 7); -- goto nextLine; -+ ParseTraditionalInclude(line); - #endif - } else if (Parse_IsVar(line)) { - ParseFinishLine(); diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.2-rpcgen-gcc4.1.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.2-rpcgen-gcc4.1.patch deleted file mode 100644 index fffd69ebbde4..000000000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.2-rpcgen-gcc4.1.patch +++ /dev/null @@ -1,131 +0,0 @@ -Index: fbsd-6.2/usr.bin/rpcgen/rpc_hout.c -=================================================================== ---- fbsd-6.2.orig/usr.bin/rpcgen/rpc_hout.c -+++ fbsd-6.2/usr.bin/rpcgen/rpc_hout.c -@@ -50,7 +50,7 @@ void storexdrfuncdecl( char *, int ); - static void pconstdef( definition * ); - static void pstructdef( definition * ); - static void puniondef( definition * ); --static void pprogramdef( definition *, int ); -+static void pprogramdef( definition *, int, int ); - static void pstructdef( definition * ); - static void penumdef( definition * ); - static void ptypedef( definition * ); -@@ -64,7 +64,7 @@ void pdeclaration( char *, declaration * - * Print the C-version of an xdr definition - */ - void --print_datadef(definition *def, int headeronly) -+print_datadef(definition *def, int headeronly, int nomain) - { - - if (def->def_kind == DEF_PROGRAM) /* handle data only */ -@@ -87,7 +87,7 @@ print_datadef(definition *def, int heade - ptypedef(def); - break; - case DEF_PROGRAM: -- pprogramdef(def, headeronly); -+ pprogramdef(def, headeronly, nomain); - break; - case DEF_CONST: - pconstdef(def); -@@ -103,12 +103,12 @@ print_datadef(definition *def, int heade - - - void --print_funcdef(definition *def, int headeronly) -+print_funcdef(definition *def, int headeronly, int nomain) - { - switch (def->def_kind) { - case DEF_PROGRAM: - f_print(fout, "\n"); -- pprogramdef(def, headeronly); -+ pprogramdef(def, headeronly, nomain); - break; - default: - break; -@@ -313,7 +313,7 @@ pdispatch(char * name, char *vers, int m - } - - static void --pprogramdef(definition *def, int headeronly) -+pprogramdef(definition *def, int headeronly, int nomain) - { - version_list *vers; - proc_list *proc; -@@ -341,7 +341,7 @@ pprogramdef(definition *def, int headero - - if(!Cflag){ - ext = "extern "; -- if (headeronly) { -+ if (headeronly && nomain) { - f_print(fout, "%s", ext); - pdispatch(def->def_name, vers->vers_num, 2); - } -@@ -372,7 +372,7 @@ pprogramdef(definition *def, int headero - ext = "extern "; - } - -- if (headeronly) { -+ if (headeronly && nomain) { - f_print(fout, "%s", ext); - pdispatch(def->def_name, vers->vers_num, - i); -Index: fbsd-6.2/usr.bin/rpcgen/rpc_main.c -=================================================================== ---- fbsd-6.2.orig/usr.bin/rpcgen/rpc_main.c -+++ fbsd-6.2/usr.bin/rpcgen/rpc_main.c -@@ -61,7 +61,7 @@ extern int write_sample_clnt( definition - extern void write_sample_clnt_main( void ); - extern void add_sample_msg( void ); - static void c_output( char *, char *, int, char * ); --static void h_output( char *, char *, int, char *, int ); -+static void h_output( char *, char *, int, char *, int, int ); - static void l_output( char *, char *, int, char * ); - static void t_output( char *, char *, int, char * ); - static void clnt_output( char *, char *, int, char * ); -@@ -173,7 +173,7 @@ main(argc, argv) - c_output(cmd.infile, "-DRPC_XDR", DONT_EXTEND, cmd.outfile); - } else if (cmd.hflag) { - h_output(cmd.infile, "-DRPC_HDR", DONT_EXTEND, cmd.outfile, -- cmd.hflag); -+ cmd.hflag, cmd.nflag); - } else if (cmd.lflag) { - l_output(cmd.infile, "-DRPC_CLNT", DONT_EXTEND, cmd.outfile); - } else if (cmd.sflag || cmd.mflag || (cmd.nflag)) { -@@ -193,7 +193,7 @@ main(argc, argv) - /* the rescans are required, since cpp may effect input */ - c_output(cmd.infile, "-DRPC_XDR", EXTEND, "_xdr.c"); - reinitialize(); -- h_output(cmd.infile, "-DRPC_HDR", EXTEND, ".h", cmd.hflag); -+ h_output(cmd.infile, "-DRPC_HDR", EXTEND, ".h", cmd.hflag, cmd.nflag); - reinitialize(); - l_output(cmd.infile, "-DRPC_CLNT", EXTEND, "_clnt.c"); - reinitialize(); -@@ -515,7 +515,7 @@ char *generate_guard(pathname) - - - static void --h_output(char *infile, char *define, int extend, char *outfile, int headeronly) -+h_output(char *infile, char *define, int extend, char *outfile, int headeronly, int nomain) - { - definition *def; - char *outfilename; -@@ -555,7 +555,7 @@ h_output(char *infile, char *define, int - - /* print data definitions */ - while ( (def = get_definition()) ) { -- print_datadef(def, headeronly); -+ print_datadef(def, headeronly, nomain); - } - - /* -@@ -564,7 +564,7 @@ h_output(char *infile, char *define, int - * arguments for functions - */ - for (l = defined; l != NULL; l = l->next) { -- print_funcdef(l->val, headeronly); -+ print_funcdef(l->val, headeronly, nomain); - } - /* Now print all xdr func declarations */ - if (xdrfunc_head != NULL){ diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2-r2.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2-r2.ebuild deleted file mode 100644 index 8f1780faaf09..000000000000 --- a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2-r2.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2-r2.ebuild,v 1.5 2008/06/10 19:03:27 aballier Exp $ - -inherit bsdmk freebsd flag-o-matic pam - -DESCRIPTION="FreeBSD's base system source for /usr/bin" -SLOT="0" -KEYWORDS="~sparc-fbsd ~x86-fbsd" - -IUSE="atm bluetooth ssl usb nls ipv6 kerberos nis build" - -SRC_URI="mirror://gentoo/${UBIN}.tar.bz2 - mirror://gentoo/${CONTRIB}.tar.bz2 - mirror://gentoo/${LIB}.tar.bz2 - mirror://gentoo/${ETC}.tar.bz2 - mirror://gentoo/${BIN}.tar.bz2 - mirror://gentoo/${INCLUDE}.tar.bz2 - build? ( mirror://gentoo/${SYS}.tar.bz2 )" - -RDEPEND=">=sys-freebsd/freebsd-lib-6.2_rc2 - ssl? ( dev-libs/openssl ) - kerberos? ( virtual/krb5 ) - virtual/pam - sys-libs/zlib - !dev-util/csup" - -DEPEND="${RDEPEND} - sys-devel/flex - !build? ( =sys-freebsd/freebsd-sources-${RV}* ) - =sys-freebsd/freebsd-mk-defs-${RV}*" - -RDEPEND="${RDEPEND} - >=sys-auth/pambase-20080219.1 - sys-process/cronbase" - -S="${WORKDIR}/usr.bin" - -pkg_setup() { - use nls || mymakeopts="${mymakeopts} NO_NLS= " - use atm || mymakeopts="${mymakeopts} NO_ATM= " - use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= " - use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= " - use usb || mymakeopts="${mymakeopts} NO_USB= " - use ipv6 || mymakeopts="${mymakeopts} NO_INET6= " - use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= " - use nis || mymakeopts="${mymakeopts} NO_NIS= " - - mymakeopts="${mymakeopts} NO_SENDMAIL= " -} - -# List of patches to apply -PATCHES="${FILESDIR}/${PN}-6.0-bsdcmp.patch - ${FILESDIR}/${PN}-6.0-fixmakefiles.patch - ${FILESDIR}/${PN}-setXid.patch - ${FILESDIR}/${PN}-lint-stdarg.patch - ${FILESDIR}/${PN}-6.0-kdump-ioctl.patch - ${FILESDIR}/${PN}-6.1-gcc41.patch - ${FILESDIR}/${PN}-6.2-make-sinclude.patch - ${FILESDIR}/${PN}-6.2-rpcgen-gcc4.1.patch" - -# Here we remove some sources we don't need because they are already -# provided by portage's packages or similar. In order: -# - Archiving tools, provided by their own ebuilds -# - ncurses stuff -# - less stuff -# - bind utils -# - rsh stuff -# and the rest are misc utils we already provide somewhere else. -REMOVE_SUBDIRS="bzip2 bzip2recover tar - tput tset - less lessecho lesskey - dig hesinfo nslookup nsupdate host - rsh rlogin rusers rwho ruptime - compile_et lex vi smbutil file vacation nc ftp telnet - c99 c89 - whois tftp" - -src_unpack() { - freebsd_src_unpack - - use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" - - # Rename manpage for renamed cmp - mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 - # Fix whereis(1) manpath search. - sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h" - - # Build a dynamic make - sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/make/Makefile -} - -src_install() { - freebsd_src_install - - # baselayout requires these in /bin - dodir /bin - for bin in sed; do - mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed" - dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed" - done - - for pamdfile in login passwd su; do - newpamd "${FILESDIR}/${pamdfile}.1.pamd" ${pamdfile} - done - - cd "${WORKDIR}/etc" - insinto /etc - doins remote phones opieaccess fbtab - - exeinto /etc/cron.daily - newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb -} - -pkg_postinst() { - # We need to ensure that login.conf.db is up-to-date. - if [[ -e "${ROOT}"etc/login.conf ]] ; then - einfo "Updating ${ROOT}etc/login.conf.db" - "${ROOT}"usr/bin/cap_mkdb -f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf - elog "Remember to run cap_mkdb /etc/login.conf after making changes to it" - fi -} diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-7.1-r1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-7.1-r1.ebuild deleted file mode 100644 index 598948c9fdbc..000000000000 --- a/sys-freebsd/freebsd-ubin/freebsd-ubin-7.1-r1.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-7.1-r1.ebuild,v 1.2 2009/10/08 08:00:32 aballier Exp $ - -EAPI=2 - -inherit bsdmk freebsd flag-o-matic pam - -DESCRIPTION="FreeBSD's base system source for /usr/bin" -SLOT="0" -KEYWORDS="~sparc-fbsd ~x86-fbsd" - -SRC_URI="mirror://gentoo/${UBIN}.tar.bz2 - mirror://gentoo/${CONTRIB}.tar.bz2 - mirror://gentoo/${LIB}.tar.bz2 - mirror://gentoo/${ETC}.tar.bz2 - mirror://gentoo/${BIN}.tar.bz2 - mirror://gentoo/${INCLUDE}.tar.bz2 - build? ( mirror://gentoo/${SYS}.tar.bz2 )" - -RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?] - ssl? ( dev-libs/openssl ) - kerberos? ( virtual/krb5 ) - virtual/pam - sys-libs/zlib - !dev-util/csup" - -DEPEND="${RDEPEND} - sys-devel/flex - !build? ( =sys-freebsd/freebsd-sources-${RV}* ) - =sys-freebsd/freebsd-mk-defs-${RV}*" - -RDEPEND="${RDEPEND} - >=sys-auth/pambase-20080219.1 - sys-process/cronbase" - -S="${WORKDIR}/usr.bin" - -IUSE="atm audit bluetooth ipv6 kerberos netware nis ssl usb build" - -pkg_setup() { - use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " - use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= " - use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= " - use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= " - use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= " - use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " - use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " - use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " - use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " -} - -# List of patches to apply -PATCHES="${FILESDIR}/${PN}-6.0-bsdcmp.patch - ${FILESDIR}/${PN}-6.0-fixmakefiles.patch - ${FILESDIR}/${PN}-setXid.patch - ${FILESDIR}/${PN}-lint-stdarg.patch - ${FILESDIR}/${PN}-6.0-kdump-ioctl.patch" - -# Here we remove some sources we don't need because they are already -# provided by portage's packages or similar. In order: -# - Archiving tools, provided by their own ebuilds -# - ncurses stuff -# - less stuff -# - bind utils -# - rsh stuff -# - binutils gprof -# and the rest are misc utils we already provide somewhere else. -REMOVE_SUBDIRS="bzip2 bzip2recover tar - gzip gprof - tput tset - less lessecho lesskey - dig hesinfo nslookup nsupdate host - rsh rlogin rusers rwho ruptime - compile_et lex vi smbutil file vacation nc ftp telnet - c99 c89 - whois tftp" - -pkg_preinst() { - # bison installs a /usr/bin/yacc symlink ... - # we need to remove it to avoid triggering - # collision-protect errors - if [[ -L ${ROOT}/usr/bin/yacc ]] ; then - rm -f "${ROOT}"/usr/bin/yacc - fi -} - -src_prepare() { - use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" - - # Rename manpage for renamed cmp - mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 - # Fix whereis(1) manpath search. - sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h" - - # Build a dynamic make - sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/make/Makefile -} - -src_install() { - freebsd_src_install - - # baselayout requires these in /bin - dodir /bin - for bin in sed; do - mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed" - dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed" - done - - for pamdfile in login passwd su; do - newpamd "${FILESDIR}/${pamdfile}.1.pamd" ${pamdfile} - done - - cd "${WORKDIR}/etc" - insinto /etc - doins remote phones opieaccess fbtab - - exeinto /etc/cron.daily - newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb -} - -pkg_postinst() { - # We need to ensure that login.conf.db is up-to-date. - if [[ -e "${ROOT}"etc/login.conf ]] ; then - einfo "Updating ${ROOT}etc/login.conf.db" - "${ROOT}"usr/bin/cap_mkdb -f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf - elog "Remember to run cap_mkdb /etc/login.conf after making changes to it" - fi -} - -pkg_postrm() { - # and if we uninstall yacc but keep bison, - # lets restore the /usr/bin/yacc symlink - if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then - ln -s yacc.bison "${ROOT}"/usr/bin/yacc - fi -} |