From 951bd53769789182ee2b8a270bba7ef306f4d721 Mon Sep 17 00:00:00 2001 From: okan Date: Fri, 24 Mar 2017 14:57:58 +0000 Subject: [PATCH] Unhook productivity/wyrd; dead upstream and no further interest exists. ok daniel@ --- devel/quirks/Makefile | 4 +- devel/quirks/files/Quirks.pm | 3 +- productivity/Makefile | 3 +- productivity/wyrd/Makefile | 43 ------------------- productivity/wyrd/distinfo | 2 - productivity/wyrd/patches/patch-Makefile_in | 15 ------- .../wyrd/patches/patch-curses_Makefile_in | 12 ------ .../wyrd/patches/patch-curses_curses_ml | 9 ---- productivity/wyrd/pkg/DESCR | 6 --- productivity/wyrd/pkg/PLIST | 7 --- 10 files changed, 5 insertions(+), 99 deletions(-) delete mode 100644 productivity/wyrd/Makefile delete mode 100644 productivity/wyrd/distinfo delete mode 100644 productivity/wyrd/patches/patch-Makefile_in delete mode 100644 productivity/wyrd/patches/patch-curses_Makefile_in delete mode 100644 productivity/wyrd/patches/patch-curses_curses_ml delete mode 100644 productivity/wyrd/pkg/DESCR delete mode 100644 productivity/wyrd/pkg/PLIST diff --git a/devel/quirks/Makefile b/devel/quirks/Makefile index 4e6bab586ba..11ebf1a1132 100644 --- a/devel/quirks/Makefile +++ b/devel/quirks/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.455 2017/03/22 21:25:04 landry Exp $ +# $OpenBSD: Makefile,v 1.456 2017/03/24 14:57:59 okan Exp $ COMMENT = exceptions to pkg_add rules CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-2.300 +PKGNAME = quirks-2.301 PKG_ARCH = * MAINTAINER = Marc Espie diff --git a/devel/quirks/files/Quirks.pm b/devel/quirks/files/Quirks.pm index ca5f9422608..1c432f5aecf 100644 --- a/devel/quirks/files/Quirks.pm +++ b/devel/quirks/files/Quirks.pm @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: Quirks.pm,v 1.467 2017/03/22 21:25:04 landry Exp $ +# $OpenBSD: Quirks.pm,v 1.468 2017/03/24 14:57:59 okan Exp $ # # Copyright (c) 2009 Marc Espie # @@ -852,6 +852,7 @@ my $obsolete_reason = { "ocaml-zed" => 5, "ocaml-camomile" => 5, "elinks" => 2, + "wyrd" => 3, # KDE3 removals 'amarok' => 2, diff --git a/productivity/Makefile b/productivity/Makefile index 73ee2fc62fa..f1a34a58b36 100644 --- a/productivity/Makefile +++ b/productivity/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.72 2017/03/17 07:54:17 sthen Exp $ +# $OpenBSD: Makefile,v 1.73 2017/03/24 14:57:58 okan Exp $ SUBDIR = SUBDIR += akonadi @@ -47,7 +47,6 @@ SUBDIR += vym SUBDIR += when SUBDIR += workrave - SUBDIR += wyrd SUBDIR += xinvest SUBDIR += xquote SUBDIR += yokadi diff --git a/productivity/wyrd/Makefile b/productivity/wyrd/Makefile deleted file mode 100644 index aed571075ad..00000000000 --- a/productivity/wyrd/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# $OpenBSD: Makefile,v 1.26 2017/03/06 14:40:33 okan Exp $ - -COMMENT= curses calendar front-end to remind - -DISTNAME= wyrd-1.4.6 -REVISION= 0 -CATEGORIES= productivity - -HOMEPAGE= http://pessimization.com/software/wyrd/ - -MAINTAINER= Okan Demirmen - -MASTER_SITES= ${HOMEPAGE} - -# GPL -PERMIT_PACKAGE_CDROM= Yes - -WANTLIB= c m ncurses - -MODULES= lang/ocaml -CONFIGURE_STYLE= gnu -USE_GMAKE= Yes - -.include -.if ! ${PROPERTIES:Mocaml_native} -CONFIGURE_ENV += OCAMLOPT=no -.endif - -BUILD_DEPENDS= ${RUN_DEPENDS} lang/ocaml-camlp4 -RUN_DEPENDS= misc/remind - -NO_TEST= Yes - -SUBST_VARS+= CC - -pre-configure: - ${SUBST_CMD} ${WRKSRC}/curses/curses.ml - -post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/wyrd - ${INSTALL_DATA} ${WRKSRC}/wyrdrc ${PREFIX}/share/examples/wyrd - -.include diff --git a/productivity/wyrd/distinfo b/productivity/wyrd/distinfo deleted file mode 100644 index 51a6b28ef7b..00000000000 --- a/productivity/wyrd/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (wyrd-1.4.6.tar.gz) = srUdb7OPi4s+ww7nIJP3kbqbb+NUGBkbwgEdLIB5mX4= -SIZE (wyrd-1.4.6.tar.gz) = 425829 diff --git a/productivity/wyrd/patches/patch-Makefile_in b/productivity/wyrd/patches/patch-Makefile_in deleted file mode 100644 index 02d17ab21ef..00000000000 --- a/productivity/wyrd/patches/patch-Makefile_in +++ /dev/null @@ -1,15 +0,0 @@ ---- Makefile.in.orig Sun Feb 3 04:40:39 2013 -+++ Makefile.in Sat Mar 4 17:40:29 2017 -@@ -93,7 +93,12 @@ version.ml: Makefile - - - $(CURSES_CMA) $(CURSES_CMXA) .stamp_built_curses: -+ifeq ($(OCAMLBEST),opt) - $(MAKE) -C curses byte opt && touch .stamp_built_curses -+else -+ $(MAKE) -C curses byte && touch .stamp_built_curses -+endif -+ - - $(CMO) $(CMX): .stamp_built_curses - diff --git a/productivity/wyrd/patches/patch-curses_Makefile_in b/productivity/wyrd/patches/patch-curses_Makefile_in deleted file mode 100644 index a3a0046ca5c..00000000000 --- a/productivity/wyrd/patches/patch-curses_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-curses_Makefile_in,v 1.1 2017/03/06 14:40:33 okan Exp $ ---- curses/Makefile.in.orig Sat Feb 2 22:40:48 2013 -+++ curses/Makefile.in Wed Mar 1 09:57:11 2017 -@@ -10,7 +10,7 @@ RESULT = curses - SOURCES = ml_curses.c keys.ml curses.mli curses.ml - - CC = @CC@ --CFLAGS = -g -Wall $(DEFS) -+CFLAGS += $(DEFS) - LDFLAGS = @LDFLAGS@ - RANLIB = @RANLIB@ - LIBINSTALL_FILES = $(wildcard *.mli *.cmi *.cma *.cmxa *.a *.so) diff --git a/productivity/wyrd/patches/patch-curses_curses_ml b/productivity/wyrd/patches/patch-curses_curses_ml deleted file mode 100644 index 0af70812cf2..00000000000 --- a/productivity/wyrd/patches/patch-curses_curses_ml +++ /dev/null @@ -1,9 +0,0 @@ -$OpenBSD: patch-curses_curses_ml,v 1.1 2017/03/04 16:45:17 jca Exp $ ---- curses/curses.ml.orig Sat Mar 4 17:41:27 2017 -+++ curses/curses.ml Sat Mar 4 17:41:36 2017 -@@ -1,4 +1,4 @@ --(*pp gcc -x c -E *) -+(*pp ${CC} -x c -E *) - - type window - type screen diff --git a/productivity/wyrd/pkg/DESCR b/productivity/wyrd/pkg/DESCR deleted file mode 100644 index 1b7512f1134..00000000000 --- a/productivity/wyrd/pkg/DESCR +++ /dev/null @@ -1,6 +0,0 @@ -Wyrd is a text-based front-end to Remind, a sophisticated calendar -and alarm program. Remind's power lies in its programmability, and -Wyrd does not hide this capability behind flashy GUI dialogs. Rather, -Wyrd is designed to make you more efficient at editing your reminder -files directly. It also offers a nice day view suitable for visualizing -your schedule at a glance. diff --git a/productivity/wyrd/pkg/PLIST b/productivity/wyrd/pkg/PLIST deleted file mode 100644 index 4ac034c38a8..00000000000 --- a/productivity/wyrd/pkg/PLIST +++ /dev/null @@ -1,7 +0,0 @@ -@comment $OpenBSD: PLIST,v 1.2 2009/03/11 21:31:07 avsm Exp $ -@bin bin/wyrd -@man man/man1/wyrd.1 -@man man/man5/wyrdrc.5 -share/examples/wyrd/ -share/examples/wyrd/wyrdrc -@sample ${SYSCONFDIR}/wyrdrc