Index: head/net-mgmt/rancid3/Makefile =================================================================== --- head/net-mgmt/rancid3/Makefile (revision 378724) +++ head/net-mgmt/rancid3/Makefile (revision 378725) @@ -1,105 +1,105 @@ # Created by: Janos.Mohacsi@bsd.hu # $FreeBSD$ PORTNAME= rancid PORTVERSION= 3.1 PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= ftp://ftp.shrubbery.net/pub/rancid/ PKGNAMESUFFIX= 3 MAINTAINER= feld@FreeBSD.org COMMENT= Really Awesome New Cisco confIg Differ LIB_DEPENDS= libexpect.so:${PORTSDIR}/lang/expect RUN_DEPENDS= p5-LockFile-Simple>=0:${PORTSDIR}/devel/p5-LockFile-Simple USES= gmake perl5 shebangfix perl_OLD_CMD= @PERLV_PATH@ SHEBANG_FILES= bin/* USERS= rancid GROUPS= rancid SUB_FILES= pkg-message GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/var/${PORTNAME}/ \ --bindir=${PREFIX}/libexec/${PORTNAME}/ \ --sysconfdir=${PREFIX}/etc/${PORTNAME}/ OLDCONFIG_FILE1= bin/env OLDCONFIG_FILE2= util/lg/lg.conf NEWERCONFIG_FILES1= etc/rancid.conf NEWERCONFIG_FILES2= etc/lg.conf NEWCONFIG_FILES= rancid.conf lg.conf OPTIONS_DEFINE= SVN OPTIONS_DEFAULT= SVN_DESC= Use Subversion instead of CVS CONFLICTS= rancid-[0-9]* .include .if ${PORT_OPTIONS:MSVN} CONFIGURE_ARGS+= --with-svn BUILD_DEPENDS+= svn:${PORTSDIR}/devel/subversion .else CONFIGURE_ARGS+= --without-svn .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 RUN_DEPENDS+= cvs>0:${PORTSDIR}/devel/cvs .endif .endif pre-everything:: @ ${ECHO} "Make sure your rancid repository is quiet before upgrading; disable rancid cron jobs" post-patch: - ${REINPLACE_CMD} "s|par.1|rancid-par.1|" ${WRKSRC}/man/Makefile.in ${WRKSRC}/man/Makefile.am + ${REINPLACE_CMD} "s|par.1|rancid-par.1|" ${WRKSRC}/man/Makefile.in ${MV} ${WRKSRC}/man/par.1 ${WRKSRC}/man/rancid-par.1 post-install: ${LN} -s ${PREFIX}/libexec/${PORTNAME}/rancid-cvs ${STAGEDIR}${PREFIX}/bin ${LN} -s ${PREFIX}/libexec/${PORTNAME}/rancid-run ${STAGEDIR}${PREFIX}/bin .if !defined(BATCH) @ ${ECHO} @ ${CAT} ${PKGMESSAGE} @ ${ECHO} .endif .for file in ${NEWCONFIG_FILES} @ if [ -f ${PREFIX}/etc/${PORTNAME}/${file} ] ; then \ ${ECHO} "WARNING: *** new ${file} file is installed as ${PREFIX}/rancid/${file}.sample"; \ ${ECHO} " : *** review ${file}.sample for new/deprecated switches or install in place ${file}"; \ fi .endfor @ if [ -f ${PREFIX}/rancid/${NEWERCONFIG_FILE1} ] ; then \ ${ECHO} "WARNING: *** ${PREFIX}/rancid/${NEWERCONFIG_FILE1} has been replaced with "; \ ${ECHO} " : *** ${PREFIX}/etc/${PORTNAME}/rancid.conf. Merge from sample and old file "; \ fi @ if [ -f ${PREFIX}/rancid/${NEWERCONFIG_FILE2} ] ; then \ ${ECHO} "WARNING: *** ${PREFIX}/rancid/${NEWERCONFIG_FILE2} has been replaced with "; \ ${ECHO} " : *** ${PREFIX}/etc/${PORTNAME}/lg.conf. Merge from sample and old file "; \ fi @ if [ -f ${PREFIX}/rancid/${NEWERCONFIG_FILE1} -o \ -f ${PREFIX}/rancid/${NEWERCONFIG_FILE2} ] ; then \ ${ECHO} "WARNING: *** New CVS Repository will be stored ${PREFIX}/var/${PORTNAME}/ "; \ ${ECHO} " : *** Copy the repository if you want to keep the history "; \ fi @ if [ -f ${PREFIX}/rancid/${OLDCONFIG_FILE1} ] ; then \ ${ECHO} "WARNING: *** ${PREFIX}/rancid/${OLDCONFIG_FILE1} has been replaced with "; \ ${ECHO} " : *** ${PREFIX}/etc/${PORTNAME}/rancid.conf. Merge from sample and old file "; \ fi @ if [ -f ${PREFIX}/rancid/${OLDCONFIG_FILE2} ] ; then \ ${ECHO} "WARNING: *** ${PREFIX}/rancid/${OLDCONFIG_FILE2} has been replaced with "; \ ${ECHO} " : *** ${PREFIX}/etc/${PORTNAME}/lg.conf. Merge from sample and old file "; \ fi @ if [ -f ${PREFIX}/rancid/${OLDCONFIG_FILE1} -o \ -f ${PREFIX}/rancid/${OLDCONFIG_FILE2} ] ; then \ ${ECHO} "WARNING: *** New CVS Repository will be stored ${PREFIX}/rancid/var "; \ ${ECHO} " : *** Copy the repository if you want to keep the history "; \ fi .include Index: head/net-mgmt/rancid3/files/patch-etc__Makefile.am =================================================================== --- head/net-mgmt/rancid3/files/patch-etc__Makefile.am (revision 378724) +++ head/net-mgmt/rancid3/files/patch-etc__Makefile.am (nonexistent) @@ -1,37 +0,0 @@ ---- etc/Makefile.am.orig 2014-09-05 15:59:52 UTC -+++ etc/Makefile.am -@@ -25,30 +25,10 @@ - endif - - install-data-local: all -- @if test "$(DO_CONF_INSTALL)" = "yes"; then \ -- if test -f $(DESTDIR)$(sysconfdir)/rancid.conf ; then \ -- echo ""; \ -- echo "WARNING: *** $(DESTDIR)$(sysconfdir)/rancid.conf exists. See "; \ -- echo " *** $(pkgdatadir)/rancid.conf.sample for new"; \ -- echo " *** examples."; \ -- echo ""; \ -- else \ -- $(INSTALL_DATA) rancid.conf.sample $(DESTDIR)$(sysconfdir)/rancid.conf; \ -- fi; \ -- if test ! -f $(DESTDIR)$(sysconfdir)/rancid.types.conf ; then \ -- $(INSTALL_DATA) rancid.types.conf $(DESTDIR)$(sysconfdir)/rancid.types.conf; \ -- fi; \ -- if test -f $(DESTDIR)$(sysconfdir)/lg.conf ; then \ -- echo ""; \ -- echo "WARNING: *** $(DESTDIR)$(sysconfdir)/lg.conf exists. See "; \ -- echo " *** $(pkgdatadir)/lg.conf.sample for new"; \ -- echo " *** examples."; \ -- echo ""; \ -- else \ -- $(INSTALL_DATA) lg.conf.sample $(DESTDIR)$(sysconfdir)/lg.conf; \ -- fi; \ -- fi; \ -- $(INSTALL_DATA) rancid.types.base $(DESTDIR)$(sysconfdir)/rancid.types.base -+ $(INSTALL_DATA) rancid.conf.sample $(DESTDIR)$(sysconfdir) -+ #$(INSTALL_DATA) rancid.types.conf $(DESTDIR)$(sysconfdir) -+ $(INSTALL_DATA) lg.conf.sample $(DESTDIR)$(sysconfdir) -+ $(INSTALL_DATA) rancid.types.base $(DESTDIR)$(sysconfdir) - - #clean: - # rm -f Makefile rancid.conf $(BIN_DATAS) $(BIN_PROGS) Property changes on: head/net-mgmt/rancid3/files/patch-etc__Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property