Date: Thu, 3 Sep 2015 13:48:25 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395957 - in head/sysutils/heirloom: . files Message-ID: <201509031348.t83DmP2N064648@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Thu Sep 3 13:48:24 2015 New Revision: 395957 URL: https://svnweb.freebsd.org/changeset/ports/395957 Log: - Drop 8.x support - Switch to options helpers - Drop @dirrm* from plist - Explicitly mark suid files as such in plist Approved by: portmgr blanket Added: head/sysutils/heirloom/files/patch-utmpx - copied unchanged from r395943, head/sysutils/heirloom/files/extra-utmpx Deleted: head/sysutils/heirloom/files/extra-utmpx Modified: head/sysutils/heirloom/Makefile head/sysutils/heirloom/pkg-plist Modified: head/sysutils/heirloom/Makefile ============================================================================== --- head/sysutils/heirloom/Makefile Thu Sep 3 13:19:24 2015 (r395956) +++ head/sysutils/heirloom/Makefile Thu Sep 3 13:48:24 2015 (r395957) @@ -22,12 +22,6 @@ REINPLACE_SUB= DATADIR="${DATADIR}" OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - -.if ${OSVERSION} >= 900007 -EXTRA_PATCHES= ${FILESDIR}/extra-utmpx -.endif - SH2FIX= maninst.sh genintro.sh crossln.sh DOC_FILES= CHANGES LICENSE/COPYING LICENSE/LICENSE LICENSE/LUCENT \ @@ -52,14 +46,10 @@ pre-configure: pre-build: ${MAKE_CMD} -C ${WRKSRC}/libcommon -f Makefile.mk headers -post-install: install-doc - -install-doc: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/LICENSE -. for f in ${DOC_FILES} +.for f in ${DOC_FILES} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/${f} -. endfor -.endif +.endfor .include <bsd.port.mk> Copied: head/sysutils/heirloom/files/patch-utmpx (from r395943, head/sysutils/heirloom/files/extra-utmpx) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/heirloom/files/patch-utmpx Thu Sep 3 13:48:24 2015 (r395957, copy of r395943, head/sysutils/heirloom/files/extra-utmpx) @@ -0,0 +1,158 @@ +--- libcommon/_utmpx.h.orig 2006-01-22 20:06:14.000000000 +0100 ++++ libcommon/_utmpx.h 2010-01-21 21:50:34.000000000 +0100 +@@ -26,7 +26,12 @@ + defined (__DragonFly__) || defined (__APPLE__) + #include <sys/types.h> + #include <sys/time.h> +-#include <utmp.h> ++ ++#include <sys/param.h> ++#if defined(__FreeBSD__) && __FreeBSD_version >= 900007 ++# include "/usr/include/utmpx.h" ++#else ++# include <utmp.h> + + #ifndef __dietlibc__ + struct utmpx { +@@ -83,6 +88,7 @@ + extern struct utmpx *getutxline(const struct utmpx *); + extern struct utmpx *pututxline(const struct utmpx *); + extern void setutxent(void); ++#endif /*!__FreeBSD__ && __FreeBSD_version >= 900007*/ + extern int utmpxname(const char *); + extern void updwtmpx(const char *, const struct utmpx *); + #endif /* __FreeBSD__ || __dietlibc__ || __NetBSD__ || __UCLIBC__ || +--- libcommon/utmpx.c.orig 2006-01-22 20:06:14.000000000 +0100 ++++ libcommon/utmpx.c 2010-01-21 21:58:07.000000000 +0100 +@@ -28,14 +28,16 @@ + defined (__DragonFly__) || defined (__APPLE__) + #include <sys/types.h> + #include <sys/time.h> +-#include <utmp.h> + #include <string.h> + + #include "utmpx.h" + + static FILE *utfp; + static struct utmpx utx; +-static const char *utmpfile = _PATH_UTMP; ++static const char *utmpfile = NULL; ++ ++#include <sys/param.h> ++#if !(defined(__FreeBSD__) && __FreeBSD_version >= 900007) + + static FILE * + init(void) +@@ -198,13 +200,6 @@ + fclose(fp); + } + +-int +-utmpxname(const char *name) +-{ +- utmpfile = strdup(name); +- return 0; +-} +- + extern struct utmpx * + pututxline(const struct utmpx *up) + { +@@ -235,6 +230,15 @@ + return rp; + } + ++#endif /*!__FreeBSD__ && __FreeBSD_version >= 900007*/ ++ ++int ++utmpxname(const char *name) ++{ ++ utmpfile = strdup(name); ++ return 0; ++} ++ + extern void + updwtmpx(const char *name, const struct utmpx *up) + { +--- who/who.c.orig 2010-01-21 22:02:24.000000000 +0100 ++++ who/who.c 2010-01-21 22:07:45.000000000 +0100 +@@ -129,8 +129,11 @@ + + if (u->ut_type == LOGIN_PROCESS) + cp = "LOGIN"; +- else if (u->ut_type == BOOT_TIME || u->ut_type == RUN_LVL || +- u->ut_user[0] == '\0') ++#if defined(__FreeBSD__) && __FreeBSD_version >= 900007 ++ else if (u->ut_type == BOOT_TIME || u->ut_user[0] == '\0') ++#else ++ else if (u->ut_type == BOOT_TIME || u->ut_type == RUN_LVL || u->ut_user[0] == '\0') ++#endif + cp = " ."; + else + cp = u->ut_user; +@@ -147,11 +150,16 @@ + } else + c = ' '; + printf("%c ", c); ++ ++#if !(defined(__FreeBSD__) && __FreeBSD_version >= 900007) + if (u->ut_type == RUN_LVL) { + snprintf(buf, sizeof buf, "run-level %c", + (int)(u->ut_pid & 0377)); + cp = buf; +- } else if (u->ut_type == BOOT_TIME) ++ } else ++ ++#endif ++ if (u->ut_type == BOOT_TIME) + cp = "system boot"; + else if (u->ut_line[0] == '\0') + cp = " ."; +@@ -189,7 +197,11 @@ + cp = " . "; + printf(" %s", cp); + } +- if (u->ut_type != RUN_LVL && u->ut_type != BOOT_TIME ++ if ( ++#if !(defined(__FreeBSD__) && __FreeBSD_version >= 900007) ++ u->ut_type != RUN_LVL && ++#endif ++ u->ut_type != BOOT_TIME + #ifdef ACCOUNTING + && u->ut_type != ACCOUNTING + #endif /* ACCOUNTING */ +@@ -203,7 +215,7 @@ + #endif /* __hpux */ + printf(" id=%4.4s term=%-3d exit=%d", + u->ut_id, +-#if !defined (_AIX) || !defined (__APPLE__) ++#if (!defined (_AIX) || !defined (__APPLE__)) && !defined(__FreeBSD__) + u->ut_exit.e_termination, + u->ut_exit.e_exit + #else /* _AIX, __APPLE__ */ +@@ -213,9 +225,12 @@ + ); + else if (u->ut_type == INIT_PROCESS && !sflag) + printf(" id=%4.4s", u->ut_id); ++ ++#if !(defined(__FreeBSD__) && __FreeBSD_version >= 900007) + else if (u->ut_type == RUN_LVL) + printf(" %c %-4ld %c", (int)(u->ut_pid & 0377), + 0L, (int)((u->ut_pid & 0177777) / 0400)); ++#endif + if (Rflag && u->ut_host[0]) + printf("\t(%.*s)", (int)sizeof u->ut_host, u->ut_host); + putchar('\n'); +@@ -227,10 +242,13 @@ + enum okay val = STOP; + + switch (u->ut_type) { ++ ++#if !(defined(__FreeBSD__) && __FreeBSD_version >= 900007) + case RUN_LVL: + if (flags & FL_r) + val = OKAY; + break; ++#endif + case BOOT_TIME: + if (flags & FL_b) + val = OKAY; Modified: head/sysutils/heirloom/pkg-plist ============================================================================== --- head/sysutils/heirloom/pkg-plist Thu Sep 3 13:19:24 2015 (r395956) +++ head/sysutils/heirloom/pkg-plist Thu Sep 3 13:48:24 2015 (r395957) @@ -5,7 +5,7 @@ %%DATADIR%%/usr/5bin/s42/expr %%DATADIR%%/usr/5bin/s42/nl %%DATADIR%%/usr/5bin/s42/priocntl -%%DATADIR%%/usr/5bin/s42/ps +@(,,4755) %%DATADIR%%/usr/5bin/s42/ps %%DATADIR%%/usr/5bin/s42/sed %%DATADIR%%/usr/5bin/s42/wc %%DATADIR%%/usr/5bin/s42/csplit @@ -66,7 +66,7 @@ %%DATADIR%%/usr/5bin/posix/od %%DATADIR%%/usr/5bin/posix/pg %%DATADIR%%/usr/5bin/posix/pr -%%DATADIR%%/usr/5bin/posix/ps +@(,,4755) %%DATADIR%%/usr/5bin/posix/ps %%DATADIR%%/usr/5bin/posix/rm %%DATADIR%%/usr/5bin/posix/rmdir %%DATADIR%%/usr/5bin/posix/sed @@ -207,7 +207,7 @@ %%DATADIR%%/usr/5bin/printenv %%DATADIR%%/usr/5bin/printf %%DATADIR%%/usr/5bin/priocntl -%%DATADIR%%/usr/5bin/ps +@(,,4755) %%DATADIR%%/usr/5bin/ps %%DATADIR%%/usr/5bin/pwd %%DATADIR%%/usr/5bin/random %%DATADIR%%/usr/5bin/renice @@ -222,7 +222,7 @@ %%DATADIR%%/usr/5bin/split %%DATADIR%%/usr/5bin/stty %%DATADIR%%/usr/5bin/STTY -%%DATADIR%%/usr/5bin/su +@(,,4755) %%DATADIR%%/usr/5bin/su %%DATADIR%%/usr/5bin/sum %%DATADIR%%/usr/5bin/sync %%DATADIR%%/usr/5bin/tabs @@ -285,7 +285,7 @@ %%DATADIR%%/usr/ucb/groups %%DATADIR%%/usr/ucb/ln %%DATADIR%%/usr/ucb/ls -%%DATADIR%%/usr/ucb/ps +@(,,4755) %%DATADIR%%/usr/ucb/ps %%DATADIR%%/usr/ucb/stty %%DATADIR%%/usr/ucb/sum %%DATADIR%%/usr/ucb/test @@ -485,32 +485,7 @@ %%PORTDOCS%%%%DOCSDIR%%/LICENSE/README %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/intro.txt -%%PORTDOCS%%@dirrm %%DOCSDIR%%/LICENSE -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%DATADIR%%/usr/ucb -@dirrm %%DATADIR%%/usr/share/man/5man/man8 -@dirrm %%DATADIR%%/usr/share/man/5man/man7 -@dirrm %%DATADIR%%/usr/share/man/5man/man6 -@dirrm %%DATADIR%%/usr/share/man/5man/man5 -@dirrm %%DATADIR%%/usr/share/man/5man/man4 -@dirrm %%DATADIR%%/usr/share/man/5man/man3 -@dirrm %%DATADIR%%/usr/share/man/5man/man2 -@dirrm %%DATADIR%%/usr/share/man/5man/man1m -@dirrm %%DATADIR%%/usr/share/man/5man/man1b -@dirrm %%DATADIR%%/usr/share/man/5man/man1 -@dirrm %%DATADIR%%/usr/share/man/5man -@dirrm %%DATADIR%%/usr/share/man -@dirrm %%DATADIR%%/usr/share -@dirrm %%DATADIR%%/usr/ccs/bin -@dirrm %%DATADIR%%/usr/ccs -@dirrm %%DATADIR%%/usr/5lib/tmac -@dirrm %%DATADIR%%/usr/5lib/spell -@dirrm %%DATADIR%%/usr/5lib -@dirrm %%DATADIR%%/usr/5bin/s42 -@dirrm %%DATADIR%%/usr/5bin/posix2001 -@dirrm %%DATADIR%%/usr/5bin/posix -@dirrm %%DATADIR%%/usr/5bin -@dirrm %%DATADIR%%/usr -@dirrm %%DATADIR%%/etc/default -@dirrm %%DATADIR%%/etc -@dirrm %%DATADIR%% +@dir %%DATADIR%%/usr/share/man/5man/man6 +@dir %%DATADIR%%/usr/share/man/5man/man4 +@dir %%DATADIR%%/usr/share/man/5man/man3 +@dir %%DATADIR%%/usr/share/man/5man/man2
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509031348.t83DmP2N064648>