diff options
author | John Marino <marino@FreeBSD.org> | 2014-08-23 22:10:32 +0000 |
---|---|---|
committer | John Marino <marino@FreeBSD.org> | 2014-08-23 22:10:32 +0000 |
commit | aafe61e7b7930f526ce86ec971907a358288912a (patch) | |
tree | 54fd789505dd0f0b231f2c5583cce24cac81962c /databases/gnats4/files | |
parent | f9267029e14b7e262fef29bba756100c21403425 (diff) | |
download | ports-aafe61e7b7930f526ce86ec971907a358288912a.tar.gz ports-aafe61e7b7930f526ce86ec971907a358288912a.zip |
Stage databases/gnats4 and assign new maintainer
PR: 192881
Submitted by: Chris Hutchinson
I am sure many people wanted to see this port die, but Chris wanted to
save it. Unfortunately his PR only contained about 2% of the work needed
to properly stage it. I had to overhaul it with the changes to numerous
to recount. Some big ticket items: converted to OptionsNG the EMACS and
CLIENT_ONLY knobs (the ability to define the exact EMACS version is lost,
it just takes the default. There are only 2 EMACS versions anyway).
The chown/mode changes where moved from vendor makefile to pkg-plist. I
also leveraged @sample keyword for the two conf files.
Notes
Notes:
svn path=/head/; revision=365835
Diffstat (limited to 'databases/gnats4/files')
-rw-r--r-- | databases/gnats4/files/extrapatch-gnats__edit-pr.sh (renamed from databases/gnats4/files/extrapatch-gnats::edit-pr.sh) | 0 | ||||
-rw-r--r-- | databases/gnats4/files/patch-gnats__Makefile.in | 106 |
2 files changed, 65 insertions, 41 deletions
diff --git a/databases/gnats4/files/extrapatch-gnats::edit-pr.sh b/databases/gnats4/files/extrapatch-gnats__edit-pr.sh index f4f7c1aa8015..f4f7c1aa8015 100644 --- a/databases/gnats4/files/extrapatch-gnats::edit-pr.sh +++ b/databases/gnats4/files/extrapatch-gnats__edit-pr.sh diff --git a/databases/gnats4/files/patch-gnats__Makefile.in b/databases/gnats4/files/patch-gnats__Makefile.in index eeab9d3c2608..2a8b6c4446fe 100644 --- a/databases/gnats4/files/patch-gnats__Makefile.in +++ b/databases/gnats4/files/patch-gnats__Makefile.in @@ -1,6 +1,6 @@ ---- gnats/Makefile.in.orig Thu Feb 24 22:35:55 2005 -+++ gnats/Makefile.in Mon Aug 1 15:08:51 2005 -@@ -93,7 +93,7 @@ +--- gnats/Makefile.in.orig 2005-02-24 20:35:55 UTC ++++ gnats/Makefile.in +@@ -93,7 +93,7 @@ M4 = @M4@ INSTALL = $(srcdir)/../install-sh -c INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -9,7 +9,7 @@ INSTALL_DATA = @INSTALL_DATA@ SUB_INSTALL = `echo $(INSTALL) | sed 's,^\([^/]\),../\1,'` -@@ -109,6 +109,7 @@ +@@ -109,6 +109,7 @@ bindir = @bindir@ libdir = @libdir@ libexecdir = @libexecdir@ statedir = @datadir@ @@ -17,7 +17,7 @@ sysconfdir = @sysconfdir@ program_transform_name = -@@ -162,7 +163,7 @@ +@@ -162,7 +163,7 @@ all-gnats: all-tools gnatsd queue-pr mai check-db delete-pr dbconfig gnats-databases gnats-pwconv $(EXTRA_STUFF) all-tools: libgnats.a query-pr pr-age pr-edit edit-pr file-pr getclose \ @@ -26,22 +26,18 @@ libgnats.a: $(LIBOBJS) -rm -f tmplibgnats.a libgnats.a -@@ -368,15 +369,17 @@ +@@ -368,15 +369,11 @@ install-tools: install-tools-arch-indep install-tools-arch-dep: install-tools-bin install-tools-arch-indep: all-tools - $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(datadir)/gnats + $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(sharedstatedir)/gnats $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(sysconfdir)/gnats/defaults - @if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \ +- @if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \ - echo "chown $(GNATS_USER) $(DESTDIR)$(datadir)/gnats" ; \ - chown $(GNATS_USER) $(DESTDIR)$(datadir)/gnats ; \ -+ echo "chown $(GNATS_USER) $(DESTDIR)$(sharedstatedir)/gnats" ; \ -+ chown $(GNATS_USER) $(DESTDIR)$(sharedstatedir)/gnats ; \ - else \ +- else \ - echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(datadir)/gnats" ; \ -+ echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(sharedstatedir)/gnats" ; \ -+ fi + @if [ x"$(lispdir)" != x ]; then \ + $(INSTALL_DATA) $(srcdir)/gnats.el $(DESTDIR)$(lispdir)/gnats.el ; \ fi @@ -49,7 +45,7 @@ for i in categories submitters responsible gnatsd.user_access addresses states classes dbconfig ; do \ if [ -f "$$i" ] ; then \ $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir)/gnats/defaults/$$i ; \ -@@ -391,7 +394,7 @@ +@@ -391,17 +388,9 @@ install-tools-bin: all-tools $(INSTALL_SCRIPT) edit-pr $(DESTDIR)$(bindir)/edit-pr $(INSTALL_SCRIPT) diff-prs $(DESTDIR)$(libexecdir)/gnats/diff-prs $(INSTALL_SCRIPT) mail-agent $(DESTDIR)$(libexecdir)/gnats/mail-agent @@ -57,44 +53,72 @@ + $(INSTALL_SCRIPT) file-pr $(DESTDIR)$(libexecdir)/gnats/file-pr $(INSTALL_PROGRAM) pr-age $(DESTDIR)$(libexecdir)/gnats/pr-age $(INSTALL_PROGRAM) pr-edit $(DESTDIR)$(libexecdir)/gnats/pr-edit - @if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \ -@@ -409,29 +412,29 @@ +- @if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \ +- echo "chown $(GNATS_USER) $(DESTDIR)$(libexecdir)/gnats/pr-edit" ; \ +- echo "chmod 4555 $(DESTDIR)$(libexecdir)/gnats/pr-edit" ; \ +- chown $(GNATS_USER) $(DESTDIR)$(libexecdir)/gnats/pr-edit ; \ +- chmod 4555 $(DESTDIR)$(libexecdir)/gnats/pr-edit ; \ +- else \ +- echo "*** Warning: Must make pr-edit suid $(DESTDIR)$(GNATS_USER)" ; \ +- fi + + EXTRA_INSTALL = + +@@ -409,33 +398,9 @@ install-gnats: install-gnats-bin install install-gnats-arch-dep: install-gnats-bin $(EXTRA_INSTALL) install-gnats-arch-indep: all-gnats install-tools-arch-indep - @if [ -f $(DESTDIR)$(GLOBAL_DB_LIST_FILE) ]; then \ - echo "Not putting gnats-databases file in $(DESTDIR)$(GLOBAL_DB_LIST_FILE), it's already there." ; \ -+ @if [ -f $(DESTDIR)$(GLOBAL_DB_LIST_FILE).default ]; then \ -+ echo "Not putting gnats-databases file in $(DESTDIR)$(GLOBAL_DB_LIST_FILE).default, it's already there." ; \ - true ; \ - else \ - if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \ - $(INSTALL_DATA) -o $(GNATS_USER) gnats-databases \ +- true ; \ +- else \ +- if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \ +- $(INSTALL_DATA) -o $(GNATS_USER) gnats-databases \ - $(DESTDIR)$(GLOBAL_DB_LIST_FILE) ; \ -+ $(DESTDIR)$(GLOBAL_DB_LIST_FILE).default ; \ - else \ +- else \ - $(INSTALL_DATA) gnats-databases $(DESTDIR)$(GLOBAL_DB_LIST_FILE) ; \ - echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(GLOBAL_DB_LIST_FILE)" ; \ -+ $(INSTALL_DATA) gnats-databases $(DESTDIR)$(GLOBAL_DB_LIST_FILE).default ; \ -+ echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(GLOBAL_DB_LIST_FILE).default" ; \ - fi \ - fi +- fi \ +- fi - @if [ -f $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE) ]; then \ - echo "Not putting gnats.host_access file in $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE), it's already there." ; \ -+ @if [ -f $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE).default ]; then \ -+ echo "Not putting gnats.host_access file in $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE).default, it's already there." ; \ - true ; \ - else \ - if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \ - $(INSTALL_DATA) -o $(GNATS_USER) $(srcdir)/gnatsd.host_access \ +- true ; \ +- else \ +- if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \ +- $(INSTALL_DATA) -o $(GNATS_USER) $(srcdir)/gnatsd.host_access \ - $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE) ; \ -+ $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE).default ; \ - else \ - $(INSTALL_DATA) $(srcdir)/gnatsd.host_access \ +- else \ +- $(INSTALL_DATA) $(srcdir)/gnatsd.host_access \ - $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE) ; \ - echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE)" ; \ -+ $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE).default ; \ -+ echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE).default" ; \ - fi \ - fi - @echo "*** If you're a first-time user, you'll want to create a new database"; +- fi \ +- fi +- @echo "*** If you're a first-time user, you'll want to create a new database"; +- @echo "*** with $(libexecdir)/gnats/mkdb." ++ $(INSTALL_DATA) gnats-databases $(DESTDIR)$(GLOBAL_DB_LIST_FILE).default ++ $(INSTALL_DATA) $(srcdir)/gnatsd.host_access \ ++ $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE).default + + install-gnats-bin: all-gnats install-tools-bin + $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(libexecdir)/gnats +@@ -450,20 +415,6 @@ install-gnats-bin: all-gnats install-too + $(INSTALL_PROGRAM) gen-index $(DESTDIR)$(libexecdir)/gnats/gen-index + $(INSTALL_SCRIPT) mail-query $(DESTDIR)$(libexecdir)/gnats/mail-query + $(INSTALL_PROGRAM) gnats-pwconv $(DESTDIR)$(libexecdir)/gnats/gnats-pwconv +- @if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \ +- echo "chown $(GNATS_USER) $(DESTDIR)$(libexecdir)/gnats/queue-pr $(DESTDIR)$(libexecdir)/gnats/file-pr $(DESTDIR)$(libexecdir)/gnats/gen-index" ; \ +- echo "chmod 4555 $(DESTDIR)$(libexecdir)/gnats/queue-pr $(DESTDIR)$(libexecdir)/gnats/file-pr $(DESTDIR)$(libexecdir)/gnats/gen-index" ; \ +- echo "chown $(GNATS_USER) $(DESTDIR)$(libexecdir)/gnats/gnatsd" ; \ +- echo "chmod 555 $(DESTDIR)$(libexecdir)/gnats/gnatsd" ; \ +- chown $(GNATS_USER) $(DESTDIR)$(libexecdir)/gnats/queue-pr ; \ +- chown $(GNATS_USER) $(DESTDIR)$(libexecdir)/gnats/gen-index ; \ +- chmod 4555 $(DESTDIR)$(libexecdir)/gnats/queue-pr ; \ +- chmod 4555 $(DESTDIR)$(libexecdir)/gnats/gen-index ; \ +- chown $(GNATS_USER) $(DESTDIR)$(libexecdir)/gnats/gnatsd ; \ +- chmod 555 $(DESTDIR)$(libexecdir)/gnats/gnatsd ; \ +- else \ +- echo "*** Warning: must make queue-pr and gen-index suid $(GNATS_USER)." ; \ +- fi + + # regex.c is pretty badly broken, and I don't feel like fixing it. + regex.o: $(srcdir)/regex.c |