Page MenuHomeFreeBSD
Differential D17459 Diff 60169 net-mgmt/rancid3/Makefile

Changeset View

Standalone View

View Options

net-mgmt/rancid3/Makefile

# Created by: Janos.Mohacsi@bsd.hu # Created by: Janos.Mohacsi@bsd.hu
# $FreeBSD$ # $FreeBSD$
PORTNAME= rancid PORTNAME= rancid
PORTVERSION= 3.9 PORTVERSION= 3.9
PORTREVISION= 0 PORTREVISION= 1
CATEGORIES= net-mgmt CATEGORIES= net-mgmt
MASTER_SITES= ftp://ftp.shrubbery.net/pub/rancid/ MASTER_SITES= ftp://ftp.shrubbery.net/pub/rancid/
PKGNAMESUFFIX= 3 PKGNAMESUFFIX= 3
MAINTAINER= feld@FreeBSD.org MAINTAINER= feld@FreeBSD.org
COMMENT= Really Awesome New Cisco confIg Differ COMMENT= Really Awesome New Cisco confIg Differ
LIB_DEPENDS= libexpect.so:lang/expect LIB_DEPENDS= libexpect.so:lang/expect
Show All 14 LinesCONFIGURE_ARGS= --localstatedir=${LOCALBASE}/var/${PORTNAME}/ \
--sysconfdir=${LOCALBASE}/etc/${PORTNAME}/ --sysconfdir=${LOCALBASE}/etc/${PORTNAME}/
OLDCONFIG_FILE1= bin/env OLDCONFIG_FILE1= bin/env
OLDCONFIG_FILE2= util/lg/lg.conf OLDCONFIG_FILE2= util/lg/lg.conf
NEWERCONFIG_FILE1= etc/rancid.conf NEWERCONFIG_FILE1= etc/rancid.conf
NEWERCONFIG_FILE2= etc/lg.conf NEWERCONFIG_FILE2= etc/lg.conf
NEWCONFIG_FILES= rancid.conf lg.conf NEWCONFIG_FILES= rancid.conf lg.conf
OPTIONS_DEFINE= COMWARE SVN OPTIONS_DEFINE= COMWARE SUBVERSION
OPTIONS_DEFAULT= OPTIONS_DEFAULT=
COMWARE_DESC= Add experimental support for Comware devices COMWARE_DESC= Add experimental support for Comware devices
SVN_DESC= Use Subversion instead of CVS SUBVERSION_DESC= Use Subversion instead of CVS
koobsUnsubmitted
Done
Inline Actions

For this port: Is this option for explicitly and only for 'version control' support, or something else/more? The current description reads like it *swaps* version control support from CVS to SVN (does this mean CVS is no longer supported?)

If so, this change is fine.

If not, change the option name (SVN -> SUBVERSION) but leave the defined (overriding) description

koobs: For this port: Is this option for explicitly and only for 'version control' support, or…
koobsUnsubmitted
Done
Inline Actions

These 3 seem to be covered by the default descriptions

koobs: These 3 seem to be covered by the default descriptions
.include <bsd.port.options.mk> .include <bsd.port.options.mk>
koobsUnsubmitted
Not Done
Inline Actions

Were the following cases tested:

  • FOO_CONFIGURE_WITH instead of _ON, which sets --without-foo in the OFF case. This is preferred if it works, because *explicit* disabling is better than not, because autoconf setups often do 'autodetection' (see test case below)
  • The build explicitly doesn't find or build with svn support, when the option is OFF but subversion is *installed*
koobs: Were the following cases tested: - FOO_CONFIGURE_WITH instead of _ON, which sets --without…
loaderAuthorUnsubmitted
Done
Inline Actions

The configure script does not find and build with svn or git automatically
unless --with-svn or --with-git is specified in CONFIGURE_ARGS.

${WRKSRC}/configure.ac:

133	# Configure for subversion revision control system instead of CVS.
134	SVN_FSTYPE="--fs-type fsfs"
135	AC_MSG_CHECKING([whether subversion])
136	AC_ARG_WITH(svn,
137		AS_HELP_STRING([--with-svn=fstype],
138				[use subversion instead of cvs, with optional svn fstype (fsfs|bdb)]),
139	[ case "$withval" in
140	  yes)
141		AC_MSG_RESULT(yes)
142		RCSSYS="svn"
143		;;
144	  fsfs)
145		AC_MSG_RESULT([yes fstype fsfs])
146		RCSSYS="svn"
147		SVN_FSTYPE="--fs-type fsfs"
148		;;
149	  bdb)
150		AC_MSG_RESULT([yes fstype bdb])
151		RCSSYS="svn"
152		SVN_FSTYPE="--fs-type bdb"
153		;;
154	  no)
155		AC_MSG_RESULT(no)
156		RCSSYS="cvs"
157		;;
158	  *)
159		AC_MSG_ERROR([unknown svn fs-type $withval])
160	  esac
161	], [AC_MSG_RESULT(no)
162	    AC_ARG_WITH(git,
163		AS_HELP_STRING([--with-git], [use git instead of cvs]),
164	    [ case "$withval" in
165	      yes)
166		AC_MSG_RESULT(yes)
167		RCSSYS="git"
168		;;
169	      no)
170		AC_MSG_RESULT(no)
171		RCSSYS="cvs"
172	      esac
173	    ], [AC_MSG_RESULT(no)
174	        RCSSYS="cvs"
175	    ])
176	])
177	AC_SUBST(RCSSYS)
178	AC_SUBST(SVN_FSTYPE)
179	rd_cv_RCSSYS=$RCSSYS
180

The value of RCSSYS only affects rancid.conf.sample in the final package:

${STAGEDIR}/usr/local/share/rancid/rancid.conf.sample:

63	# Select which RCS system to use, "cvs" (default), "svn" or "git".  Do not
64	# change this after CVSROOT has been created with rancid-cvs.  Changing between
65	# these requires manual conversions.
66	RCSSYS=cvs; export RCSSYS
67	#
loader: The configure script does not find and build with svn or git automatically unless --with-svn or…
.if ${PORT_OPTIONS:MCOMWARE} .if ${PORT_OPTIONS:MCOMWARE}
PLIST_SUB+= COMWARE="" PLIST_SUB+= COMWARE=""
.else .else
PLIST_SUB+= COMWARE="@comment " PLIST_SUB+= COMWARE="@comment "
.endif .endif
.if ${PORT_OPTIONS:MSVN} .if ${PORT_OPTIONS:MSUBVERSION}
CONFIGURE_ARGS+= --with-svn CONFIGURE_ARGS+= --with-svn
BUILD_DEPENDS+= svn:devel/subversion BUILD_DEPENDS+= svn:devel/subversion
.else .else
CONFIGURE_ARGS+= --without-svn CONFIGURE_ARGS+= --without-svn
RUN_DEPENDS+= cvs:devel/cvs RUN_DEPENDS+= cvs:devel/cvs
.endif .endif
pre-everything:: pre-everything::
▲ Show 20 Lines • Show All 56 Lines • Show Last 20 Lines