cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- SYSCONFDIR and LOCALBASE are already part of the generic SUBST_VARS

Browse Source 
looks good to landry@
This commit is contained in:
ajacoutot 2008-09-18 13:37:41 +00:00
parent 6aae695305
commit cf10739f24
20 changed files with 25 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/xulrunner/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.28 2008/08/29 01:16:47 martynas Exp $ # $OpenBSD: Makefile,v 1.29 2008/09/18 13:37:41 ajacoutot Exp $
ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64 ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64
@ -56,7 +56,6 @@ USE_X11= Yes
USE_GMAKE= Yes USE_GMAKE= Yes
# Regression tests do nothing # Regression tests do nothing
NO_REGRESS= Yes NO_REGRESS= Yes
SUBST_VARS= LOCALBASE
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/build/autoconf MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/build/autoconf

4
graphics/sane-frontends/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.16 2008/06/29 20:44:52 sthen Exp $ # $OpenBSD: Makefile,v 1.17 2008/09/18 13:37:41 ajacoutot Exp $
COMMENT= API for accessing scanners, frontends COMMENT= API for accessing scanners, frontends
@ -32,8 +32,6 @@ MODULES= devel/gettext
LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \ LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
sane.>=1::graphics/sane-backends sane.>=1::graphics/sane-backends
SUBST_VARS= LOCALBASE
USE_X11= Yes USE_X11= Yes
USE_GMAKE= Yes USE_GMAKE= Yes
CONFIGURE_STYLE=gnu CONFIGURE_STYLE=gnu

4
graphics/xsane/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2008/06/29 20:44:52 sthen Exp $ # $OpenBSD: Makefile,v 1.12 2008/09/18 13:37:41 ajacoutot Exp $
COMMENT= scanner frontend for SANE COMMENT= scanner frontend for SANE
@ -34,8 +34,6 @@ LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
lcms.>=1::graphics/lcms \ lcms.>=1::graphics/lcms \
sane.>=1::graphics/sane-backends sane.>=1::graphics/sane-backends
SUBST_VARS= LOCALBASE
USE_X11= Yes USE_X11= Yes
USE_GMAKE= Yes USE_GMAKE= Yes
CONFIGURE_STYLE=gnu CONFIGURE_STYLE=gnu

4
lang/vala/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2008/06/29 22:04:56 jasper Exp $ # $OpenBSD: Makefile,v 1.6 2008/09/18 13:37:41 ajacoutot Exp $
COMMENT= compiler for the GObject type system COMMENT= compiler for the GObject type system
@ -36,8 +36,6 @@ CONFIGURE_ARGS+= --enable-gen-project \
CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" \ CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include" CPPFLAGS="-I${LOCALBASE}/include"
SUBST_VARS= LOCALBASE
pre-regress: pre-regress:
${SUBST_CMD} ${WRKSRC}/tests/testrunner.sh ${SUBST_CMD} ${WRKSRC}/tests/testrunner.sh
chmod +x ${WRKSRC}/tests/testrunner.sh chmod +x ${WRKSRC}/tests/testrunner.sh

3
mail/mozilla-thunderbird/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.73 2008/08/23 22:07:03 martynas Exp $ # $OpenBSD: Makefile,v 1.74 2008/09/18 13:37:41 ajacoutot Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64 ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64
@ -60,7 +60,6 @@ USE_X11= Yes
USE_GMAKE= Yes USE_GMAKE= Yes
# Regression tests are too hard to adapt to run here # Regression tests are too hard to adapt to run here
NO_REGRESS= Yes NO_REGRESS= Yes
SUBST_VARS= LOCALBASE
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/build/autoconf \ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/build/autoconf \
${WRKSRC}/directory/c-sdk/config/autoconf ${WRKSRC}/directory/c-sdk/config/autoconf

3
net/openh323/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.19 2008/09/08 17:17:10 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.20 2008/09/18 13:37:41 ajacoutot Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
@ -32,7 +32,6 @@ LIB_DEPENDS= pt.>=2::devel/pwlib \
avutil.>=2::graphics/ffmpeg avutil.>=2::graphics/ffmpeg
WRKDIST= ${WRKDIR}/${DISTNAME:S/-/_/} WRKDIST= ${WRKDIR}/${DISTNAME:S/-/_/}
SUBST_VARS= LOCALBASE
USE_GMAKE= Yes USE_GMAKE= Yes
ALL_TARGET= optshared ALL_TARGET= optshared

