aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--archivers/deco/Makefile8
-rw-r--r--archivers/libarchive/Makefile8
-rw-r--r--archivers/p5-Compress-Raw-Lzma/Makefile12
-rw-r--r--archivers/pixz/Makefile10
-rw-r--r--archivers/py-liblzma/Makefile8
-rw-r--r--archivers/tardy/Makefile8
-rw-r--r--devel/libgta/Makefile8
-rw-r--r--devel/mingw32-bin-msvcrt/Makefile13
-rw-r--r--games/openttd/Makefile4
-rw-r--r--security/openvpn-auth-ldap/Makefile4
-rw-r--r--sysutils/squashfs-tools/Makefile3
-rw-r--r--textproc/bsdgrep/Makefile7
-rw-r--r--textproc/the_silver_searcher/Makefile5
-rw-r--r--www/links/Makefile4
-rw-r--r--x11/kde4-runtime/Makefile4
-rw-r--r--x11/kdelibs4/Makefile4
16 files changed, 8 insertions, 102 deletions
diff --git a/archivers/deco/Makefile b/archivers/deco/Makefile
index 6c9bac13604b..aabc3ea071c1 100644
--- a/archivers/deco/Makefile
+++ b/archivers/deco/Makefile
@@ -48,10 +48,4 @@ do-install:
.endfor
@cd ${WRKDIR}/${PORTNAME}-archive-1.6/x/ && ${CP} -PR * ${DATADIR}
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
-RUN_DEPENDS+= lzma:${PORTSDIR}/archivers/xz
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile
index 08a9bf030340..550729ef38df 100644
--- a/archivers/libarchive/Makefile
+++ b/archivers/libarchive/Makefile
@@ -103,13 +103,7 @@ USE_OPENSSL= yes
CONFIGURE_ARGS+= --with-openssl --without-nettle
.endif
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
-LIB_DEPENDS+= lzma:${PORTSDIR}/archivers/xz
-.endif
-
check:
(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} check)
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/archivers/p5-Compress-Raw-Lzma/Makefile b/archivers/p5-Compress-Raw-Lzma/Makefile
index 4a674f8890e2..ef244fe4235c 100644
--- a/archivers/p5-Compress-Raw-Lzma/Makefile
+++ b/archivers/p5-Compress-Raw-Lzma/Makefile
@@ -21,23 +21,13 @@ USES= perl5
LZMA_DEPEND?= sys
-.include <bsd.port.pre.mk>
-
-.if (${ARCH} == "sparc64")
-LZMA_DEPEND= xz
-.endif
-
.if ${LZMA_DEPEND} == "lzmalib"
LIB_DEPENDS+= liblzma.so.1:${PORTSDIR}/archivers/lzmalib
.endif
-.if ${LZMA_DEPEND} == "xz"
-LIB_DEPENDS+= liblzma.so.5:${PORTSDIR}/archivers/xz
-.endif
-
pre-build:
.if ${LZMA_DEPEND} == "sys"
@${REINPLACE_CMD} -e "/^LDDLFLAGS/ s|${LOCALBASE}/lib|${LIBDIR}|" ${WRKSRC}/Makefile
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/archivers/pixz/Makefile b/archivers/pixz/Makefile
index 5a713698e0c5..719e81f5dcb6 100644
--- a/archivers/pixz/Makefile
+++ b/archivers/pixz/Makefile
@@ -16,16 +16,8 @@ SUB_FILES= Makefile
PLIST_FILES= bin/${PORTNAME} man/man1/pixz.1.gz
MAKE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS}
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
-LIB_DEPENDS+= liblzma.so:${PORTSDIR}/archivers/xz
-CFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-.endif
-
post-extract: apply-slist
${INSTALL_DATA} ${WRKDIR}/Makefile ${WRKSRC}
${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.1 ${WRKSRC}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/archivers/py-liblzma/Makefile b/archivers/py-liblzma/Makefile
index db55a9b65091..ed01f241314e 100644
--- a/archivers/py-liblzma/Makefile
+++ b/archivers/py-liblzma/Makefile
@@ -21,17 +21,11 @@ USE_PYTHON= yes
USE_PYDISTUTILS= yes
PYDISTUTILS_AUTOPLIST= yes
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
-LIB_DEPENDS+= liblzma.so:${PORTSDIR}/archivers/xz
-.else
post-patch:
@${REINPLACE_CMD} -e 's/pc_cflags = .*/pc_cflags = ""/' \
-e 's/pc_libs = .*/pc_libs = "-llzma"/' ${WRKSRC}/setup.py
-.endif
post-install:
${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lzma.so
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/archivers/tardy/Makefile b/archivers/tardy/Makefile
index 1cbae63d8e34..c0f6476477c5 100644
--- a/archivers/tardy/Makefile
+++ b/archivers/tardy/Makefile
@@ -29,12 +29,6 @@ PLIST_FILES= bin/tardy man/man1/tardy.1.gz
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
-BUILD_DEPENDS+= lzma:${PORTSDIR}/archivers/xz
-.endif
-
post-patch:
.for var in CFLAGS LDFLAGS
@${REINPLACE_CMD} -e 's|^\(${var}\)\ =\ \(.*\)|\1 ?= \2|' \
@@ -47,4 +41,4 @@ do-install:
${INSTALL_MAN} ${WRKSRC}/man/man1/${PORTNAME}.1 \
${STAGEDIR}${MANPREFIX}/man/man1
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/libgta/Makefile b/devel/libgta/Makefile
index 2d123949a2cd..1d366b6915a3 100644
--- a/devel/libgta/Makefile
+++ b/devel/libgta/Makefile
@@ -28,10 +28,4 @@ post-patch:
regression-test test: build
cd ${WRKSR}/ && ${SETENV} ${MAKE_ENV} ${MAKE} check
-.include <bsd.port.pre.mk>
-
-.if (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) || ${OSVERSION} < 800505
-LIB_DEPENDS+= lzma:${PORTSDIR}/archivers/xz
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/mingw32-bin-msvcrt/Makefile b/devel/mingw32-bin-msvcrt/Makefile
index 0cba388b6e53..316177bbf778 100644
--- a/devel/mingw32-bin-msvcrt/Makefile
+++ b/devel/mingw32-bin-msvcrt/Makefile
@@ -28,19 +28,8 @@ MAKE_ARGS+= INSTALL_AS_USER=yes
.endif
NO_STAGE= yes
-.include <bsd.port.pre.mk>
-
-.if ( (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) || ${OSVERSION} < 800505 )
-EXTRACT_DEPENDS=${LOCALBASE}/bin/xz:${PORTSDIR}/archivers/xz
-EXTRACT_ONLY= mingwrt-${RUNTIMEVERSION}-mingw32-dev${EXTRACT_SUFX} \
- mingwrt-${RUNTIMEVERSION}-mingw32-dll${EXTRACT_SUFX}
-.endif
post-extract:
@${CP} ${FILESDIR}/Makefile ${WRKDIR}
-.if ( (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) || ${OSVERSION} < 800505 )
- @cd ${WRKDIR} && xzcat \
- ${_DISTDIR}/w32api-${APIVERSION}-mingw32-dev.tar.lzma | ${TAR} -xf -
-.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index 89d801c605f2..51daf31ede8a 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -88,13 +88,9 @@ post-patch:
@${REINPLACE_CMD} -e '/-O2 -fomit-frame-pointer/d ; \
s,/usr/local,${LOCALBASE},' ${WRKSRC}/config.lib
# Use custom liblzma.pc for when we use liblzma from base
-.if ${OSVERSION} >= 900012 || (${OSVERSION} >= 800505 && ${OSVERSION} < 900000)
@${REINPLACE_CMD} -e \
's,pkg-config liblzma,pkg-config ${FILESDIR}/liblzma.pc,' \
${WRKSRC}/config.lib
-.else
-LIB_DEPENDS+= liblzma.so:${PORTSDIR}/archivers/xz
-.endif
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
diff --git a/security/openvpn-auth-ldap/Makefile b/security/openvpn-auth-ldap/Makefile
index 128a33202839..ca4fdf2c9747 100644
--- a/security/openvpn-auth-ldap/Makefile
+++ b/security/openvpn-auth-ldap/Makefile
@@ -28,10 +28,6 @@ PLIST_FILES= lib/openvpn-auth-ldap.so
OPTIONS_DEFINE= DOCS EXAMPLES
.include <bsd.port.options.mk>
-.if (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) || ${OSVERSION} < 800505
-BUILD_DEPENDS+= ${LOCALBASE}/bin/xz:${PORTSDIR}/archivers/xz
-.endif
-
.if ${OSVERSION} >= 900000
# Use gcc from ports because Objective C support no longer included in base
# and the GNU Objective-C runtime is required, lang/libobjc2 + clang
diff --git a/sysutils/squashfs-tools/Makefile b/sysutils/squashfs-tools/Makefile
index 4c937e40d7b6..520a5ee67999 100644
--- a/sysutils/squashfs-tools/Makefile
+++ b/sysutils/squashfs-tools/Makefile
@@ -37,9 +37,6 @@ PORTDOCS= ACKNOWLEDGEMENTS CHANGES COPYING \
.if ${PORT_OPTIONS:MXZ}
MAKE_ARGS+= XZ_SUPPORT=1
-.if ${OSVERSION} < 900012 && ${OSVERSION} < 800505
-LIB_DEPENDS+= lzma.5:${PORTSDIR}/archivers/xz
-.endif
.endif
.if ${PORT_OPTIONS:MLZO}
diff --git a/textproc/bsdgrep/Makefile b/textproc/bsdgrep/Makefile
index 9cca94a016b8..82bcea5040fe 100644
--- a/textproc/bsdgrep/Makefile
+++ b/textproc/bsdgrep/Makefile
@@ -43,13 +43,6 @@ CONFLICTS= gnugrep-*
NO_STAGE= yes
.include <bsd.port.pre.mk>
-.if !(${OSVERSION} >= 900012 || (${OSVERSION} < 900000 && ${OSVERSION} >= 800505))
-LIB_DEPENDS+= lzma.5:${PORTSDIR}/archivers/xz
-CFLAGS+= -I${PREFIX}/include
-LDFLAGS+= -L${PREFIX}/lib
-BROKEN= overwrites files installed by dependency
-.endif
-
.if ${PORT_OPTIONS:MNLS}
PLIST_SUB+= NLS=""
.else
diff --git a/textproc/the_silver_searcher/Makefile b/textproc/the_silver_searcher/Makefile
index 456fee36d8be..286b72e72efd 100644
--- a/textproc/the_silver_searcher/Makefile
+++ b/textproc/the_silver_searcher/Makefile
@@ -20,12 +20,7 @@ ACLOCAL_ARGS+= -I ${ACLOCAL_DIR}
AUTOMAKE_ARGS+= --add-missing
GNU_CONFIGURE= yes
CONFIGURE_ARGS= LZMA_LIBS=-llzma
-.if exists(/usr/include/lzma.h)
CONFIGURE_ARGS+= LZMA_CFLAGS=-I/usr/include
-.else
-LIB_DEPENDS+= liblzma.so:${PORTSDIR}/archivers/xz
-CONFIGURE_ARGS+= LZMA_CFLAGS=-I${LOCALBASE}/include
-.endif
USE_AUTOTOOLS= aclocal autoconf autoheader automake
USES= pkgconfig
diff --git a/www/links/Makefile b/www/links/Makefile
index b26b44cc0d74..da2b42a1c3e4 100644
--- a/www/links/Makefile
+++ b/www/links/Makefile
@@ -43,10 +43,6 @@ NO_STAGE= yes
#CIPHERSTRING must be a valid OpenSSL cipher string(see ciphers(1)):
CIPHERSTRING?= HIGH:!SSLv2:!aNULL:!eNULL:@STRENGTH
-.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
-LIB_DEPENDS+= liblzma.so:${PORTSDIR}/archivers/xz
-.endif
-
.if ${PORT_OPTIONS:MDIRECTFB} || ${PORT_OPTIONS:MSVGALIB} || ${PORT_OPTIONS:MX11}
LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png \
libjpeg.so:${PORTSDIR}/graphics/jpeg \
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 0af7489a8677..f78977d08f4c 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -71,10 +71,6 @@ RUN_DEPENDS+= zeitgeist-daemon:${PORTSDIR}/sysutils/zeitgeist
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
-LIB_DEPENDS+= lzma:${PORTSDIR}/archivers/xz
-.endif
-
.if ${KDE4_PREFIX} != ${LOCALBASE}
PLIST_SUB+= HACK=""
.else
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index eab70b5677a6..ba32c7068884 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -84,10 +84,6 @@ AVAHI_DESC= Use Avahi's mDNSResponder (otherwise Apple's)
NO_STAGE= yes
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
-LIB_DEPENDS+= lzma.5:${PORTSDIR}/archivers/xz
-.endif
-
.if ${OSVERSION} < 900004
LIB_DEPENDS+= utempter:${PORTSDIR}/sysutils/libutempter
EXTRA_PATCHES= ${FILESDIR}/extra-patch-ConfigureChecks.cmake
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 00:55:31 +0000