recent versions of kde and propolice seem to agree now.

This commit is contained in:
espie 2005-01-26 10:56:11 +00:00
parent ff6ff11201
commit d8edc2feff

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.30 2004/09/18 09:30:06 espie Exp $ # $OpenBSD: Makefile.inc,v 1.31 2005/01/26 10:56:11 espie Exp $
DIST_SUBDIR?= kde DIST_SUBDIR?= kde
HOMEPAGE?= http://www.kde.org HOMEPAGE?= http://www.kde.org
.if defined(VERSION) && ${VERSION} == "3.1.95" .if defined(VERSION) && ${VERSION} == "3.1.95"
@ -11,6 +11,7 @@ MASTER_SITES?= ${MASTER_SITE_KDE:S@$@stable/3.3/src/@}
MASTER_SITES?= ${MASTER_SITE_KDE:S@$@stable/${VERSION}/src/@} MASTER_SITES?= ${MASTER_SITE_KDE:S@$@stable/${VERSION}/src/@}
.endif .endif
EXTRACT_SUFX?= .tar.bz2 EXTRACT_SUFX?= .tar.bz2
MASTER_SITES0= ${MASTER_SITE_KDE:=security_patches/}
# Parts of kde want shared libraries to work, as some symbols are # Parts of kde want shared libraries to work, as some symbols are
# duplicated over the place. # duplicated over the place.
@ -41,5 +42,3 @@ PERMIT_DISTFILES_CDROM?= Yes
PERMIT_DISTFILES_FTP?= Yes PERMIT_DISTFILES_FTP?= Yes
PERMIT_PACKAGE_CDROM?= Yes PERMIT_PACKAGE_CDROM?= Yes
PERMIT_PACKAGE_FTP?= Yes PERMIT_PACKAGE_FTP?= Yes
CFLAGS+=-fno-stack-protector
CXXFLAGS+=-fno-stack-protector