8
net/samba/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.98 2008/09/17 10:38:59 brad Exp $ # $OpenBSD: Makefile,v 1.99 2008/09/18 13:37:41 ajacoutot Exp $
COMMENT-main= SMB and CIFS client and server for UNIX COMMENT-main= SMB and CIFS client and server for UNIX
COMMENT-docs= additional documentation and examples for Samba COMMENT-docs= additional documentation and examples for Samba
@ -35,9 +35,9 @@ MAKE_FLAGS= PASSWD_PROGRAM="/usr/bin/passwd" \
LIBsmbclient_VERSION=${LIBsmbclient_VERSION} \ LIBsmbclient_VERSION=${LIBsmbclient_VERSION} \
LIBmsrpc_VERSION=${LIBmsrpc_VERSION} LIBmsrpc_VERSION=${LIBmsrpc_VERSION}
CONFDIR= ${SYSCONFDIR}/samba CONFDIR= ${SYSCONFDIR}/samba
SAMBA_LOGDIR= /var/log SAMBA_LOGDIR= /var/log
SUBST_VARS= CONFDIR LOCALBASE SYSCONFDIR SUBST_VARS= CONFDIR
SEPARATE_BUILD= concurrent SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= gnu CONFIGURE_STYLE= gnu

4
print/cups/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.31 2007/12/11 08:00:06 jakemsr Exp $ # $OpenBSD: Makefile,v 1.32 2008/09/18 13:37:41 ajacoutot Exp $
COMMENT= Common Unix Printing System COMMENT= Common Unix Printing System
@ -62,8 +62,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
CFLAGS+= "-I${LOCALBASE}/include" \ CFLAGS+= "-I${LOCALBASE}/include" \
"-I${LOCALBASE}/include/libpng" "-I${LOCALBASE}/include/libpng"
SUBST_VARS= LOCALBASE
WRKDIST= ${WRKDIR}/${DISTNAME:S/-source//} WRKDIST= ${WRKDIR}/${DISTNAME:S/-source//}
USE_GMAKE= Yes USE_GMAKE= Yes

3
print/foo2zjs/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2008/02/13 04:40:17 merdely Exp $ # $OpenBSD: Makefile,v 1.4 2008/09/18 13:37:41 ajacoutot Exp $
COMMENT= driver for ZjStream wire protocol compatible printers COMMENT= driver for ZjStream wire protocol compatible printers
@ -26,7 +26,6 @@ MASTER_SITES= http://bigio.snb.it/openbsd/distfiles/ \
USE_GMAKE= Yes USE_GMAKE= Yes
WRKDIST= ${WRKDIR}/foo2zjs WRKDIST= ${WRKDIR}/foo2zjs
SUBST_VARS= LOCALBASE
BUILD_DEPENDS= ::print/ghostscript/gnu # ps2pdf BUILD_DEPENDS= ::print/ghostscript/gnu # ps2pdf
RUN_DEPENDS= ::print/ghostscript/gnu RUN_DEPENDS= ::print/ghostscript/gnu

3
print/foomatic-db-engine/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2007/10/27 23:44:41 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.4 2008/09/18 13:37:41 ajacoutot Exp $
COMMENT= Foomatic PPD generator COMMENT= Foomatic PPD generator
@ -75,7 +75,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2"
CUPS_LPINFO="${LOCALBASE}/sbin/lpinfo" CUPS_LPINFO="${LOCALBASE}/sbin/lpinfo"
NO_REGRESS= Yes NO_REGRESS= Yes
SUBST_VARS= LOCALBASE
pre-configure: pre-configure:
@perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g' \ @perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g' \

4
print/foomatic-db/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2007/10/27 23:44:41 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.4 2008/09/18 13:37:41 ajacoutot Exp $
COMMENT= Foomatic PPD data COMMENT= Foomatic PPD data
@ -30,8 +30,6 @@ PKG_ARCH= *
WRKDIST= ${WRKDIR}/foomatic-db-${V} WRKDIST= ${WRKDIR}/foomatic-db-${V}
SUBST_VARS= LOCALBASE
NO_BUILD= Yes NO_BUILD= Yes
NO_REGRESS= Yes NO_REGRESS= Yes

4
print/foomatic-filters/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2008/01/04 17:48:37 espie Exp $ # $OpenBSD: Makefile,v 1.5 2008/09/18 13:37:41 ajacoutot Exp $
COMMENT= Foomatic PPD print filters COMMENT= Foomatic PPD print filters
@ -34,8 +34,6 @@ CONFIGURE_ENV= CUPS="${LOCALBASE}/libexec/cups" \
FAKE_FLAGS= ETCDIR="${PREFIX}/share/examples/foomatic" FAKE_FLAGS= ETCDIR="${PREFIX}/share/examples/foomatic"
SUBST_VARS+= SYSCONFDIR
PKG_ARCH= * PKG_ARCH= *
NO_REGRESS= Yes NO_REGRESS= Yes

4
security/py-crypto/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.10 2008/06/11 02:59:32 wcmaier Exp $ # $OpenBSD: Makefile,v 1.11 2008/09/18 13:37:41 ajacoutot Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
@ -26,8 +26,6 @@ LIB_DEPENDS= gmp.>=6::devel/gmp
DOCSDIR= ${PREFIX}/share/doc/py-crypto DOCSDIR= ${PREFIX}/share/doc/py-crypto
SUBST_VARS+= LOCALBASE
pre-configure: pre-configure:
@${SUBST_CMD} ${WRKSRC}/setup.py @${SUBST_CMD} ${WRKSRC}/setup.py

4
sysutils/heartbeat/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2008/05/18 15:53:54 kili Exp $ # $OpenBSD: Makefile,v 1.4 2008/09/18 13:37:41 ajacoutot Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
@ -84,7 +84,7 @@ HBUSER= _heartbeat
HBUID= 596 HBUID= 596
HBGROUP= _heartbeat HBGROUP= _heartbeat
HBGID= 596 HBGID= 596
SUBST_VARS= HBUSER HBGROUP HBUID HBGID SYSCONFDIR SUBST_VARS= HBUSER HBGROUP HBUID HBGID
CONFIGURE_SCRIPT=ConfigureMe CONFIGURE_SCRIPT=ConfigureMe
CONFIGURE_STYLE=gnu CONFIGURE_STYLE=gnu

3
www/firefox3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2008/09/15 19:20:07 martynas Exp $ # $OpenBSD: Makefile,v 1.9 2008/09/18 13:37:41 ajacoutot Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64 ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64
@ -62,7 +62,6 @@ USE_X11= Yes
USE_GMAKE= Yes USE_GMAKE= Yes
# Regression tests are too hard to adapt to run here # Regression tests are too hard to adapt to run here
NO_REGRESS= Yes NO_REGRESS= Yes
SUBST_VARS= LOCALBASE
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/build/autoconf MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/build/autoconf

3
www/mozilla-firefox/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.101 2008/08/19 23:53:45 martynas Exp $ # $OpenBSD: Makefile,v 1.102 2008/09/18 13:37:41 ajacoutot Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64 ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64
@ -61,7 +61,6 @@ USE_X11= Yes
USE_GMAKE= Yes USE_GMAKE= Yes
# Regression tests are too hard to adapt to run here # Regression tests are too hard to adapt to run here
NO_REGRESS= Yes NO_REGRESS= Yes
SUBST_VARS= LOCALBASE
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/build/autoconf MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/build/autoconf

3
www/pecl-APC/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2008/06/04 09:02:59 sthen Exp $ # $OpenBSD: Makefile,v 1.12 2008/09/18 13:37:41 ajacoutot Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
@ -40,7 +40,6 @@ CONFIGURE_ENV= AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
PREFIX= /var/www PREFIX= /var/www
DESTDIRNAME= INSTALL_ROOT DESTDIRNAME= INSTALL_ROOT
SUBST_VARS= LOCALBASE
NO_REGRESS= Yes NO_REGRESS= Yes

3
www/pecl-memcache/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2008/01/21 20:36:05 sthen Exp $ # $OpenBSD: Makefile,v 1.9 2008/09/18 13:37:41 ajacoutot Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
@ -36,7 +36,6 @@ CONFIGURE_ENV= AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
PREFIX= /var/www PREFIX= /var/www
DESTDIRNAME= INSTALL_ROOT DESTDIRNAME= INSTALL_ROOT
SUBST_VARS= LOCALBASE
NO_REGRESS= Yes NO_REGRESS= Yes

4
www/php5/extensions/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.43 2008/05/20 14:01:45 robert Exp $ # $OpenBSD: Makefile,v 1.44 2008/09/18 13:37:41 ajacoutot Exp $
FULLPKGNAME-main= php5-extensions-${V} FULLPKGNAME-main= php5-extensions-${V}
COMMENT-main= informational package about PHP5 extensions COMMENT-main= informational package about PHP5 extensions
@ -364,7 +364,7 @@ MODULE_NAME${i}= ${i:S/-//g}
MESSAGE= ${PKGDIR}/MESSAGE MESSAGE= ${PKGDIR}/MESSAGE
UNMESSAGE= ${PKGDIR}/UNMESSAGE UNMESSAGE= ${PKGDIR}/UNMESSAGE
SUBST_VARS= MODULE_NAME PHP_CONFIG_FILE LOCALBASE V SUBST_VARS= MODULE_NAME PHP_CONFIG_FILE V
LIB_DEPENDS-main= LIB_DEPENDS-main=
MESSAGE-main= ${PKGDIR}/DESCR-main MESSAGE-main= ${PKGDIR}/DESCR-main

3
www/seamonkey/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2008/07/25 17:41:06 martynas Exp $ # $OpenBSD: Makefile,v 1.26 2008/09/18 13:37:41 ajacoutot Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
ONLY_FOR_ARCHS= alpha amd64 i386 powerpc sparc sparc64 ONLY_FOR_ARCHS= alpha amd64 i386 powerpc sparc sparc64
@ -95,7 +95,6 @@ VMEM_WARNING= Yes
USE_X11= Yes USE_X11= Yes
USE_GMAKE= Yes USE_GMAKE= Yes
NO_REGRESS= Yes NO_REGRESS= Yes
SUBST_VARS= LOCALBASE
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/build/autoconf \ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/build/autoconf \
${WRKSRC}/directory/c-sdk/config/autoconf ${WRKSRC}/directory/c-sdk/config/autoconf