From 39f4ba63e7cda723d48ea6912ca9f71f33a677b1 Mon Sep 17 00:00:00 2001 From: brad Date: Wed, 6 Sep 2000 05:48:47 +0000 Subject: [PATCH] remove SYSCONFDIR from SUBST_VARS and SUBST_VARS too if no other variables are listed --- comms/xcept/Makefile | 16 +++++++--------- mail/exim/Makefile | 14 ++++++-------- mail/mutt/Makefile | 6 ++---- net/icecast/Makefile | 8 +++----- net/wget/Makefile | 6 ++---- net/ytalk/Makefile | 14 +++++++------- net/zebra/Makefile | 6 ++---- textproc/urlview/Makefile | 20 +++++++++----------- www/squid/Makefile | 6 +++--- www/surfraw/Makefile | 14 ++++++-------- 10 files changed, 47 insertions(+), 63 deletions(-) diff --git a/comms/xcept/Makefile b/comms/xcept/Makefile index 727f20b7ceb..d75782e2e3f 100644 --- a/comms/xcept/Makefile +++ b/comms/xcept/Makefile @@ -1,21 +1,19 @@ -# $OpenBSD: Makefile,v 1.13 2000/09/03 16:25:04 espie Exp $ +# $OpenBSD: Makefile,v 1.14 2000/09/06 05:48:47 brad Exp $ -DISTNAME= xcept-2.1.2 +DISTNAME= xcept-2.1.2 CATEGORIES= comms -NEED_VERSION= 1.317 +NEED_VERSION= 1.324 +MASTER_SITES= ${MASTER_SITE_LOCAL} -MAINTAINER= ports@openbsd.org +MAINTAINER= ports@openbsd.org -LICENSE_TYPE= BSD PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_LOCAL} -MAKE_FLAGS=SYSCONFDIR=${SYSCONFDIR} +MAKE_FLAGS= SYSCONFDIR="${SYSCONFDIR}" -WRKDIST= ${WRKDIR}/XCept-2.1.2 -SUBST_VARS=SYSCONFDIR +WRKDIST= ${WRKDIR}/XCept-2.1.2 .include diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 0345170d328..5f81faf3243 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -1,8 +1,12 @@ -# $OpenBSD: Makefile,v 1.15 2000/08/12 23:57:45 naddy Exp $ +# $OpenBSD: Makefile,v 1.16 2000/09/06 05:48:48 brad Exp $ DISTNAME= exim-3.16 CATEGORIES= mail -NEED_VERSION= 1.319 +NEED_VERSION= 1.324 +MASTER_SITES= ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/ \ + ftp://ftp.exim.org/pub/exim/ \ + ftp://ftp.fu-berlin.de/unix/mail/exim/ +DISTFILES= exim-3.16.tar.gz exim-texinfo-3.10.tar.gz HOMEPAGE= http://www.exim.org/ @@ -13,16 +17,10 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/ \ - ftp://ftp.exim.org/pub/exim/ \ - ftp://ftp.fu-berlin.de/unix/mail/exim/ -DISTFILES= exim-3.16.tar.gz exim-texinfo-3.10.tar.gz - FLAVORS= no_x11 FLAVOR?= MAKE_ENV= FLAVOR="${FLAVOR}" -SUBST_VARS= SYSCONFDIR .if !${FLAVOR:L:Mno_x11} USE_X11= Yes .endif diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index b70fabe17bb..aba4d09fe3e 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.40 2000/08/12 13:29:55 brad Exp $ +# $OpenBSD: Makefile,v 1.41 2000/09/06 05:48:48 brad Exp $ DISTNAME= mutt-1.2.5i CATEGORIES= mail -NEED_VERSION= 1.310 +NEED_VERSION= 1.324 MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ ftp://ftp.gbnet.net/pub/mutt-international/ \ ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \ @@ -24,8 +24,6 @@ FLAVORS= slang curses imap pop FLAVOR?= curses SYSCONFDIR= /etc/mutt -SUBST_VARS= SYSCONFDIR - CONFIGURE_STYLE= gnu CONFIGURE_ARGS= --with-sharedir="${PREFIX}/share/mutt" \ --with-docdir="${PREFIX}/share/doc/mutt" \ diff --git a/net/icecast/Makefile b/net/icecast/Makefile index 46e29634eae..294fc5344f1 100644 --- a/net/icecast/Makefile +++ b/net/icecast/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.5 2000/08/29 04:57:47 brad Exp $ +# $OpenBSD: Makefile,v 1.6 2000/09/06 05:48:49 brad Exp $ -#ONLY_FOR_ARCH= i386 +ONLY_FOR_ARCH= i386 DISTNAME= icecast-1.3.7 CATEGORIES= net audio www -NEED_VERSION= 1.320 +NEED_VERSION= 1.324 MASTER_SITES= http://www.icecast.org/releases/ HOMEPAGE= http://www.icecast.org/ @@ -17,8 +17,6 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes SYSCONFDIR= /etc/icecast -SUBST_VARS= SYSCONFDIR - CONFIGURE_STYLE= gnu CONFIGURE_ARGS= --with-crypt --with-libwrap diff --git a/net/wget/Makefile b/net/wget/Makefile index 1edc59f452e..cd3a94a9d1a 100644 --- a/net/wget/Makefile +++ b/net/wget/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.22 2000/08/16 06:30:30 itojun Exp $ +# $OpenBSD: Makefile,v 1.23 2000/09/06 05:48:48 brad Exp $ DISTNAME= wget-1.5.3 CATEGORIES= net -NEED_VERSION= 1.310 +NEED_VERSION= 1.324 MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITES0= ftp://ftp.kame.net/pub/kame/misc/ MASTER_SITE_SUBDIR= wget @@ -21,8 +21,6 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -SUBST_VARS= SYSCONFDIR - CONFIGURE_STYLE= gnu dest CONFIGURE_ARGS= --enable-ipv6 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/net/ytalk/Makefile b/net/ytalk/Makefile index 0d9a927bd2d..4fc73f53e2f 100644 --- a/net/ytalk/Makefile +++ b/net/ytalk/Makefile @@ -1,12 +1,13 @@ -# $OpenBSD: Makefile,v 1.16 2000/08/16 17:02:29 brad Exp $ +# $OpenBSD: Makefile,v 1.17 2000/09/06 05:48:48 brad Exp $ DISTNAME= ytalk-3.1.1 CATEGORIES= net -NEED_VERSION= 1.319 -HOMEPAGE= http://www.iagora.com/~espel/ytalk/ -MASTER_SITES= ${HOMEPAGE} \ +NEED_VERSION= 1.324 +MASTER_SITES= http://www.iagora.com/~espel/ytalk/ \ ftp://quatramaran.ens.fr/pub/orabidoo/ytalk/ +HOMEPAGE= http://www.iagora.com/~espel/ytalk/ + MAINTAINER= espie@openbsd.org PERMIT_PACKAGE_CDROM= Yes @@ -14,12 +15,11 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes +CONFIGURE_STYLE= gnu dest + FLAVORS= no_x11 FLAVOR?= -SUBST_VARS= SYSCONFDIR - -CONFIGURE_STYLE= gnu dest .if ${FLAVOR:L:Mno_x11} CONFIGURE_ARGS+= --without-x .endif diff --git a/net/zebra/Makefile b/net/zebra/Makefile index 28cefdfef1c..2f7ea38154c 100644 --- a/net/zebra/Makefile +++ b/net/zebra/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2000/08/25 01:18:20 brad Exp $ +# $OpenBSD: Makefile,v 1.12 2000/09/06 05:48:49 brad Exp $ # KAME Id: Makefile,v 1.5 1999/09/13 16:27:41 itojun Exp # @@ -6,7 +6,7 @@ # DISTNAME= zebra-0.88 CATEGORIES= net -NEED_VERSION= 1.320 +NEED_VERSION= 1.324 MASTER_SITES= ftp://ftp.zebra.org/pub/zebra/ HOMEPAGE= http://www.zebra.org/ @@ -22,8 +22,6 @@ PERMIT_DISTFILES_FTP= Yes #CFLAGS+= -g SYSCONFDIR= /etc/zebra -SUBST_VARS= SYSCONFDIR - CONFIGURE_STYLE= gnu # diff --git a/textproc/urlview/Makefile b/textproc/urlview/Makefile index 4d4275b57f1..801b94ff8ad 100644 --- a/textproc/urlview/Makefile +++ b/textproc/urlview/Makefile @@ -1,8 +1,14 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2000/08/13 00:06:21 naddy Exp $ +# $OpenBSD: Makefile,v 1.2 2000/09/06 05:48:49 brad Exp $ DISTNAME= urlview-0.9 CATEGORIES= textproc -NEED_VERSION= 1.319 +NEED_VERSION= 1.324 +MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/contrib/ \ + ftp://ftp.cs.hmc.edu/pub/me/ \ + ftp://ftp.cs.tu-berlin.de/pub/net/mail/mutt/ \ + ftp://ftp.ilog.fr/pub/Mirrors/mutt/contrib/ \ + ftp://ftp.etri.re.kr/pub/mail/mutt/ \ + ftp://ftp.pnm.net/pub/unix/mutt/contrib/ MAINTAINER= seb@gosh.todesplanet.de @@ -11,19 +17,11 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/contrib/ \ - ftp://ftp.cs.hmc.edu/pub/me/ \ - ftp://ftp.cs.tu-berlin.de/pub/net/mail/mutt/ \ - ftp://ftp.ilog.fr/pub/Mirrors/mutt/contrib/ \ - ftp://ftp.etri.re.kr/pub/mail/mutt/ \ - ftp://ftp.pnm.net/pub/unix/mutt/contrib/ +CONFIGURE_STYLE= gnu FLAVORS= slang FLAVOR?= -CONFIGURE_STYLE= gnu -SUBST_VARS= SYSCONFDIR - .if ${FLAVOR:L:Mslang} LIB_DEPENDS= slang.14::devel/libslang CONFIGURE_ARGS= --with-slang=${LOCALBASE} diff --git a/www/squid/Makefile b/www/squid/Makefile index c77df71e768..7351fc83aa7 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.23 2000/08/31 06:43:40 brad Exp $ +# $OpenBSD: Makefile,v 1.24 2000/09/06 05:48:49 brad Exp $ DISTNAME= squid-2.3.STABLE4 PKGNAME= squid-2.3 CATEGORIES= www -NEED_VERSION= 1.322 +NEED_VERSION= 1.324 MASTER_SITES= http://www.squid-cache.org/Versions/v2/2.3/ MASTER_SITES0= http://www.squid-cache.org/Versions/v2/2.3/bugs/ EXTRACT_SUFX= -src.tar.gz @@ -25,7 +25,7 @@ PERMIT_DISTFILES_FTP= Yes SYSCONFDIR= /etc/squid STATEDIR?= /var/squid -SUBST_VARS= SYSCONFDIR STATEDIR +SUBST_VARS= STATEDIR CONFIGURE_STYLE= gnu CONFIGURE_ARGS= --localstatedir="${STATEDIR}" diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile index b7b282a53f1..deea02bb2cb 100644 --- a/www/surfraw/Makefile +++ b/www/surfraw/Makefile @@ -1,8 +1,10 @@ -# $OpenBSD: Makefile,v 1.2 2000/09/01 15:54:34 naddy Exp $ +# $OpenBSD: Makefile,v 1.3 2000/09/06 05:48:49 brad Exp $ DISTNAME= surfraw-1.0.1 -CATEGORIES= www -NEED_VERSION= 1.322 +CATEGORIES= www +NEED_VERSION= 1.324 +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= surfraw HOMEPAGE= http://surfraw.sourceforge.net/ @@ -13,11 +15,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= surfraw - -CONFIGURE_STYLE= gnu -SUBST_VARS= SYSCONFDIR +CONFIGURE_STYLE= gnu post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/surfraw