Remove redundant variables OPSYS and OPSYS_VER.
OPSYS was always "OpenBSD", the ports tree doesn't cover other operating systems. OPSYS_VER was the same as OSREV. ok espie@
This commit is contained in:
naddy
parent
c0220d10c2
commit
a2c9a774ff
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.46 2010/02/26 18:17:38 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.47 2010/07/18 18:49:01 naddy Exp $
|
||||
|
||||
COMMENT-main= GNU editor: extensible, customizable, self documenting
|
||||
COMMENT-el= elisp sources for those who want to read/modify them
|
||||
@ -32,7 +32,7 @@ MULTI_PACKAGES= -main -el -leim
|
||||
FLAVORS= no_x11
|
||||
FLAVOR?=
|
||||
|
||||
GCCARCH= ${MACHINE_ARCH}-unknown-openbsd${OPSYS_VER}
|
||||
GCCARCH= ${MACHINE_ARCH}-unknown-openbsd${OSREV}
|
||||
|
||||
CONFIGURE_STYLE= gnu dest
|
||||
CONFIGURE_ARGS= ${GCCARCH} --with-pop
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.12 2010/03/24 20:17:02 kettenis Exp $
|
||||
# $OpenBSD: Makefile,v 1.13 2010/07/18 18:49:01 naddy Exp $
|
||||
|
||||
COMMENT-main= GNU editor: extensible, customizable, self-documenting
|
||||
COMMENT-el= elisp sources for those who want to read/modify them
|
||||
@ -30,7 +30,7 @@ USE_GMAKE= Yes
|
||||
FLAVORS= gtk no_x11
|
||||
FLAVOR?=
|
||||
|
||||
GCCARCH= ${MACHINE_ARCH}-unknown-openbsd${OPSYS_VER}
|
||||
GCCARCH= ${MACHINE_ARCH}-unknown-openbsd${OSREV}
|
||||
|
||||
AUTOCONF_VERSION= 2.61
|
||||
CONFIGURE_STYLE= autoconf
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.17 2009/03/14 16:50:13 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.18 2010/07/18 18:49:01 naddy Exp $
|
||||
|
||||
ONLY_FOR_ARCHS= i386
|
||||
|
||||
@ -34,7 +34,7 @@ CONFIGURE_STYLE= autoconf
|
||||
CONFIGURE_ARGS= --with-sdl-prefix=${LOCALBASE} \
|
||||
--with-png \
|
||||
--with-opengl \
|
||||
--target=${MACHINE}-unknown-openbsd${OPSYS_VER}
|
||||
--target=${MACHINE}-unknown-openbsd${OSREV}
|
||||
CONFIGURE_ENV+= LDFLAGS="-lm" \
|
||||
CFLAGS="${CFLAGS:N-O*} -I${X11BASE}/include -I${LOCALBASE}/include/libpng"
|
||||
ALL_TARGET=
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#-*- mode: Makefile; tab-width: 4; -*-
|
||||
# ex:ts=4 sw=4 filetype=make:
|
||||
# $OpenBSD: bsd.port.mk,v 1.1022 2010/07/10 15:21:15 espie Exp $
|
||||
# $OpenBSD: bsd.port.mk,v 1.1023 2010/07/18 18:49:01 naddy Exp $
|
||||
# $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
|
||||
# $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
|
||||
#
|
||||
@ -123,8 +123,6 @@ REFETCH ?= false
|
||||
|
||||
# Constants used by the ports tree
|
||||
ARCH ?!= uname -m
|
||||
OPSYS = OpenBSD
|
||||
OPSYS_VER = ${OSREV}
|
||||
|
||||
ALL_ARCHS = alpha amd64 arm armish arm hppa hppa64 i386 landisk \
|
||||
loongson luna88k m68k m88k mac68k macppc mips64 mips64el \
|
||||
@ -1330,7 +1328,7 @@ IGNORE += "is marked as broken: ${BROKEN:Q}"
|
||||
. endif
|
||||
.endif
|
||||
.if defined(COMES_WITH)
|
||||
IGNORE += "-- ${FULLPKGNAME${SUBPACKAGE}:C/-[0-9].*//g} comes with ${OPSYS} as of release ${COMES_WITH}"
|
||||
IGNORE += "-- ${FULLPKGNAME${SUBPACKAGE}:C/-[0-9].*//g} comes with OpenBSD as of release ${COMES_WITH}"
|
||||
.endif
|
||||
|
||||
IGNORE_IS_FATAL ?= "No"
|
||||
@ -2060,7 +2058,7 @@ _internal-regress: ${_BUILD_COOKIE} ${_DEPREGRESS_COOKIES} ${_REGRESS_COOKIE}
|
||||
# packing list utilities. This generates a packing list from a recently
|
||||
# installed port. Not perfect, but pretty close. The generated file
|
||||
# will have to have some tweaks done by hand.
|
||||
# Note: add @comment PACKAGE(arch=${MACHINE_ARCH}, opsys=${OPSYS}, vers=${OPSYS_VER})
|
||||
# Note: add @comment PACKAGE(arch=${MACHINE_ARCH}, opsys=OpenBSD, vers=${OSREV})
|
||||
# when port is installed or package created.
|
||||
#
|
||||
. if ${SHARED_ONLY:L} == "yes"
|
||||
@ -2263,7 +2261,7 @@ ${_PATCH_COOKIE}: ${_EXTRACT_COOKIE}
|
||||
if [ -e $$i ]; then \
|
||||
case "${PATCH_DEBUG:L}" in \
|
||||
no) ;; \
|
||||
*) ${ECHO_MSG} "===> Applying ${OPSYS} patch $$i" ;; \
|
||||
*) ${ECHO_MSG} "===> Applying OpenBSD patch $$i" ;; \
|
||||
esac; \
|
||||
if [ -s $$i ]; then \
|
||||
${_SYSTRACE_CMD} ${PATCH} ${PATCH_ARGS} < $$i || \
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#-*- mode: Makefile; tab-width: 4; -*-
|
||||
# ex:ts=4 sw=4 filetype=make:
|
||||
# from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91
|
||||
# $OpenBSD: bsd.port.subdir.mk,v 1.96 2010/05/09 21:41:40 espie Exp $
|
||||
# $OpenBSD: bsd.port.subdir.mk,v 1.97 2010/07/18 18:49:01 naddy Exp $
|
||||
# FreeBSD Id: bsd.port.subdir.mk,v 1.20 1997/08/22 11:16:15 asami Exp
|
||||
#
|
||||
# The include file <bsd.port.subdir.mk> contains the default targets
|
||||
@ -18,8 +18,6 @@
|
||||
# ECHO_MSG Used to print all the '===>' style prompts - override this
|
||||
# to turn them off [echo].
|
||||
#
|
||||
# OPSYS Get the operating system type [`uname -s`]
|
||||
#
|
||||
# SUBDIR A list of subdirectories that should be built as well.
|
||||
# Each of the targets will execute the same target in the
|
||||
# subdirectories.
|
||||
@ -55,9 +53,6 @@
|
||||
STRIP ?= -s
|
||||
.endif
|
||||
|
||||
.if !defined(OPSYS) # XXX !!
|
||||
OPSYS = OpenBSD
|
||||
.endif
|
||||
ARCH ?!= uname -m
|
||||
|
||||
.include "${PORTSDIR}/infrastructure/mk/pkgpath.mk"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.32 2010/01/27 21:43:28 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.33 2010/07/18 18:49:01 naddy Exp $
|
||||
|
||||
COMMENT= Scheme interpreter with Tk interface
|
||||
|
||||
@ -26,7 +26,7 @@ DESTDIRNAME= root
|
||||
|
||||
NO_REGRESS= Yes
|
||||
|
||||
STK_ARCH= $(OPSYS)-$(OPSYS_VER)-$(MACHINE)
|
||||
STK_ARCH= OpenBSD-$(OSREV)-$(MACHINE)
|
||||
SUBST_VARS= STK_VERSION STK_ARCH
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.38 2010/01/27 21:43:28 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.39 2010/07/18 18:49:01 naddy Exp $
|
||||
|
||||
COMMENT= Emacs Lisp-like runtime library
|
||||
|
||||
@ -29,7 +29,7 @@ LIB_DEPENDS= gdbm.>=2::databases/gdbm \
|
||||
gmp::devel/gmp \
|
||||
ffi::devel/libffi
|
||||
|
||||
GNU_ARCH= ${MACHINE_ARCH:S/amd64/x86_64/}-unknown-openbsd${OPSYS_VER}
|
||||
GNU_ARCH= ${MACHINE_ARCH:S/amd64/x86_64/}-unknown-openbsd${OSREV}
|
||||
SUBST_VARS= GNU_ARCH VERSION
|
||||
|
||||
USE_GMAKE= Yes
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.26 2010/06/23 17:11:50 landry Exp $
|
||||
# $OpenBSD: Makefile,v 1.27 2010/07/18 18:49:01 naddy Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
@ -46,7 +46,7 @@ WRKDIST= ${WRKDIR}/enigmail
|
||||
WRKSRC= ${MOZBASE}/mailnews/extensions/enigmail
|
||||
|
||||
GNU_ARCH= ${MACHINE_ARCH:S/amd64/x86_64/}
|
||||
ENIGMAIL_XPI= ${DISTNAME:S/.1//}-${OPSYS:L}-${GNU_ARCH}.xpi
|
||||
ENIGMAIL_XPI= ${DISTNAME:S/.1//}-openbsd-${GNU_ARCH}.xpi
|
||||
|
||||
# unzip ${ENIGMAIL_XPI} and inspect install.rdf for GUID
|
||||
GUID= {847b3a00-7ab1-11d4-8f02-006008948af5}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.48 2010/07/18 14:33:39 steven Exp $
|
||||
# $OpenBSD: Makefile,v 1.49 2010/07/18 18:49:01 naddy Exp $
|
||||
|
||||
# vax: no IEEE arithmetic
|
||||
# sparc: fPIC version of libgcc.a needed but not available
|
||||
@ -70,7 +70,7 @@ CONFIGURE_ENV+= FFLAGS="${FFLAGS}"
|
||||
.endif
|
||||
|
||||
# needed to build on amd64
|
||||
GCC_ARCH= ${MACHINE_ARCH}-unknown-openbsd${OPSYS_VER}
|
||||
GCC_ARCH= ${MACHINE_ARCH}-unknown-openbsd${OSREV}
|
||||
GNU_ARCH= ${GCC_ARCH:S/amd64/x86_64/}
|
||||
SUBST_VARS= GNU_ARCH VERSION
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.31 2010/07/18 10:50:12 steven Exp $
|
||||
# $OpenBSD: Makefile,v 1.32 2010/07/18 18:49:01 naddy Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
@ -69,7 +69,7 @@ CONFIGURE_ARGS= -D ENABLE_java=OFF \
|
||||
-D ENABLE_octave=OFF \
|
||||
-D PLD_wxwidgets=OFF
|
||||
|
||||
GCC_ARCH= ${MACHINE_ARCH}-unknown-openbsd${OPSYS_VER}
|
||||
GCC_ARCH= ${MACHINE_ARCH}-unknown-openbsd${OSREV}
|
||||
GNU_ARCH= ${GCC_ARCH:S/amd64/x86_64/}
|
||||
SUBST_VARS+= GNU_ARCH
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.15 2009/10/06 09:25:12 benoit Exp $
|
||||
# $OpenBSD: Makefile,v 1.16 2010/07/18 18:49:01 naddy Exp $
|
||||
|
||||
# see md.h, add others
|
||||
ONLY_FOR_ARCHS = amd64 alpha i386 sparc
|
||||
@ -32,11 +32,11 @@ NO_REGRESS = Yes
|
||||
|
||||
do-install:
|
||||
${INSTALL_PROGRAM} \
|
||||
${WRKSRC}/OPENBSD_${OPSYS_VER}_OPT/libst.so.${LIBst_VERSION} \
|
||||
${WRKSRC}/OPENBSD_${OSREV}_OPT/libst.so.${LIBst_VERSION} \
|
||||
${PREFIX}/lib
|
||||
${INSTALL_DATA} ${WRKSRC}/OPENBSD_${OPSYS_VER}_OPT/libst.a \
|
||||
${INSTALL_DATA} ${WRKSRC}/OPENBSD_${OSREV}_OPT/libst.a \
|
||||
${PREFIX}/lib
|
||||
${INSTALL_DATA} ${WRKSRC}/OPENBSD_${OPSYS_VER}_OPT/st.h \
|
||||
${INSTALL_DATA} ${WRKSRC}/OPENBSD_${OSREV}_OPT/st.h \
|
||||
${PREFIX}/include
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libst
|
||||
${INSTALL_DATA} ${WRKSRC}/docs/* ${PREFIX}/share/doc/libst
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.36 2010/01/27 21:43:28 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.37 2010/07/18 18:49:02 naddy Exp $
|
||||
|
||||
COMMENT= GTK+ binding for librep Lisp environment
|
||||
|
||||
@ -30,7 +30,7 @@ LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2
|
||||
|
||||
MODULES= devel/gettext
|
||||
|
||||
GNU_ARCH= ${MACHINE_ARCH:S/amd64/x86_64/}-unknown-openbsd${OPSYS_VER}
|
||||
GNU_ARCH= ${MACHINE_ARCH:S/amd64/x86_64/}-unknown-openbsd${OSREV}
|
||||
SUBST_VARS= GNU_ARCH VERSION
|
||||
|
||||
USE_X11= Yes
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.43 2010/05/26 21:29:10 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.44 2010/07/18 18:49:02 naddy Exp $
|
||||
|
||||
COMMENT= extensible window manager
|
||||
|
||||
@ -32,7 +32,7 @@ WANTLIB += pcre pixman-1 png pthread pthread-stubs rep xcb z
|
||||
|
||||
MODULES= devel/gettext
|
||||
|
||||
GNU_ARCH= ${MACHINE_ARCH:S/amd64/x86_64/}-unknown-openbsd${OPSYS_VER}
|
||||
GNU_ARCH= ${MACHINE_ARCH:S/amd64/x86_64/}-unknown-openbsd${OSREV}
|
||||
SUBST_VARS= GNU_ARCH VERSION
|
||||
|
||||
USE_X11= Yes
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user