Index: head/devel/idutils/Makefile =================================================================== --- head/devel/idutils/Makefile (revision 566674) +++ head/devel/idutils/Makefile (revision 566675) @@ -1,35 +1,38 @@ # Created by: pst@FreeBSD.org # $FreeBSD$ PORTNAME= idutils PORTVERSION= 4.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= GNU MAINTAINER= peterjeremy@acm.org COMMENT= The classic Berkeley gid/lid tools for looking up variables in code -CONFLICTS= coreutils-[0-9]* linux-gid-[0-9]* sh-utils-[0-9]* - LICENSE= GPLv3 OPTIONS_DEFINE= NLS -USES= charsetfix tar:xz +USES= charsetfix tar:xz uniquefiles +# Also see files/patch-lisp_idutils.el +UNIQUE_PREFIX= g +UNIQUE_PREFIX_FILES= bin/gid \ + man/man1/gid.1 + GNU_CONFIGURE= yes CONFIGURE_ENV= EMACS='no' CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INFO= idutils NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls OPTIONS_SUB= yes post-install: ${INSTALL_DATA} ${WRKSRC}/lisp/idutils.el ${STAGEDIR}${PREFIX}/share/emacs/site-lisp .include Index: head/devel/idutils/files/patch-lisp_idutils.el =================================================================== --- head/devel/idutils/files/patch-lisp_idutils.el (nonexistent) +++ head/devel/idutils/files/patch-lisp_idutils.el (revision 566675) @@ -0,0 +1,11 @@ +--- lisp/idutils.el.orig 2021-02-27 07:27:26 UTC ++++ lisp/idutils.el +@@ -32,7 +32,7 @@ + (require 'compile) + (require 'thingatpt) + +-(defvar gid-command "gid" "The command run by the gid function.") ++(defvar gid-command "ggid" "The command run by the gid function.") + + (defvar gid-mode-font-lock-keywords + '(("^\\(Compilation\\|Gid\\) \\(started\\|finished\\).*" Property changes on: head/devel/idutils/files/patch-lisp_idutils.el ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/idutils/pkg-message =================================================================== --- head/devel/idutils/pkg-message (nonexistent) +++ head/devel/idutils/pkg-message (revision 566675) @@ -0,0 +1,5 @@ +[ +{ type: install + message: "gid is installed as ggid to avoid conflicts with coreutils." +} +] Property changes on: head/devel/idutils/pkg-message ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/idutils/pkg-plist =================================================================== --- head/devel/idutils/pkg-plist (revision 566674) +++ head/devel/idutils/pkg-plist (revision 566675) @@ -1,37 +1,37 @@ bin/aid bin/defid bin/eid bin/fid bin/fnid -bin/gid +bin/ggid bin/lid bin/mkid bin/xtokid man/man1/aid.1.gz man/man1/defid.1.gz man/man1/eid.1.gz man/man1/fid.1.gz man/man1/fnid.1.gz -man/man1/gid.1.gz +man/man1/ggid.1.gz man/man1/lid.1.gz man/man1/mkid.1.gz man/man1/xtokid.1.gz share/emacs/site-lisp/idutils.el share/id-lang.map %%NLS%%share/locale/da/LC_MESSAGES/idutils.mo %%NLS%%share/locale/de/LC_MESSAGES/idutils.mo %%NLS%%share/locale/fi/LC_MESSAGES/idutils.mo %%NLS%%share/locale/fr/LC_MESSAGES/idutils.mo %%NLS%%share/locale/ga/LC_MESSAGES/idutils.mo %%NLS%%share/locale/hu/LC_MESSAGES/idutils.mo %%NLS%%share/locale/id/LC_MESSAGES/idutils.mo %%NLS%%share/locale/it/LC_MESSAGES/idutils.mo %%NLS%%share/locale/nl/LC_MESSAGES/idutils.mo %%NLS%%share/locale/pl/LC_MESSAGES/idutils.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/idutils.mo %%NLS%%share/locale/ro/LC_MESSAGES/idutils.mo %%NLS%%share/locale/ru/LC_MESSAGES/idutils.mo %%NLS%%share/locale/sv/LC_MESSAGES/idutils.mo %%NLS%%share/locale/tr/LC_MESSAGES/idutils.mo %%NLS%%share/locale/vi/LC_MESSAGES/idutils.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/idutils.mo Index: head/sysutils/coreutils/Makefile =================================================================== --- head/sysutils/coreutils/Makefile (revision 566674) +++ head/sysutils/coreutils/Makefile (revision 566675) @@ -1,49 +1,47 @@ # $FreeBSD$ PORTNAME= coreutils PORTVERSION= 8.32 CATEGORIES= sysutils textproc MASTER_SITES= GNU MAINTAINER= jharris@widomaker.com COMMENT= Free Software Foundation core utilities LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING USES= cpe gmake iconv perl5 charsetfix tar:xz CPE_VENDOR= gnu USE_PERL5= build # required for tests and man page generation USE_LDCONFIG= yes TEST_TARGET= check GNU_CONFIGURE= yes # A rather nasty hack to stop gnustat from conflicting with base gstat # bugs.freebsd.org/160060 CONFIGURE_ARGS= --program-prefix=g \ --program-transform-name=s/stat/nustat/ CONFIGURE_ENV= FORCE_UNSAFE_CONFIGURE=1 INFO= coreutils OPTIONS_DEFINE= GMP NLS OPTIONS_SUB= yes GMP_LIB_DEPENDS= libgmp.so:math/gmp GMP_CONFIGURE_WITH= gmp NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls -CONFLICTS= idutils-[0-9]* - CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib post-build: @${REINPLACE_CMD} -e "s/ lib / /g" ${WRKSRC}/Makefile @${TOUCH} ${WRKSRC}/doc/coreutils.info post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/g* \ ${STAGEDIR}${PREFIX}/libexec/coreutils/libstdbuf.so .include