[Midnightbsd-cvs] mports [21515] trunk/databases/gnats4: update plist
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Aug 5 20:00:06 EDT 2016
Revision: 21515
http://svnweb.midnightbsd.org/mports/?rev=21515
Author: laffer1
Date: 2016-08-05 20:00:05 -0400 (Fri, 05 Aug 2016)
Log Message:
-----------
update plist
Modified Paths:
--------------
trunk/databases/gnats4/Makefile
trunk/databases/gnats4/pkg-descr
trunk/databases/gnats4/pkg-plist
Added Paths:
-----------
trunk/databases/gnats4/files/patch-gnats__Makefile.in
trunk/databases/gnats4/files/patch-send-pr__Makefile.in
Removed Paths:
-------------
trunk/databases/gnats4/files/extrapatch-gnats::edit-pr.sh
trunk/databases/gnats4/files/patch-gnats::Makefile.in
trunk/databases/gnats4/files/patch-send-pr::Makefile.in
Modified: trunk/databases/gnats4/Makefile
===================================================================
--- trunk/databases/gnats4/Makefile 2016-08-05 23:56:28 UTC (rev 21514)
+++ trunk/databases/gnats4/Makefile 2016-08-06 00:00:05 UTC (rev 21515)
@@ -3,7 +3,7 @@
PORTNAME= gnats
PORTVERSION= 4.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases devel
MASTER_SITES= GNU
PKGNAMESUFFIX= 4
@@ -37,33 +37,28 @@
CONFIGURE_ARGS+= --with-gnats-service=${WITH_GNATSD_SERVICE}
.endif
-PLIST_SUB= GNATSDBDIR=${GNATSDBDIR}
+PLIST_SUB= GNATSDBDIR=${GNATSDBDIR}
+INFO= gnats-faq gnats
+PORTDOCS= NEWS UPGRADING
-MAN1= edit-pr.1 query-pr.1 send-pr.1
-MAN5= databases.5 dbconfig.5
-MAN7= gnats.7
-MAN8= delete-pr.8 getclose.8 file-pr.8 gen-index.8 gnatsd.8 \
- install-sid.8 mkcat.8 mkdb.8 pr-edit.8 queue-pr.8 rmcat.8
-INFO= gnats-faq gnats
-DOCFILES= NEWS UPGRADING
+OPTIONS_DEFINE= DOCS EMACS SERVER
+OPTIONS_DEFAULT=SERVER
+OPTIONS_SUB= yes
+EMACS_USE= EMACS=yes
+EMACS_DESC= Add support for default version of EMACS
+SERVER_DESC= Install the gnats server too
-.ifdef WITH_EMACS_PORT
-USE_EMACS= yes
-EMACS_PORT_NAME= ${WITH_EMACS_PORT}
-CONFIGURE_ARGS+= --with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}
-.else
-PLIST_SUB+= EMACS_SITE_LISPDIR="@comment "
+.include <bsd.mport.options.mk>
+
+.if ! ${PORT_OPTIONS:MSERVER}
+ALL_TARGET= all-tools
+INSTALL_TARGET= install-tools
.endif
-.ifdef CLIENT_ONLY
-ALL_TARGET= all-tools
-INSTALL_TARGET= install-tools
-PLIST_SUB+= SERVER="@comment "
-PKGNAMESUFFIX= -client
-CONFLICTS+= ${PKGNAMEPREFIX}${PORTNAME}-4.*
+.if ${PORT_OPTIONS:MEMACS}
+CONFIGURE_ARGS+=--with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}
.else
-PLIST_SUB+= SERVER=""
-CONFLICTS+= ${PKGNAMEPREFIX}${PORTNAME}-client-4.*
+PLIST_SUB+= EMACS_SITE_LISPDIR="@comment "
.endif
pre-everything::
@@ -75,7 +70,6 @@
@${ECHO} "WITH_SUBMITTER_ID=unknown default submitter-id"
@${ECHO} "WITH_ORGANIZATION='unknown' default organization"
@${ECHO} "WITH_GNATSD_SERVICE=support default gnatsd port name"
- @${ECHO} "WITH_EMACS_PORT=emacs with Emacs support"
@${ECHO}
@${ECHO} "============================================================="
@${ECHO}
@@ -88,26 +82,20 @@
@for doc in pkg-message pkg-install; do \
${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
-e 's,%%GNATSDBDIR%%,${GNATSDBDIR},g' \
- ${PKGDIR}/$${doc} >${WRKDIR}/$${doc} ; \
+ ${PKGDIR}/$${doc} >${WRKDIR}/$${doc}; \
done
pre-install:
- @${MKDIR} ${PREFIX}/libexec/gnats
- @${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+ @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gnats
post-install:
-.ifndef CLIENT_ONLY
- @for conf in databases gnatsd.host_access; do \
- [ -f ${PREFIX}/etc/gnats/$${conf} ] \
- || ${CP} ${PREFIX}/etc/gnats/$${conf}.default ${PREFIX}/etc/gnats/$${conf}; \
- done
+.if ${PORT_OPTIONS:MSERVER}
+ ${MV} ${STAGEDIR}${ETCDIR}/databases.default \
+ ${STAGEDIR}${ETCDIR}/databases.sample
+ ${MV} ${STAGEDIR}${ETCDIR}/gnatsd.host_access.default \
+ ${STAGEDIR}${ETCDIR}/gnatsd.host_access.sample
.endif
-.ifndef NOPORTDOCS
- @${MKDIR} ${DOCSDIR}
- @for doc in ${DOCFILES}; do \
- ${INSTALL_DATA} ${WRKSRC}/$${doc} ${DOCSDIR}; \
- done
-.endif
- @${CAT} ${PKGMESSAGE}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
.include <bsd.port.mk>
Deleted: trunk/databases/gnats4/files/extrapatch-gnats::edit-pr.sh
===================================================================
--- trunk/databases/gnats4/files/extrapatch-gnats::edit-pr.sh 2016-08-05 23:56:28 UTC (rev 21514)
+++ trunk/databases/gnats4/files/extrapatch-gnats::edit-pr.sh 2016-08-06 00:00:05 UTC (rev 21515)
@@ -1,265 +0,0 @@
---- gnats/edit-pr.sh.orig Sun May 26 16:32:02 2002
-+++ gnats/edit-pr.sh Sat Dec 6 02:43:44 2003
-@@ -5,6 +5,8 @@
- # Contributed by Jeffrey Osier (jeffrey at cygnus.com).
- # Majorly revised by Bob Manson (manson at juniper.net).
- # Further improvements by Dirk Bergstrom (dirk at juniper.net).
-+# Patches for the FreeBSD Project by Ceri Davies (ceri at FreeBSD.org),
-+# based on work by Paul Richards (paul at FreeBSD.org).
- #
- # This file is part of GNU GNATS.
- #
-@@ -24,9 +26,12 @@
-
- debug_print=false # or echo to get output.
- BINDIR=xBINDIRx
-+DATE=`LC_TIME=C date` # Some prstats tools rely on this format
-+GNATS_ROOT=${GNATS_ROOT:-/usr/local/share/gnats/gnats-db}; export GNATS_ROOT
- LIBEXECDIR=xLIBEXECDIRx
- GNATS_PORT=
- locked=
-+rc=0
- version=xVERSIONx
-
- usage="
-@@ -99,28 +104,23 @@
-
- *)
- if [ "`echo $1 | grep /`" != "" ]; then
-- pr_id=`echo $1 | awk -F"/" '{print $2}' -`
-+ pr=`echo $1 | awk -F"/" '{print $2}' -`
- else
-- pr_id=$1
-+ pr=$1
- fi
-+ prs="$prs $pr"
- ;;
- esac
- shift
- done
-
-+chng_tpl="${GNATS_ROOT}/gnats-adm/edit-pr-msg"
-+
- # set command here to always pass host and port, and directory if supplied
- QUERY_PR="$BINDIR/query-pr $GNATS_HOST $GNATS_PORT $GNATS_DB $EDIT_USER $EDIT_PASSWD"
- PR_ADDR="$QUERY_PR --responsible-address"
- PR_EDIT="$LIBEXECDIR/gnats/pr-edit $GNATS_HOST $GNATS_PORT $EDIT_USER $EDIT_PASSWD $GNATS_DB"
-
--# These traps take care of deleting all the /tmp files
--trap 'rm -f $new.old $change_msg $fixfil' 0
--# Don't delete $new on error signals
--trap 'if [ "$locked" != "" ]; then \
-- $PR_EDIT --unlock $pr_id ; \
-- locked= ; \
-- fi' 1 2 3 13 15
--
- # find a user name
- if [ "$USER" != "" ]; then
- me=$USER
-@@ -138,85 +138,45 @@
- full_me="$me"
- fi
-
-+for pr_id in $prs ; do
-+
-+epdir=`mktemp -d /tmp/epXXXXXX || exit 75`
-+chng_msg="$epdir/chng.$pr_id.$$"
- # new = temp file to use for editing
--new="/tmp/ep$$"
--newtmp="/tmp/ep$$.tp"
--change_msg="/tmp/ep$$.ch"
--fixfil="/tmp/ep$$.fx"
-+new="$epdir/$pr_id.ep$$"
-+change_msg="$epdir/ep$$.$pr_id.ch"
-+keepnew=
-+
-+# These traps take care of deleting all the /tmp files
-+trap 'rm -f $new.old $change_msg chng_msg; rmdir $epdir 2>/dev/null' 0
-+trap 'if [ "$locked" != "" ]; then \
-+ $PR_EDIT --unlock $pr_id ; \
-+ locked= ; \
-+ fi; \
-+ rm -f $new.old $change_msg chng_msg; rmdir $epdir 2>/dev/null' 1 2 3 13 15
-+
-
- # lock the pr
- $debug_print "Locking $pr_id."
--lock=`$PR_EDIT --lock=$full_me --process=$$ $pr_id 2>&1 > $new`
-+lock=`$PR_EDIT --lock=$me --process=$$ $pr_id 2>&1 > $new`
- locked=t
-
- if [ "$lock" != "" ] ; then
-+ echo "Failed to lock PR $pr_id"
- echo $lock
-- exit 0
-+ rc=1
-+ rm -r $epdir
-+ continue
- fi
-
--rm -f $fixfil
--
--# Now add any missing fields, along with a description.
--
--$QUERY_PR --list-fields | while read field
--do
-- grep -i "^>${field}:" "$new" > /dev/null 2>&1
-- if [ $? != 0 ]
-- then
-- $QUERY_PR --field-flags "$field" | grep -i readonly > /dev/null 2>&1
-- if [ $? != 0 ]
-- then
-- type="`$QUERY_PR --field-type $field`"
-- case $type in
-- [Ee][Nn][Uu][Mm])
-- values=`$QUERY_PR --valid-values $field | tr '\n' ' ' | sed 's/ *$//g; s/ / | /g;s/^/[ /;s/$/ ]/;`
-- valslen=`echo "$values" | wc -c`
-- if [ "$valslen" -gt 160 ]
-- then
-- desc="<`$QUERY_PR --field-description $field` (one line)>";
-- else
-- desc="<${values} (one line)>";
-- fi
-- dpat=`echo "$desc" | tr '][*+^$|\()&/' '............'`
-- echo "/^>${field}:/ s/${dpat}//" >> $fixfil
-- echo "/>${field}: ${desc}" >> $new;
-- ;;
-- [Mm][Uu][Ll][Tt][Ii][Tt][Ee][Xx][Tt])
-- desc=" <`$QUERY_PR --field-description $field` (multiple lines)>";
-- dpat=`echo "$desc" | tr '][*+^$|\()&/' '............'`
-- echo "s/^${dpat}//" >> $fixfil
-- echo ">${field}:" >> $new;
-- echo "$desc" >> $new;
-- ;;
-- *)
-- desc="<`$QUERY_PR --field-description $field` (one line)>"
-- dpat=`echo "$desc" | tr '][*+^$|\()&/' '............'`
-- echo "/^>${field}:/ s/${dpat}//" >> $fixfil
-- echo ">${field}: ${desc}" >> $new
-- ;;
-- esac
-- else
-- prevfld="$field";
-- fi
-- fi
--done
--
- # here's where we actually call the editor.
- cp $new $new.old
- $VISUAL $new
- if cmp -s $new.old $new ; then
- echo "edit-pr: PR not changed"
- $PR_EDIT --unlock $pr_id
-- exit 0
--fi
--
--if [ -f $fixfil ]
--then
-- sed -f $fixfil < $new > $newtmp
-- mv $newtmp $new
-- sed -f $fixfil < $new.old > $newtmp
-- mv $newtmp $new.old
-- rm -f $fixfil
-+ rm -r $epdir
-+ continue
- fi
-
- # error-check output by calling pr-edit --check; if mistakes exist,
-@@ -233,7 +193,7 @@
- echo "PR $pr_id not updated: changed file is in $new.changed"
- mv $new $new.changed
- $PR_EDIT --unlock $pr_id
-- exit 0
-+ continue 2
- ;;
- esac
- $VISUAL $new
-@@ -242,24 +202,37 @@
- fi
- done
-
--exec 3<&0
--
- #
- # Find out what fields have changed; if the changed field requires a
- # change reason, then ask about it.
- #
--$LIBEXECDIR/gnats/diff-prs $new.old $new | while read field
-+
-+changed_fields=`$LIBEXECDIR/gnats/diff-prs $new.old $new`
-+for field in $changed_fields
- do
- flags=`$QUERY_PR --field-flags $field` || echo "edit-pr: Invalid field name $field" 1>&2;
-
- if echo "$flags" | grep -i "requirechangereason" > /dev/null 2>&1
- then
-- echo ">${field}-Changed-Why:" >> $change_msg;
-- echo "Why did the $field field change? (Ctrl-D to end)";
-- cat 0<&3 >> $change_msg;
-+ $debug_print "Doing $field change."
-+ echo ">$field-Changed-Why: " >> $change_msg
-+ if [ -e $chng_msg ]; then
-+ echo "Re-use last message (y/n)?"
-+ read yesno
-+ if [ "$yesno" != "y" ]; then
-+ sed "s/%%ITEM%%/$field/" $chng_tpl > $chng_msg
-+ fi
-+ else
-+ sed "s/%%ITEM%%/$field/" $chng_tpl > $chng_msg
-+ fi
-+ $VISUAL $chng_msg
-+ sed '/^GNATS:/d' $chng_msg >> $change_msg
- fi
- done
-
-+echo "" >> $change_msg
-+echo "http://www.FreeBSD.org/cgi/query-pr.cgi?pr=$pr_id" >> $change_msg
-+
- if [ -f $change_msg ]
- then
- cat $change_msg >> $new
-@@ -269,12 +242,12 @@
- # Submit the changed PR.
- #
- while true; do
-- if $PR_EDIT --email-addr "$full_me" $pr_id < $new
-+ if $PR_EDIT --email-addr "$me" $pr_id < $new
- then
- echo "Edit successful"
- # we need to unlock the PR
- $PR_EDIT --unlock $pr_id
-- exit 0
-+ break
- else
- echo "Problems with edit submission."
- fi
-@@ -284,9 +257,11 @@
- case "$input" in
- a*)
- echo "Cancelling edit. Changed PR is in $new."
-- # we need to ulock the PR no matter what
-+ # we need to unlock the PR no matter what
- $PR_EDIT --unlock $pr_id
-- exit 1 ;;
-+ keepnew=y
-+ rc=1
-+ break 2 ;;
- r*)
- break ;;
- *)
-@@ -296,6 +271,13 @@
- done
- done
-
--rm -f $new
-+rm -f $chng_msg $new.old $change_msg
-+if [ "$keepnew" != "y" ]; then
-+ rm -f $new
-+ rmdir $epdir
-+fi
-+keepnew=
-+
-+done # for pr_id in $prs
-
--exit 0
-+exit $rc
Deleted: trunk/databases/gnats4/files/patch-gnats::Makefile.in
===================================================================
--- trunk/databases/gnats4/files/patch-gnats::Makefile.in 2016-08-05 23:56:28 UTC (rev 21514)
+++ trunk/databases/gnats4/files/patch-gnats::Makefile.in 2016-08-06 00:00:05 UTC (rev 21515)
@@ -1,100 +0,0 @@
---- 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 @@
-
- INSTALL = $(srcdir)/../install-sh -c
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
--INSTALL_SCRIPT = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
-
- SUB_INSTALL = `echo $(INSTALL) | sed 's,^\([^/]\),../\1,'`
-@@ -109,6 +109,7 @@
- libdir = @libdir@
- libexecdir = @libexecdir@
- statedir = @datadir@
-+sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-
- program_transform_name =
-@@ -162,7 +163,7 @@
- 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 \
-- config-send-pr mail-agent dbconfig diff-prs
-+ mail-agent dbconfig diff-prs
-
- libgnats.a: $(LIBOBJS)
- -rm -f tmplibgnats.a libgnats.a
-@@ -368,15 +369,17 @@
- 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 \
-- 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 \
-- 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
-- $(INSTALL_DATA) $(srcdir)/gnats.el $(DESTDIR)$(lispdir)/gnats.el
- 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 @@
- $(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
-- $(INSTALL_PROGRAM) file-pr $(DESTDIR)$(libexecdir)/gnats/file-pr
-+ $(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 @@
- 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 \
-- $(DESTDIR)$(GLOBAL_DB_LIST_FILE) ; \
-+ $(DESTDIR)$(GLOBAL_DB_LIST_FILE).default ; \
- 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
-- @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 \
-- $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE) ; \
-+ $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE).default ; \
- 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";
Copied: trunk/databases/gnats4/files/patch-gnats__Makefile.in (from rev 21508, trunk/databases/gnats4/files/patch-gnats::Makefile.in)
===================================================================
--- trunk/databases/gnats4/files/patch-gnats__Makefile.in (rev 0)
+++ trunk/databases/gnats4/files/patch-gnats__Makefile.in 2016-08-06 00:00:05 UTC (rev 21515)
@@ -0,0 +1,100 @@
+--- 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 @@
+
+ INSTALL = $(srcdir)/../install-sh -c
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_DATA = @INSTALL_DATA@
+
+ SUB_INSTALL = `echo $(INSTALL) | sed 's,^\([^/]\),../\1,'`
+@@ -109,6 +109,7 @@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ statedir = @datadir@
++sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+
+ program_transform_name =
+@@ -162,7 +163,7 @@
+ 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 \
+- config-send-pr mail-agent dbconfig diff-prs
++ mail-agent dbconfig diff-prs
+
+ libgnats.a: $(LIBOBJS)
+ -rm -f tmplibgnats.a libgnats.a
+@@ -368,15 +369,17 @@
+ 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 \
+- 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 \
+- 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
+- $(INSTALL_DATA) $(srcdir)/gnats.el $(DESTDIR)$(lispdir)/gnats.el
+ 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 @@
+ $(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
+- $(INSTALL_PROGRAM) file-pr $(DESTDIR)$(libexecdir)/gnats/file-pr
++ $(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 @@
+ 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 \
+- $(DESTDIR)$(GLOBAL_DB_LIST_FILE) ; \
++ $(DESTDIR)$(GLOBAL_DB_LIST_FILE).default ; \
+ 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
+- @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 \
+- $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE) ; \
++ $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE).default ; \
+ 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";
Deleted: trunk/databases/gnats4/files/patch-send-pr::Makefile.in
===================================================================
--- trunk/databases/gnats4/files/patch-send-pr::Makefile.in 2016-08-05 23:56:28 UTC (rev 21514)
+++ trunk/databases/gnats4/files/patch-send-pr::Makefile.in 2016-08-06 00:00:05 UTC (rev 21515)
@@ -1,11 +0,0 @@
---- send-pr/Makefile.in.orig Mon Aug 1 12:54:35 2005
-+++ send-pr/Makefile.in Mon Aug 1 12:53:52 2005
-@@ -55,7 +55,7 @@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-
- CFLAGS = -g
- LDFLAGS = -g
Copied: trunk/databases/gnats4/files/patch-send-pr__Makefile.in (from rev 21508, trunk/databases/gnats4/files/patch-send-pr::Makefile.in)
===================================================================
--- trunk/databases/gnats4/files/patch-send-pr__Makefile.in (rev 0)
+++ trunk/databases/gnats4/files/patch-send-pr__Makefile.in 2016-08-06 00:00:05 UTC (rev 21515)
@@ -0,0 +1,11 @@
+--- send-pr/Makefile.in.orig Mon Aug 1 12:54:35 2005
++++ send-pr/Makefile.in Mon Aug 1 12:53:52 2005
+@@ -55,7 +55,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_SCRIPT = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+
+ CFLAGS = -g
+ LDFLAGS = -g
Modified: trunk/databases/gnats4/pkg-descr
===================================================================
--- trunk/databases/gnats4/pkg-descr 2016-08-05 23:56:28 UTC (rev 21514)
+++ trunk/databases/gnats4/pkg-descr 2016-08-06 00:00:05 UTC (rev 21515)
@@ -6,6 +6,3 @@
querying, editing and maintaining these databases.
WWW: http://www.gnu.org/software/gnats/
-
-- Oliver Eikemeier
-eik at FreeBSD.org
Modified: trunk/databases/gnats4/pkg-plist
===================================================================
--- trunk/databases/gnats4/pkg-plist 2016-08-05 23:56:28 UTC (rev 21514)
+++ trunk/databases/gnats4/pkg-plist 2016-08-06 00:00:05 UTC (rev 21515)
@@ -1,15 +1,10 @@
- at comment $FreeBSD: ports/databases/gnats4/pkg-plist,v 1.4 2006/01/22 01:28:54 edwin Exp $
-bin/edit-pr
+@(gnats,,4555) bin/edit-pr
bin/getclose
bin/install-sid
bin/query-pr
bin/send-pr
-%%SERVER%%@unexec if cmp -s %D/etc/gnats/databases %D/etc/gnats/databases.default; then rm -f %D/etc/gnats/databases; fi
-%%SERVER%%etc/gnats/databases.default
-%%SERVER%%@exec [ -f %B/databases ] || cp %B/%f %B/databases
-%%SERVER%%@unexec if cmp -s %D/etc/gnats/gnatsd.host_access %D/etc/gnats/gnatsd.host_access.default; then rm -f %D/etc/gnats/gnatsd.host_access; fi
-%%SERVER%%etc/gnats/gnatsd.host_access.default
-%%SERVER%%@exec [ -f %B/gnatsd.host_access ] || cp %B/%f %B/gnatsd.host_access
+%%SERVER%%@sample etc/gnats/databases.sample
+%%SERVER%%@sample etc/gnats/gnatsd.host_access.sample
etc/gnats/defaults/addresses
etc/gnats/defaults/categories
etc/gnats/defaults/classes
@@ -19,16 +14,14 @@
etc/gnats/defaults/states
etc/gnats/defaults/submitters
etc/gnats/send-pr.conf
- at dirrm etc/gnats/defaults
- at dirrmtry etc/gnats
%%SERVER%%libexec/gnats/at-pr
%%SERVER%%libexec/gnats/check-db
%%SERVER%%libexec/gnats/delete-pr
libexec/gnats/diff-prs
libexec/gnats/file-pr
-%%SERVER%%libexec/gnats/gen-index
+@(gnats,,4555) %%SERVER%%libexec/gnats/gen-index
+@(gnats,,4555) %%SERVER%%libexec/gnats/gnatsd
%%SERVER%%libexec/gnats/gnats-pwconv
-%%SERVER%%libexec/gnats/gnatsd
libexec/gnats/mail-agent
%%SERVER%%libexec/gnats/mail-query
%%SERVER%%libexec/gnats/mkcat
@@ -37,11 +30,23 @@
libexec/gnats/pr-edit
%%SERVER%%libexec/gnats/queue-pr
%%SERVER%%libexec/gnats/rmcat
- at dirrm libexec/gnats
- at exec mkdir -p %%GNATSDBDIR%%
- at exec chown gnats %%GNATSDBDIR%%
- at unexec rmdir %%GNATSDBDIR%% 2>/dev/null || true
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+man/man1/edit-pr.1.gz
+man/man1/query-pr.1.gz
+man/man1/send-pr.1.gz
+man/man5/databases.5.gz
+man/man5/dbconfig.5.gz
+man/man7/gnats.7.gz
+man/man8/delete-pr.8.gz
+man/man8/getclose.8.gz
+man/man8/file-pr.8.gz
+man/man8/gen-index.8.gz
+man/man8/gnatsd.8.gz
+man/man8/install-sid.8.gz
+man/man8/mkcat.8.gz
+man/man8/mkdb.8.gz
+man/man8/pr-edit.8.gz
+man/man8/queue-pr.8.gz
+man/man8/rmcat.8.gz
%%EMACS_SITE_LISPDIR%%/gnats.el
+ at dir(gnats,,) %%GNATSDBDIR%%/gnats
+ at dir %%GNATSDBDIR%%
More information about the Midnightbsd-cvs
mailing list