From nobody Sun Dec 31 00:08:13 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T2fb231Bnz55bvs; Sun, 31 Dec 2023 00:08:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T2fb174NJz4vWB; Sun, 31 Dec 2023 00:08:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703981294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=26jHQIxV8QNL0sxsFteZpJ/qChkBpElCEgkjP7a6eyo=; b=FAfck4vmnOh2zFMEl93YaXqfBe6bax0+eTGhxxT9PZgGYa1qzM1oEqhoqcQ3oHSl3QH5bs A4h2hSIjgVe1l9R6syl0TA+V+ro+DzC+3qDh/HfebvoNc5gsX5L0mlIuRqdivA/mwOIg6K ATBUxa99HPC/3zYpcOxBwZfxWJy1vFvTzaPxB9IEdKLEvQOPIG1YmLkiXWFcCkbMefCIU0 3W5cghXUY7J4t9Wn8W0L86H7oTah8hz9AxHRnO06RlXxkdx4M+NiZyOYxbHep2wUB9ygtH s423mhzsUR9+LmWRSMJlNFPouQSTzdnE0EmewrwHw9U2EmSkQ3JBlA1YA0rvxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703981294; a=rsa-sha256; cv=none; b=mZENbxsQsyPBhJrUELJZRl0a5DZ3cSsHdutmfaMYTtdecERb4z7rskRJkQ2ihd4Qq/B+Cu /F9oKcmPhXvmQZFyiGlLbc2fqx/ayH7eJwiJzp3nHVJ0shSqMZxjk92paC8sweAOLmFrOX mhLL5ybZLjvfL+6wpI8Ilj6STPMxE7nVivsL3M4AIxF4QGUDxrPctle2lwpTYKdW+AsPUU FNvtqqeCEjOQgLFNiWeJj9AGRjamo+fqS5+5ArouCh0yp+FJt8mUmh4HwV5UO5+EyGf8NT w6al5oJO0L6y4O1H7r/YX1YYhsyXgWPTfcDwcAsX5ikLCzOrWBj4JkZzz1UsjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703981294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=26jHQIxV8QNL0sxsFteZpJ/qChkBpElCEgkjP7a6eyo=; b=lapYHPZ6R9pNn2iHztHyBv777aE8EnYFSJliOaVpPHiHioVRxRRJ2YkYkmjHBzfPqguTH+ YYbB5PEWEBKYSyrfXdt9Gj6SApTGfGNXlYXoMl6vtYEa/aBQ1dCf65O5Z6davjmw4Tjrmy VBVL5jcLtpdV3yAySkl5EYUkt0ne7+g82WQ6HeF75Sly/kkHZvKtOBvEb5V8tT0NRnUzL2 FOiClDenNDR7aV19FEFKKyh598Pr98COYSpfxrpZZWIuTVy35ADomHXbIByP4/7AQE1zkR wbT268jZ0AiuQGtjp8J4ua+YlDcqUTIAfAbOTTOOukxmToET1MnGfpjoGTYAtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T2fb15n0lz19q7; Sun, 31 Dec 2023 00:08:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BV08Dv2095634; Sun, 31 Dec 2023 00:08:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BV08DXm095631; Sun, 31 Dec 2023 00:08:13 GMT (envelope-from git) Date: Sun, 31 Dec 2023 00:08:13 GMT Message-Id: <202312310008.3BV08DXm095631@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 168c4603a4df - main - graphics/xfpovray: Remove expired port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 168c4603a4df7dbb0902fc1e458f7935e87d2ad2 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=168c4603a4df7dbb0902fc1e458f7935e87d2ad2 commit 168c4603a4df7dbb0902fc1e458f7935e87d2ad2 Author: Muhammad Moinur Rahman AuthorDate: 2023-12-30 04:12:36 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-12-31 00:06:26 +0000 graphics/xfpovray: Remove expired port 2023-12-31 graphics/xfpovray: BROKEN for more than 2 years on all supported versions after the EOL of 12 --- MOVED | 1 + graphics/Makefile | 1 - graphics/xfpovray/Makefile | 36 -- graphics/xfpovray/distinfo | 2 - graphics/xfpovray/files/BSDmakefile | 19 - graphics/xfpovray/files/patch-flx_Imakefile | 20 - graphics/xfpovray/files/patch-src_Imakefile | 28 -- graphics/xfpovray/files/patch-src_show_image.c | 52 --- graphics/xfpovray/files/patch-src_xfpovray.h | 28 -- graphics/xfpovray/files/patch-src_xfprovray.c | 96 ----- graphics/xfpovray/files/patch-warnings | 505 ------------------------- graphics/xfpovray/files/patch-xfpovraf.cf | 20 - graphics/xfpovray/pkg-descr | 7 - graphics/xfpovray/pkg-plist | 16 - 14 files changed, 1 insertion(+), 830 deletions(-) diff --git a/MOVED b/MOVED index 90bc922cedb1..03f2f9916833 100644 --- a/MOVED +++ b/MOVED @@ -8242,3 +8242,4 @@ editors/xi-core||2023-12-31|Has expired: Project is currently discontinued, one editors/pdfedit||2023-12-31|Has expired: BROKEN on all supported versions for 2 years after the EOL of 12 games/spring||2023-12-31|Has expired: Fails to build and marked broken for several months java/wildfly10||2023-12-31|Has expired: End of life upstream +graphics/xfpovray||2023-12-31|Has expired: BROKEN for more than 2 years on all supported versions after the EOL of 12 diff --git a/graphics/Makefile b/graphics/Makefile index 3176d90715eb..579da7352b23 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -1199,7 +1199,6 @@ SUBDIR += xd3d SUBDIR += xdgagrab SUBDIR += xfig - SUBDIR += xfpovray SUBDIR += xfractint SUBDIR += xglurbules SUBDIR += xgrasp diff --git a/graphics/xfpovray/Makefile b/graphics/xfpovray/Makefile deleted file mode 100644 index 73999a32dff7..000000000000 --- a/graphics/xfpovray/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -PORTNAME= xfpovray -PORTVERSION= 1.3.1 -PORTREVISION= 13 -CATEGORIES= graphics -MASTER_SITES= http://www.batse.msfc.nasa.gov/~mallozzi/home/software/xforms/src/ \ - SUNSITE/apps/graphics/rays/pov - -MAINTAINER= ports@FreeBSD.org -COMMENT= Graphical interface to POV-Ray - -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING - -DEPRECATED= BROKEN for more than 2 years on all supported versions after the EOL of 12 -EXPIRATION_DATE= 2023-12-31 -BROKEN_FreeBSD_13= does not build -BROKEN_FreeBSD_14= does not build - -LIB_DEPENDS= libforms.so:x11-toolkits/xforms -RUN_DEPENDS= povray:graphics/povray-meta - -USES= tar:tgz uidfix xorg -USE_XORG= x11 xext xpm - -MAKEFILE= ${FILESDIR}/BSDmakefile -MAKE_ENV= DOCSDIR="${DOCSDIR}" - -post-patch: - @${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g;" ${WRKSRC}/src/xfpovray.h - @${REINPLACE_CMD} -e "s|fl_drw_box|fl_draw_box|g;" \ - ${WRKSRC}/flx/flx_return_button/flx_return_button.c - -post-install: - ${MV} ${WRKSRC}/help ${STAGEDIR}${DOCSDIR} - -.include diff --git a/graphics/xfpovray/distinfo b/graphics/xfpovray/distinfo deleted file mode 100644 index 3747af45876e..000000000000 --- a/graphics/xfpovray/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xfpovray-1.3.1.tgz) = 259bbab630ca64b1552be685bf2a856462ff3d1df0bd37863d39b46f49d4a721 -SIZE (xfpovray-1.3.1.tgz) = 533492 diff --git a/graphics/xfpovray/files/BSDmakefile b/graphics/xfpovray/files/BSDmakefile deleted file mode 100644 index b7ad54dfd68b..000000000000 --- a/graphics/xfpovray/files/BSDmakefile +++ /dev/null @@ -1,19 +0,0 @@ -PROG= xfpovray -MAN= -NO_WERROR= yes -BINDIR= ${PREFIX}/bin -CFLAGS+=-Iflx -I${LOCALBASE}/include -DHELP_DIR='"${DOCSDIR}"' -LDADD+= -L${LOCALBASE}/lib -lforms -lX11 - -.PATH: src flx/flx_filebox flx/flx_help_dialog flx/flx_return_button \ - flx/flx_show_dialog flx/flx_util - -WARNS= 3 - -SRCS= flx_filebox.c flx_help_dialog.c flx_justify_input.c \ - flx_return_button.c flx_scale_form.c flx_show_dialog.c \ - flx_show_input.c flx_sort_browser.c \ - build_pages.c callbacks.c config.c run_program.c \ - show_image.c state.c tips.c util.c xfpovray.c - -.include diff --git a/graphics/xfpovray/files/patch-flx_Imakefile b/graphics/xfpovray/files/patch-flx_Imakefile deleted file mode 100644 index 6563e6595c48..000000000000 --- a/graphics/xfpovray/files/patch-flx_Imakefile +++ /dev/null @@ -1,20 +0,0 @@ ---- flx/Imakefile.orig Fri Feb 20 20:03:08 1998 -+++ flx/Imakefile Mon Jul 1 02:51:19 2002 -@@ -11,7 +11,7 @@ - XCOMM * * * No need to edit below here * * * - - SOREV = 0.1 --LIBNAME = libflx.so.$(SOREV) -+LIBNAME = libflx.a - - - -@@ -55,8 +55,6 @@ - EXTRA_INCLUDES = -I$(XFORMS_INCDIR) $(INCS) - EXTRA_DEFINES = - LDLIBS = $(EXTRA_LIBRARIES) $(XLIB) -- --ComplexProgramTarget($(LIBNAME)) - - NormalLibraryObjectRule() - NormalLibraryTarget(flx,$(OBJS)) diff --git a/graphics/xfpovray/files/patch-src_Imakefile b/graphics/xfpovray/files/patch-src_Imakefile deleted file mode 100644 index 0b1f6ce622d1..000000000000 --- a/graphics/xfpovray/files/patch-src_Imakefile +++ /dev/null @@ -1,28 +0,0 @@ ---- src/Imakefile.orig Sun Feb 22 22:40:53 1998 -+++ src/Imakefile Mon Jul 1 03:02:20 2002 -@@ -9,8 +9,8 @@ - XCOMM * * * No need to edit below here * * * - - XCOMM Directories for xfpovray, help files, and icons -- BINDIR = $(XFROOTDIR)/bin -- XFLIBDIR = $(XFROOTDIR)/lib/xfpovray -+XCOMM BINDIR = $(XFROOTDIR)/bin -+ XFLIBDIR = $(LIBDIR)/xfpovray - XFHELPDIR = $(XFLIBDIR)/help - - SRCS = $(TOP)/build_pages.c \ -@@ -49,12 +49,12 @@ - $(TOP)/../help/Config_File \ - $(TOP)/../help/help_topics - --EXTRA_LIBRARIES = -L$(XFORMS_LIBDIR) ../flx/libflx.a -lforms -lm -+EXTRA_LIBRARIES = ../flx/libflx.a -L$(XFORMS_LIBDIR) -lforms $(XPMLIB) -lm - EXTRA_INCLUDES = -I$(XFORMS_INCDIR) -I../flx - EXTRA_DEFINES = -DHELP_DIR=\"$(XFHELPDIR)\" - LDLIBS = $(EXTRA_LIBRARIES) $(XLIB) - --ComplexProgramTarget(xfpovray) -+ComplexProgramTargetNoMan(xfpovray) - InstallMultipleDestFlags(install,$(XFHELP),$(XFHELPDIR),$(INSTDATFLAGS)) - - clean:: diff --git a/graphics/xfpovray/files/patch-src_show_image.c b/graphics/xfpovray/files/patch-src_show_image.c deleted file mode 100644 index fb53ae017a5a..000000000000 --- a/graphics/xfpovray/files/patch-src_show_image.c +++ /dev/null @@ -1,52 +0,0 @@ ---- src/show_image.c 1998-02-07 22:09:16.000000000 -0500 -+++ src/show_image.c 2015-03-09 00:55:58.000000000 -0400 -@@ -2,7 +2,8 @@ - #include - #include - --#include "forms.h" -+#include -+#include "flx.h" - #include "xfpovray.h" - - extern struct pov_options pov; -@@ -13,21 +14,6 @@ - - extern OUTPUT_PAGE_S *outputPage; - -- --/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ --char *truncate(char *string, char endat) --{ -- char *endchar; -- -- -- if ((string != NULL) && (endchar = strrchr(string, endat)) != NULL) -- *endchar = '\0'; -- -- return (string); -- --} -- -- - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - /* - ** Display the image after rendering. Some OS do not allow -@@ -45,7 +31,7 @@ - - - strcpy(temp, pov.input_file_name); -- sprintf(imgfile, "%s", truncate(temp, '.')); -+ sprintf(imgfile, "%s", strtruncate(temp, '.')); - - - /* -@@ -63,7 +49,7 @@ - strcat(imgfile, ext); - - sprintf(currentFilter, "*%s", ext); -- file = (char *) flx_filebox (CONFIG_POV_DIR, currentFilter, &imgfile); -+ file = flx_filebox (CONFIG_POV_DIR, currentFilter, imgfile); - - if (strcmp(file, "") != 0) { - sprintf(viewit, "%s %s &", CONFIG_DISPLAY_COMMAND, imgfile); diff --git a/graphics/xfpovray/files/patch-src_xfpovray.h b/graphics/xfpovray/files/patch-src_xfpovray.h deleted file mode 100644 index 2acf7e286bcf..000000000000 --- a/graphics/xfpovray/files/patch-src_xfpovray.h +++ /dev/null @@ -1,28 +0,0 @@ ---- src/xfpovray.h.orig Wed Aug 20 05:10:37 1997 -+++ src/xfpovray.h Mon Nov 24 18:28:57 1997 -@@ -16,14 +16,14 @@ - /* - ** Command to invoke POV-Ray - */ --#define POV_COMMAND "/usr/local/bin/povray" -+#define POV_COMMAND "%%LOCALBASE%%/bin/povray" - - - /* - ** System or default library path. You can add up to 4 more on - ** the widget for a total of 5, even though POV-Ray supports more. - */ --#define POV_LIB_PATH "/usr/local/include/povray" -+#define POV_LIB_PATH "%%LOCALBASE%%/lib/povray3/include" - - - /* -@@ -47,7 +47,7 @@ - ** Editor command. If you use a console editor like vi, execute the - ** editor in an xterm, e.g., xterm -e vi - */ --#define POV_EDITOR "nedit" -+#define POV_EDITOR "xterm -e vi" - - - /* diff --git a/graphics/xfpovray/files/patch-src_xfprovray.c b/graphics/xfpovray/files/patch-src_xfprovray.c deleted file mode 100644 index 5dfa4a93f5de..000000000000 --- a/graphics/xfpovray/files/patch-src_xfprovray.c +++ /dev/null @@ -1,96 +0,0 @@ ---- src/xfpovray.c 1998-02-22 22:35:14.000000000 -0500 -+++ src/xfpovray.c 2015-03-09 02:07:44.000000000 -0400 -@@ -33,9 +33,11 @@ - **- - ** * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -- -+#include - #include - #include -+#include -+#include - - #include "forms.h" - #include "xfpovray.h" -@@ -47,7 +48,7 @@ - #include "xfpovray.xpm" - - --#if FL_VERSION < MIN_XFORMS_VER || FL_REVISION < MIN_XFORMS_REV -+#if FL_VERSION < MIN_XFORMS_VER || (FL_VERSION == MIN_XFORMS_VER && FL_REVISION < MIN_XFORMS_REV) - #error - #error CANNOT COMPILE WITH THIS VERSION OF XFORMS. - #error PLEASE UPGRADE TO THE LATEST VERSION. -@@ -158,7 +159,7 @@ - int main (int argc, char **argv) - { - -- FL_OBJECT *obj, *ret; -+ FL_OBJECT *ret; - int version, revision; - static char *home; - FILE *fp; -@@ -259,26 +260,33 @@ - - /* Check for directory $HOME/.xfpovray */ - if ((fp = fopen(TEMP_FILE, "w")) == NULL) { -- -- temp = (char *) fl_calloc (1, strlen(MKDIR) + strlen(" ") + -- strlen(home) + strlen("/.xfpovray") + 1); -- sprintf (temp, "%s %s/.xfpovray", MKDIR, home); -- system (temp); -- free (temp); -- -- temp = (char *) fl_calloc (1, -- strlen("\nWelcome to xfpovray!\nCreated directory ") + -- strlen(home) + strlen("/.xfpovray") + -- strlen("\n\nCheck your setup with\nOptions->Configure") + -- + 1); -- sprintf (temp, -- "\nWelcome to xfpovray!\nCreated directory %s/.xfpovray\n\nCheck your setup with\nOptions->Configure", -- home); -- flx_set_dialog_font (FL_BOLD_STYLE, FL_NORMAL_SIZE); -+ int success; -+ -+ if (errno != ENOTDIR && errno != ENOENT) { -+ success = 0; -+ } else { -+ temp = fl_calloc (1, strlen(home) + strlen("/.xfpovray") + 1); -+ sprintf (temp, "%s/.xfpovray", home); -+ success = mkdir(temp, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == 0; -+ free (temp); -+ } -+ if (success) -+ asprintf(&temp, "Welcome to xfpovray!\n" -+ "Created directory %s/.xfpovray\n\n" -+ "Check your setup with\nOptions->Configure", -+ home); -+ else -+ asprintf(&temp, "Welcome to xfpovray!\n" -+ "Directory %s/.xfpovray inoperable:\n\n%s\n\n" -+ "Please, resolve the problem and restart", -+ home, strerror(errno)); -+ flx_set_dialog_font (FL_NORMAL_STYLE, FL_NORMAL_SIZE); - flx_show_dialog ("message", temp); - free (temp); -- fclose (fp); -- } -+ } else { -+ fclose(fp); -+ unlink(TEMP_FILE); -+ } - - /* - ** Build the various forms -@@ -414,9 +420,7 @@ - - /* Check for external routines */ - home = getenv("HOME"); -- temp = (char *) fl_calloc (1, -- strlen(home) + strlen(".xfpovray/external.routines") + 1); -- sprintf(temp, "%s/.xfpovray/external.routines", home); -+ asprintf(&temp, "%s/.xfpovray/external.routines", home); - if ((ext = fopen(temp, "r")) != NULL) { - - /* Callback key is the menu item number of the first added diff --git a/graphics/xfpovray/files/patch-warnings b/graphics/xfpovray/files/patch-warnings deleted file mode 100644 index 23a213199904..000000000000 --- a/graphics/xfpovray/files/patch-warnings +++ /dev/null @@ -1,505 +0,0 @@ ---- flx/flx_show_dialog/flx_show_dialog.c 1998-01-11 10:51:40.000000000 -0500 -+++ flx/flx_show_dialog/flx_show_dialog.c 2015-03-09 00:09:19.000000000 -0400 -@@ -56,6 +56,6 @@ - ** * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -- --#include "forms.h" -+#include -+#include - #include "flx.h" - #include "flx_show_dialog.h" /* Internal to this routine */ -@@ -68,9 +68,4 @@ - - static void usage(); --void flx_set_dialog_lcol(); --void flx_set_dialog_font(); --void flx_set_dialog_color(); --void flx_set_dialog_bgcolor(); -- - - ---- flx/flx_util/flx_justify_input.c 1998-02-20 20:00:26.000000000 -0500 -+++ flx/flx_util/flx_justify_input.c 2015-03-08 23:15:09.000000000 -0400 -@@ -30,13 +30,10 @@ - - --#include "forms.h" -+#include -+#include "flx.h" - - #include - #include - -- --void flx_justify_input(FL_OBJECT *input_obj, char *string, int STYLE, int SIZE); -- -- - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ --void flx_justify_input(FL_OBJECT *input_obj, char *string, int STYLE, int SIZE) -+void flx_justify_input(FL_OBJECT *input_obj, const char *string, int STYLE, int SIZE) ---- flx/flx_util/flx_scale_form.c 1997-09-02 21:57:24.000000000 -0400 -+++ flx/flx_util/flx_scale_form.c 2015-03-08 23:18:56.000000000 -0400 -@@ -22,5 +22,5 @@ - -- --#include "forms.h" -+#include -+#include "flx.h" - - #include -@@ -29,7 +30,4 @@ - - --void flx_scale_form(FL_FORM *form); -- -- - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - /* Scales a form based on the current font */ ---- flx/flx_filebox/flx_filebox.c 1998-02-21 12:38:23.000000000 -0500 -+++ flx/flx_filebox/flx_filebox.c 2015-03-08 23:29:18.000000000 -0400 -@@ -59,5 +59,5 @@ - #include - --#include "forms.h" -+#include - #include "flx.h" - #include "flx_filebox.h" -@@ -65,7 +65,4 @@ - #define USE_COLOR 1 - -- -- -- - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - char *flx_filebox(const char *directory, -@@ -272,5 +269,5 @@ - fl_set_object_posthandler(theForm->file_input, change_focus); - -- if ((default_file != "") && (default_file != NULL)) { -+ if (default_file != NULL && default_file[0] != '\0') { - fl_set_input(theForm->file_input, default_file); - flx_justify_input (theForm->file_input, default_file, -@@ -589,21 +586,18 @@ - struct dirent **dir_s; - int i, numEntries; -- -- struct stat *stat_buf = (struct stat *) vmalloc (sizeof(struct stat)); -+ -+ struct stat *stat_buf = vmalloc (sizeof(struct stat)); - int filetype; - - char *sfile; -- char *file_color = "@C0"; /* default black */ -- char *link_color = "@C0"; -- char *dir_color = "@C0"; -- char *chardev_color = "@C0"; -- char *blockdev_color = "@C0"; -- char *socket_color = "@C0"; -- char *fifo_color = "@C0"; -+ const char *file_color = "@C0"; /* default black */ -+ const char *link_color = "@C0"; -+ const char *dir_color = "@C0"; -+ const char *chardev_color = "@C0"; -+ const char *blockdev_color = "@C0"; -+ const char *socket_color = "@C0"; -+ const char *fifo_color = "@C0"; - - char *currentFile; -- int currentWidth, maxWidth = 0; -- int min_browser_width = 175; -- - - if (USE_COLOR) { -@@ -656,5 +650,5 @@ - */ - -- currentFile = (char *) vmalloc (strlen(theForm->dir) + strlen("/") + -+ currentFile = vmalloc (strlen(theForm->dir) + strlen("/") + - strlen(dir_s[i]->d_name) + 1); - sprintf(currentFile, "%s/%s", theForm->dir, dir_s[i]->d_name); -@@ -683,5 +677,5 @@ - - /* Filename used for display in filebox: add color */ -- sfile = (char *) vmalloc (strlen(dir_s[i]->d_name) + 3 + 1); -+ sfile = vmalloc (strlen(dir_s[i]->d_name) + 3 + 1); - - switch (filetype) { -@@ -761,18 +755,5 @@ - free(stat_buf); - -- --/* -- if (maxWidth > min_browser_width) { -- fl_set_object_geometry(theForm->file_browser, -- 230, 40, wide_string_p + 20, 165); -- } -- else { -- fl_set_object_geometry(theForm->file_browser, -- 230, 40, 190, 165); -- } --*/ -- - fl_unfreeze_form(theForm->main); -- - - } /* end function parse_dir() */ -@@ -804,5 +785,5 @@ - - -- chunk = (void *) malloc (chunk_size); -+ chunk = malloc (chunk_size); - if (chunk == NULL) { - perror("flx_filebox"); ---- flx/flx.h 1997-11-10 22:57:34.000000000 -0500 -+++ flx/flx.h 2015-03-08 23:32:37.000000000 -0400 -@@ -61,4 +61,16 @@ - extern FL_FORM *flx_help_dialog(const char *help_text); - -+int flx_show_dialog (const char *type_str, const char *message_str); -+void flx_set_dialog_bgcolor (int theBgColor); -+void flx_set_dialog_color (int theInactiveColor, int theActiveColor); -+void flx_set_dialog_font (int theLabelStyle, int theLabelSize); -+void flx_set_dialog_lcol (int theLabelColor); -+ -+void flx_justify_input(FL_OBJECT *input_obj, const char *string, int STYLE, int SIZE); -+ -+void flx_scale_form(FL_FORM *form); -+char *flx_filebox(const char *dir, const char *pattern, const char *default_file); -+ -+char *flx_show_input (int type, const char *message_str, const char *initial); - - #endif /* FLX_H */ ---- flx/flx_filebox/flx_filebox.h 1997-09-03 22:28:48.000000000 -0400 -+++ flx/flx_filebox/flx_filebox.h 2015-03-08 23:37:08.000000000 -0400 -@@ -55,5 +55,4 @@ - static void FilterCB (FL_OBJECT *ob, long data); - static void LocationCB (FL_OBJECT *ob, long data); --static void QuitCB (FL_OBJECT *ob, long data); - - /* ---- src/build_pages.c 1998-02-22 22:53:11.000000000 -0500 -+++ src/build_pages.c 2015-03-09 00:15:48.000000000 -0400 -@@ -1,3 +1,4 @@ --#include "forms.h" -+#include -+#include "flx.h" - #include "xfpovray.h" - #include "pov-defaults.h" ---- flx/flx_show_dialog/flx_show_input.c 1998-01-31 20:39:42.000000000 -0500 -+++ flx/flx_show_dialog/flx_show_input.c 2015-03-09 00:36:57.000000000 -0400 -@@ -48,6 +48,6 @@ - ** * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -- --#include "forms.h" -+#include -+#include "flx.h" - #include "question.xpm" - -@@ -58,10 +58,4 @@ - extern int FLX_DIALOG_LSTYLE; - extern int FLX_DIALOG_LSIZE; -- --void flx_set_dialog_lcol(); --void flx_set_dialog_font(); --void flx_set_dialog_color(); --void flx_set_dialog_bgcolor(); -- - - -@@ -73,5 +67,4 @@ - FL_OBJECT *obj, *obj_input, *ret; - -- int button_width = 70; - int button_height = 25; - int min_x = 180; -@@ -82,6 +75,4 @@ - - int label_width, label_height; -- int button_label_width, button_label_height; -- int status = 0; - int form_x, form_y, yoffset, ymax_height; - char **discriminator; ---- src/xfpovray.h 1998-02-22 23:29:43.000000000 -0500 -+++ src/xfpovray.h 2015-03-09 00:39:07.000000000 -0400 -@@ -140,8 +140,10 @@ - void YesNoCB (FL_OBJECT *obj, long data); - --/* -+/* - ** Other utility functions - */ --void write_config (char *ini_file); -+ -+int read_config(const char *ini_file); -+void write_config (const char *ini_file); - void show_image (void); - void save_state (void); -@@ -320,3 +322,7 @@ - #endif - -+int tokenize(char *command_string, char *tokenlist[], size_t maxtoken); -+char *strtruncate (char *string, char endat); -+ -+void showtip(FL_OBJECT *ob, char *s); - #endif /* XFPOVRAY_H */ ---- src/callbacks.c 1998-02-22 22:33:45.000000000 -0500 -+++ src/callbacks.c 2015-03-09 00:38:37.000000000 -0400 -@@ -3,6 +3,7 @@ - */ - -- --#include "forms.h" -+#include -+#include -+#include "flx.h" - #include "xfpovray.h" - #include "pov-defaults.h" -@@ -29,10 +30,6 @@ - extern char *TEMP_FILE; - --extern void write_config(char *ini_file); - extern int povray_pid; - extern int auto_view; --extern void show_image(void); --extern int PovCheckCB(XEvent *ev, void *data); --extern void run_program (int count, ...); - - struct preview_options { -@@ -157,5 +154,5 @@ - temp = (char *) fl_calloc (1, - strlen(fl_get_input (xfData->sceneFileInput)) + 1); -- sprintf(temp, fl_get_input (xfData->sceneFileInput)); -+ strcpy(temp, fl_get_input (xfData->sceneFileInput)); - - path = (char *) fl_calloc (1, strlen(temp) + 1); -@@ -168,5 +165,5 @@ - } - basename = (char *) fl_calloc (1, strlen(tokenList[i])+1); -- sprintf(basename, tokenList[i]); -+ strcpy(basename, tokenList[i]); - strtruncate (basename, '.'); - strcat(basename, ".ini"); -@@ -607,5 +604,4 @@ - void GetFileCB(FL_OBJECT *ob, long data) - { -- int pid, type; - char *temp; - -@@ -805,5 +801,5 @@ - char temp[256]; - char buf[256]; -- int i, pid, key; -+ int key; - char *t; - -@@ -1219,5 +1215,4 @@ - void QuitCB(FL_OBJECT *ob, long data) - { -- int pid; - char *temp; - int menuItem = fl_get_menu(ob); ---- src/config.c 1998-02-22 23:38:31.000000000 -0500 -+++ src/config.c 2015-03-09 00:45:15.000000000 -0400 -@@ -3,5 +3,7 @@ - */ - --#include "forms.h" -+#include -+#include -+#include "flx.h" - #include "xfpovray.h" - #include "pov-defaults.h" -@@ -29,14 +31,12 @@ - ** Function to write the POV-Ray configuration file - */ --void write_config(char *ini_file) -+void write_config(const char *ini_file) - { - FILE *options_file; -- int i, do_free = FALSE; -- -- -+ int i; -+ -+ - if (ini_file == NULL) { -- ini_file = (char *) fl_calloc (1, strlen(POV_INIFILE) + 1); -- sprintf(ini_file, "%s", POV_INIFILE); -- do_free = TRUE; -+ ini_file = POV_INIFILE; - } - -@@ -228,9 +228,4 @@ - fl_load_browser (configPage->configBrowser, ini_file); - fl_unfreeze_form (configPage->form); -- -- if (do_free) -- free (ini_file); -- -- - } - -@@ -240,5 +235,5 @@ - ** Function to read the POV-Ray configuration file, and update widget values - */ --int read_config(char *ini_file) -+int read_config(const char *ini_file) - { - ---- src/run_program.c 1998-01-31 17:24:36.000000000 -0500 -+++ src/run_program.c 2015-03-08 23:02:20.000000000 -0400 -@@ -11,7 +11,11 @@ - */ - -+#include - #include -+#include - #include -- -+#include -+#include -+#include "xfpovray.h" - - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -@@ -24,5 +26,4 @@ - -- -- arg_list = (char **) malloc ((count + 1) * sizeof(char *)); -+ arg_list = malloc ((count + 1) * sizeof(char *)); - if (arg_list == NULL) { - perror ("run_program"); -@@ -49,18 +51,15 @@ - ** Run the program as a child process - */ -- pid = fork(); -+ pid = vfork(); - if (pid == 0) { - if (execvp (program, arg_list) == -1) { -- fprintf (stderr, "\nrun: could not exec() %s\n", arg_list[0]); -+ err(255, "\nrun: could not exec() %s", arg_list[0]); - /* sigchld catcher handles the error */ -- _exit (255); - } - } - else if (pid < 0) -- fprintf (stderr, "\nrun: could not fork()\n"); -+ warn("\nrun: could not vfork()"); - - free (arg_list); -- -- - return; - } ---- src/state.c 1998-02-23 00:26:07.000000000 -0500 -+++ src/state.c 2015-03-09 01:07:31.000000000 -0400 -@@ -4,7 +4,10 @@ - */ - -- --#include "forms.h" -+#include -+#include -+#include - #include -+ -+#include "flx.h" - #include "xfpovray.h" - #include "pov-defaults.h" -@@ -36,23 +39,19 @@ - { - FILE *state_file; -- char filename[256]; -- char temp[256]; -+ char filename[MAXPATHLEN]; - int i; - - - /* Get home directory, and set filepath */ -- sprintf (filename, "%s/.xfpovray/xfpovray.state", getenv("HOME")); -+ snprintf (filename, sizeof filename, "%s/.xfpovray/xfpovray.state", getenv("HOME")); - - if ((state_file = fopen(filename, "w")) == NULL) { -- fprintf (stderr, "Unable to open %s for writing! State not saved.\n", -+ warn("Unable to open %s for writing! State not saved.", - filename); - return; - } - -- - /* Write the current state */ -- sprintf(temp, "; xfpovray %s, generated by state.c\n", xfp_version); -- fprintf (state_file, temp); -- -+ fprintf(state_file, "; xfpovray %s, generated by state.c\n", xfp_version); - - /* Parsing */ -@@ -63,6 +62,5 @@ - fl_get_input (parsingPage->libpathInput[i])); - else -- fprintf (state_file, "library_path=NULL\n", -- fl_get_input (parsingPage->libpathInput[i])); -+ fprintf (state_file, "library_path=NULL\n"); - } - -@@ -142,5 +140,5 @@ - - if (strcmp(fl_get_input (tracingPage->antialiasThreshold), "") == 0) -- fprintf (state_file, "antialias_threshold=%d\n", -+ fprintf (state_file, "antialias_threshold=%f\n", - POV_ANTIALIAS_THRESHOLD); - else -@@ -155,5 +153,5 @@ - - if (strcmp(fl_get_input (tracingPage->jitterInput), "") == 0) -- fprintf (state_file, "jitter_amount=%d\n", POV_JITTER_AMOUNT); -+ fprintf (state_file, "jitter_amount=%f\n", POV_JITTER_AMOUNT); - else - fprintf (state_file, "jitter_amount=%s\n", -@@ -240,7 +238,7 @@ - FILE *state_file; - char filename[512]; -- int i, numLibs = 0; -+ int numLibs = 0; - char buf[80]; -- char *key; -+ const char *key; - char *value; - const char delimiter[] = "="; ---- src/tips.c 1998-01-18 22:47:13.000000000 -0500 -+++ src/tips.c 2015-03-09 01:10:51.000000000 -0400 -@@ -1,5 +1,7 @@ --#include "forms.h" -+#include - #include - -+#include "xfpovray.h" -+ - extern int show_tips; - -@@ -9,5 +11,6 @@ - * use the post handler as a tipper - */ --int post_handler(FL_OBJECT *ob, int event, -+static int -+post_handler(FL_OBJECT *ob, int event, - FL_Coord mx, FL_Coord my, int key, void *xev) - { ---- src/util.c 1998-02-21 20:57:40.000000000 -0500 -+++ src/util.c 2015-03-09 01:15:38.000000000 -0400 -@@ -6,5 +6,6 @@ - #include - -- -+#include -+#include "xfpovray.h" - - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -@@ -27,5 +28,5 @@ - { - static char tokensep[] = "/"; -- int tokencount; -+ size_t tokencount; - char *thistoken; - diff --git a/graphics/xfpovray/files/patch-xfpovraf.cf b/graphics/xfpovray/files/patch-xfpovraf.cf deleted file mode 100644 index 60f9b825b8fc..000000000000 --- a/graphics/xfpovray/files/patch-xfpovraf.cf +++ /dev/null @@ -1,20 +0,0 @@ ---- xfpovray.cf.orig Mon Feb 9 22:46:25 1998 -+++ xfpovray.cf Mon Jul 1 02:57:04 2002 -@@ -3,10 +3,14 @@ - XCOMM - - XCOMM Root installation directory for xfpovray --XFROOTDIR = /usr/local -+XFROOTDIR = ${BINDIR} - - XCOMM If your compiler can't find the xforms library --XFORMS_LIBDIR = /usr/local/lib -+XFORMS_LIBDIR = ${LOCALBASE}/lib - - XCOMM If your compiler can't find the xforms header file --XFORMS_INCDIR = /usr/local/include -+.if exists(${LOCALBASE}/include/X11/forms.h) -+XFORMS_INCDIR = ${LOCALBASE}/include/X11 -+.else -+XFORMS_INCDIR = ${LOCALBASE}/include -+.endif diff --git a/graphics/xfpovray/pkg-descr b/graphics/xfpovray/pkg-descr deleted file mode 100644 index 7743a310b1b6..000000000000 --- a/graphics/xfpovray/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -xfpovray is a graphical interface to the cool ray tracing program -POV-Ray (http://www.povray.org). It is written with the XForms -library and supports most of the numerous options of POV-Ray. The -interface was developed with POV-Ray version 3.0. - -Please read the documentation on POV-Ray before using xfpovray, -especially if you will be using the animation loop or antialiasing. diff --git a/graphics/xfpovray/pkg-plist b/graphics/xfpovray/pkg-plist deleted file mode 100644 index f07cdeae114f..000000000000 --- a/graphics/xfpovray/pkg-plist +++ /dev/null @@ -1,16 +0,0 @@ -bin/xfpovray -%%DOCSDIR%%/Appendices -%%DOCSDIR%%/Chapter_1 -%%DOCSDIR%%/Chapter_2 -%%DOCSDIR%%/Chapter_3 -%%DOCSDIR%%/Chapter_4 -%%DOCSDIR%%/Chapter_5 -%%DOCSDIR%%/Chapter_6 -%%DOCSDIR%%/Chapter_7 -%%DOCSDIR%%/Config_File -%%DOCSDIR%%/Include_Preview -%%DOCSDIR%%/Introduction -%%DOCSDIR%%/Options -%%DOCSDIR%%/Table_Of_Contents -%%DOCSDIR%%/Templates -%%DOCSDIR%%/help_topics