From 293f5a93b77d92fd65db7f3d0df654f102e46cfb Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Sun, 11 Dec 2016 16:04:20 -0800 Subject: Move to flat package hierarchy Note to self: never try to move submodules again To migrate your existing submodules (more or less): set -x set -e mkdir .git/modules/pkg for old in */*/src ; do new="pkg/${old#*/}" if ! [ -f "$old/.git" ] || [ "${old%%/*}" = pkg ] ; then continue fi git -C ".git/modules/$old" config core.worktree "../../../../../$new" rmdir "$new" mv "$old" "$new" sed -e "s,$old,$new," "$new/.git" > "$new/.git.tmp" mv "$new/.git.tmp" "$new/.git" mkdir ".git/modules/${new%/src}" mv ".git/modules/$old" ".git/modules/$new" rm "${old%/src}"/*.ninja mv "${old%/src}"/*.tar.{gz,xz,bz2} "${new%/src}/" rmdir "${old%/src}" || true done sed -e 's,^\[submodule "[^/]*/,[submodule "pkg/,' .git/config > .git/config.tmp mv .git/config.tmp .git/config --- pkg/mdocml/.gitignore | 2 ++ pkg/mdocml/config.h | 34 ++++++++++++++++++++++++ pkg/mdocml/gen.rc | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++ pkg/mdocml/rev | 1 + pkg/mdocml/sha256 | 1 + pkg/mdocml/url | 1 + 6 files changed, 112 insertions(+) create mode 100644 pkg/mdocml/.gitignore create mode 100644 pkg/mdocml/config.h create mode 100644 pkg/mdocml/gen.rc create mode 100644 pkg/mdocml/rev create mode 100644 pkg/mdocml/sha256 create mode 100644 pkg/mdocml/url (limited to 'pkg/mdocml') diff --git a/pkg/mdocml/.gitignore b/pkg/mdocml/.gitignore new file mode 100644 index 00000000..0da61be7 --- /dev/null +++ b/pkg/mdocml/.gitignore @@ -0,0 +1,2 @@ +/mdocml-1.13.4.tar.gz +/src diff --git a/pkg/mdocml/config.h b/pkg/mdocml/config.h new file mode 100644 index 00000000..86d08114 --- /dev/null +++ b/pkg/mdocml/config.h @@ -0,0 +1,34 @@ +#include + +#define HAVE_DIRENT_NAMLEN 0 +#define HAVE_ERR 1 +#define HAVE_FTS 1 +#define HAVE_PLEDGE 0 +#define HAVE_PROGNAME 1 +#define HAVE_REALLOCARRAY 1 +#define HAVE_REWB_BSD 0 +#define HAVE_REWB_SYSV 1 +#define HAVE_SANDBOX_INIT 0 +#define HAVE_STRCASESTR 1 +#define HAVE_STRINGLIST 0 +#define HAVE_STRLCAT 1 +#define HAVE_STRLCPY 1 +#define HAVE_STRSEP 1 +#define HAVE_STRTONUM 1 +#define HAVE_VASPRINTF 1 +#define HAVE_WCHAR 1 +#define HAVE_SQLITE3 0 +#define HAVE_SQLITE3_ERRSTR 0 +#define HAVE_OHASH 0 +#define HAVE_MANPATH 0 + +/* binary names */ +#define BINM_APROPOS "apropos" +#define BINM_MAKEWHATIS "makewhatis" +#define BINM_MAN "man" +#define BINM_SOELIM "soelim" +#define BINM_WHATIS "whatis" + +/* paths */ +#define MAN_CONF_FILE "/etc/man.conf" +#define MANPATH_DEFAULT "/share/man" diff --git a/pkg/mdocml/gen.rc b/pkg/mdocml/gen.rc new file mode 100644 index 00000000..4629a870 --- /dev/null +++ b/pkg/mdocml/gen.rc @@ -0,0 +1,73 @@ +cflags\ + -isystem pkg/openbsd/include\ + -isystem '$builddir'/pkg/zlib/include\ + -I include\ + -I '$dir' + +lib libmandoc.a -d pkg/zlib/headers\ + man.c\ + man_hash.c\ + man_macro.c\ + man_validate.c\ + \ + att.c\ + lib.c\ + mdoc.c\ + mdoc_argv.c\ + mdoc_hash.c\ + mdoc_macro.c\ + mdoc_state.c\ + mdoc_validate.c\ + st.c\ + \ + eqn.c\ + roff.c\ + tbl.c\ + tbl_data.c\ + tbl_layout.c\ + tbl_opts.c\ + \ + chars.c\ + mandoc.c\ + mandoc_aux.c\ + mandoc_ohash.c\ + msec.c\ + preconv.c\ + read.c\ + \ + compat_ohash.c + +exe mandoc\ + main.c\ + manpath.c\ + out.c\ + tag.c\ + tree.c\ + \ + eqn_html.c\ + html.c\ + man_html.c\ + mdoc_html.c\ + tbl_html.c\ + \ + mdoc_man.c\ + \ + eqn_term.c\ + man_term.c\ + mdoc_term.c\ + term.c\ + term_ascii.c\ + term_ps.c\ + tbl_term.c\ + libmandoc.a\ + '$builddir'/pkg/^(openbsd/libbsd.a zlib/libz.a) +exe demandoc demandoc.c libmandoc.a '$builddir'/pkg/^(openbsd/libbsd.a zlib/libz.a) + +for(exe in mandoc demandoc) file bin/$exe '$outdir'/$exe 755 +sym bin/man mandoc +for(man in mandoc.1 demandoc.1 man.1 mandoc.3 man.conf.5 man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7) { + sect=`{printf %s $man | tail -c 1} + file share/man/man$sect/$man '$srcdir'/$man 644 +} + +fetch curl diff --git a/pkg/mdocml/rev b/pkg/mdocml/rev new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/pkg/mdocml/rev @@ -0,0 +1 @@ +2 diff --git a/pkg/mdocml/sha256 b/pkg/mdocml/sha256 new file mode 100644 index 00000000..13446bd9 --- /dev/null +++ b/pkg/mdocml/sha256 @@ -0,0 +1 @@ +0a55c1addb188071d6f784599303656b8465e98ec6b2f4f264e12fb96d79e0ef mdocml-1.13.4.tar.gz diff --git a/pkg/mdocml/url b/pkg/mdocml/url new file mode 100644 index 00000000..46ea2f7b --- /dev/null +++ b/pkg/mdocml/url @@ -0,0 +1 @@ +url = "http://mdocml.bsd.lv/snapshots/mdocml-1.13.4.tar.gz" -- cgit v1.2.3