diff options
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/appstream-glib/Makefile | 8 | ||||
| -rw-r--r-- | devel/binutils/Makefile | 4 | ||||
| -rw-r--r-- | devel/caf/Makefile | 11 | ||||
| -rw-r--r-- | devel/cvsd/Makefile | 12 | ||||
| -rw-r--r-- | devel/cvsd/files/patch-cvsd-buildroot.in (renamed from devel/cvsd/files/extra-cvsd-buildroot.in) | 0 | ||||
| -rw-r--r-- | devel/gdb/Makefile | 7 | ||||
| -rw-r--r-- | devel/libdispatch/Makefile | 15 | ||||
| -rw-r--r-- | devel/libsigrok/Makefile | 9 | ||||
| -rw-r--r-- | devel/libsigrokdecode/Makefile | 9 | ||||
| -rw-r--r-- | devel/qt5-qdoc/Makefile | 8 | ||||
| -rw-r--r-- | devel/qt5-qdoc/files/extrapatch-src_qdoc_qdocindexfiles.cpp | 21 |
11 files changed, 7 insertions, 97 deletions
diff --git a/devel/appstream-glib/Makefile b/devel/appstream-glib/Makefile index a137755a4e11..fdee3dd24031 100644 --- a/devel/appstream-glib/Makefile +++ b/devel/appstream-glib/Makefile @@ -44,12 +44,4 @@ MANPAGE_BUILD_DEPENDS= docbook-xml>=0:textproc/docbook-xml \ docbook-xsl>=0:textproc/docbook-xsl MANPAGES_USE= GNOME=libxslt:build -.include <bsd.port.options.mk> - -.if ${OSVERSION} < 1000000 && ${OPSYS} == FreeBSD -post-patch: - ${REINPLACE_CMD} -e 's|-Wtype-limits||g' \ - ${WRKSRC}/configure -.endif - .include <bsd.port.mk> diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile index c813c3d2570e..956745121b5e 100644 --- a/devel/binutils/Makefile +++ b/devel/binutils/Makefile @@ -82,10 +82,6 @@ PLIST_SUB+= GOLD="" PLIST_SUB+= GOLD="@comment " .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -CONFIGURE_ARGS+= --disable-initfini-array -.endif - .if ${ARCH} == "amd64" CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL} .else diff --git a/devel/caf/Makefile b/devel/caf/Makefile index 67e023889279..d82ac9f141a4 100644 --- a/devel/caf/Makefile +++ b/devel/caf/Makefile @@ -51,15 +51,4 @@ LOG_LEVEL_INFO_CMAKE_ON= -DCAF_LOG_LEVEL:STRING=2 LOG_LEVEL_DEBUG_CMAKE_ON= -DCAF_LOG_LEVEL:STRING=3 LOG_LEVEL_TRACE_CMAKE_ON= -DCAF_LOG_LEVEL:STRING=4 -.include <bsd.port.options.mk> - -regression-test: test - -.if ${OSVERSION} < 1001000 -# require clang & libc++ -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:lang/clang34 \ - ${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++ -CXXFLAGS+= -stdlib=libc++ -I${LOCALBASE}/include/c++/v1 -L${LOCALBASE}/lib -.endif - .include <bsd.port.mk> diff --git a/devel/cvsd/Makefile b/devel/cvsd/Makefile index b036b717d458..fef6ad3c7384 100644 --- a/devel/cvsd/Makefile +++ b/devel/cvsd/Makefile @@ -12,7 +12,8 @@ COMMENT= CVS pserver daemon LICENSE= GPLv2 -EXTRA_PATCHES= ${FILESDIR}/extra-cvsd-buildroot.in +BUILD_DEPENDS= cvs:devel/cvs +RUN_DEPENDS= cvs:devel/cvs USE_RC_SUBR= cvsd USES= perl5 @@ -25,13 +26,6 @@ OPTIONS_DEFINE= DOCS PORTDOCS= FAQ NEWS README -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000 -BUILD_DEPENDS+= cvs:devel/cvs -RUN_DEPENDS+= cvs:devel/cvs -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/cvsd ${STAGEDIR}${PREFIX}/sbin/cvsd .for f in cvsd-buginfo cvsd-buildroot cvsd-passwd @@ -46,4 +40,4 @@ do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/cvsd/files/extra-cvsd-buildroot.in b/devel/cvsd/files/patch-cvsd-buildroot.in index 6e7ed4b33e1b..6e7ed4b33e1b 100644 --- a/devel/cvsd/files/extra-cvsd-buildroot.in +++ b/devel/cvsd/files/patch-cvsd-buildroot.in diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile index 57cbfc2075f6..e266e0670983 100644 --- a/devel/gdb/Makefile +++ b/devel/gdb/Makefile @@ -69,15 +69,8 @@ TUI_CONFIGURE_ENABLE= tui .include <bsd.port.options.mk> -.if ${OSVERSION} < 1000010 -# FreeBSD 9.x and earlier do not define SIGLIBRT in <sys/signal.h> -CFLAGS+= -DSIGLIBRT=33 -.endif - -.if ${OSVERSION} > 1000010 # The option -Wno-extended-offsetof is supported by clang only CFLAGS+= -Wno-extended-offsetof -.endif .if ! ${PORT_OPTIONS:MBUNDLED_READLINE} EXCLUDE+= readline diff --git a/devel/libdispatch/Makefile b/devel/libdispatch/Makefile index 96c54859ebae..be5240f4c0f4 100644 --- a/devel/libdispatch/Makefile +++ b/devel/libdispatch/Makefile @@ -76,19 +76,6 @@ _MAN3= dispatch.3 \ dispatch_walltime.3 PLIST_FILES+= ${_MAN3:S|^|man/man3/|:S|$|.gz|} -.include <bsd.port.pre.mk> - -.if (${OSVERSION} < 1000024) -OPTIONS_DEFINE= CLANG -OPTIONS_DEFAULT= CLANG -CLANG_DESC= Build with LLVM/Clang (required for blocks support) -.endif - -.if ${PORT_OPTIONS:MCLANG} -CONFIGURE_ARGS+= --with-blocks-runtime=/usr/lib -CONFIGURE_ENV+= CC="/usr/bin/clang" -.endif - # # Get rid of .la and static library files # @@ -97,4 +84,4 @@ post-configure: '/Install the pseudo-library/,/staticlibs=/s,^,#,' ${WRKSRC}/libtool -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/libsigrok/Makefile b/devel/libsigrok/Makefile index 75305b87b434..daebadf5775e 100644 --- a/devel/libsigrok/Makefile +++ b/devel/libsigrok/Makefile @@ -28,11 +28,4 @@ post-patch: -e '/\*freebsd\*/,/;;/d' \ ${WRKSRC}/configure -.include <bsd.port.pre.mk> - -# Workaround for libusb not knowing LIBUSB_CLASS_APPLICATION -.if (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100029) || (${OSVERSION} < 1000715) -CFLAGS+= -DLIBUSB_CLASS_APPLICATION=0xfe -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/libsigrokdecode/Makefile b/devel/libsigrokdecode/Makefile index 4406ba9dc02e..caec6d817197 100644 --- a/devel/libsigrokdecode/Makefile +++ b/devel/libsigrokdecode/Makefile @@ -19,11 +19,4 @@ MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip -.include <bsd.port.pre.mk> - -# Workaround for libusb not knowing LIBUSB_CLASS_APPLICATION -.if (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100029) || (${OSVERSION} < 1000715) -CFLAGS+= -DLIBUSB_CLASS_APPLICATION=0xfe -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/qt5-qdoc/Makefile b/devel/qt5-qdoc/Makefile index 36f616822c69..eee3e4e3c0fe 100644 --- a/devel/qt5-qdoc/Makefile +++ b/devel/qt5-qdoc/Makefile @@ -17,10 +17,4 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} PLIST_FILES= ${QT_BINDIR}/qdoc -.include <bsd.port.pre.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 -EXTRA_PATCHES= ${FILESDIR}/extrapatch-src_qdoc_qdocindexfiles.cpp -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/qt5-qdoc/files/extrapatch-src_qdoc_qdocindexfiles.cpp b/devel/qt5-qdoc/files/extrapatch-src_qdoc_qdocindexfiles.cpp deleted file mode 100644 index a6625cb2c0b2..000000000000 --- a/devel/qt5-qdoc/files/extrapatch-src_qdoc_qdocindexfiles.cpp +++ /dev/null @@ -1,21 +0,0 @@ -There is a bug [1] in the old gcc used on FreeBSD 9.3, which makes -qdoc segfault on sorting while generating its index sections. - -As mentioned in [2] by Michael Hansen, we can circument this by using -qSort instead of std::sort on FreeBSD 9.x. - - -[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59391 -[2] https://bugreports.qt.io/browse/QTBUG-43057 - ---- src/qdoc/qdocindexfiles.cpp.orig 2016-10-09 21:13:42.831072000 +0200 -+++ src/qdoc/qdocindexfiles.cpp 2016-10-09 21:13:56.153968000 +0200 -@@ -1412,7 +1412,7 @@ - const Aggregate* inner = static_cast<const Aggregate*>(node); - - NodeList cnodes = inner->childNodes(); -- std::sort(cnodes.begin(), cnodes.end(), Node::nodeNameLessThan); -+ qSort(cnodes.begin(), cnodes.end(), Node::nodeNameLessThan); - - foreach (Node* child, cnodes) { - generateIndexSections(writer, child, generateInternalNodes); |