mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-30 05:40:06 +00:00
Code Issues Releases Activity

graphics/xfig: update 3.2.5c -> 3.2.7a

Browse Source 
PR:		228124
Submitted by:	<mjl@luckie.org.nz> (maintainer)
Reported by:	Pierre David <pdagog@gmail.com>
Relnotes:	http://mcj.sourceforge.net/frm_new_features.html
		http://mcj.sourceforge.net/frm_bugs_fixed.html
This commit is contained in:
Kurt Jaeger 2018-05-14 05:39:48 +00:00
parent 45779b5828
commit 1f0be5669e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=469852
9 changed files with 2653 additions and 2847 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
graphics/xfig/Makefile
View File

@ -2,74 +2,28 @@
# $FreeBSD$
PORTNAME= xfig
PORTVERSION= 3.2.5c
PORTREVISION= 2
PORTVERSION= 3.2.7a
CATEGORIES= graphics
MASTER_SITES= SF/mcj/mcj-source/
DISTNAME= ${PORTNAME}.${PORTVERSION}.full
MASTER_SITES= SF/mcj/
MAINTAINER= mjl@luckie.org.nz
COMMENT= Drawing program for X11
LIB_DEPENDS= libpng.so:graphics/png \
libXaw3d.so:x11-toolkits/Xaw3d
RUN_DEPENDS= fig2dev:print/transfig
RUN_DEPENDS= fig2dev:print/fig2dev
CONFLICTS= xfig-[12].* xfig-3.1* xfig-3.2.[1234]*
WRKSRC= ${WRKDIR}/${PORTNAME}.${PORTVERSION}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USES= imake jpeg
USES= desktop-file-utils gmake jpeg tar:xz
GNU_CONFIGURE= yes
USE_XORG= ice sm x11 xaw xext xi xmu xpm xt
USE_CSTD= gnu89
CFLAGS+= -Wno-return-type
INSTALL_TARGET= install install.libs
CFLAGS+= -Wno-return-type -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV+= DOCSDIR=${DOCSDIR} CHMOD=${CHMOD} TAR=${TAR}
MAKE_ARGS+= INSTALLFLAGS="${COPY}" \
INSTPGMFLAGS="${STRIP} -m ${BINMODE}" \
INSTDATFLAGS="-m ${SHAREMODE}" \
INSTMANFLAGS="-m ${MANMODE}"
OPTIONS_DEFINE= GHOSTSCRIPT I18N DOCS
OPTIONS_DEFAULT= GHOSTSCRIPT I18N
I18N_DESC= I18N support and Japanese docs
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDOCS}
INSTALL_TARGET+= install.html
.endif
.if ! ${PORT_OPTIONS:MI18N} || ! ${PORT_OPTIONS:MDOCS}
PLIST_SUB+= JPORTDOCS="@comment "
.else
PLIST_SUB+= JPORTDOCS=""
.endif
.if ${PORT_OPTIONS:MI18N}
USES+= gettext
.endif
post-extract:
@cd ${WRKSRC}/Doc && ${FIND} . -type f -name "*.orig" -delete
@${RM} ${WRKSRC}/Doc/html/images/pspbrwse.jbf
@${RM} ${WRKSRC}/Libraries/Examples/xfig.exe.stackdump
@${RM} ${WRKSRC}/Libraries/Fasteners/Fasteners.tar
@cd ${WRKSRC}/Doc && ${FIND} . -type f -print0 | ${XARGS} -0 ${CHMOD} a-x+r
@cd ${WRKSRC}/Libraries && ${FIND} . -type f -print0 | ${XARGS} -0 ${CHMOD} a-x+r
@${CP} ${WRKSRC}/Doc/xfig.man ${WRKSRC}
post-patch:
.if ! ${PORT_OPTIONS:MGHOSTSCRIPT}
.if ! ${PORT_OPTIONS:MI18N}
@${REINPLACE_CMD} -e 's|-DGSBIT ||g' ${WRKSRC}/Imakefile
.else
@${REINPLACE_CMD} -e '/^XCOMM #define I18N/s|XCOMM ||' \
-e 's|-DGSBIT ||g' ${WRKSRC}/Imakefile
.endif
.elif ${PORT_OPTIONS:MI18N}
@${REINPLACE_CMD} -e '/^XCOMM #define I18N/s|XCOMM ||' ${WRKSRC}/Imakefile
.endif
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>

5
graphics/xfig/distinfo
View File

@ -1,2 +1,3 @@
SHA256 (xfig.3.2.5c.full.tar.gz) = ea628f975b79ab175ab29220cc118274466497f6217f2989928317be2993a1f9
SIZE (xfig.3.2.5c.full.tar.gz) = 6078933
TIMESTAMP = 1526255520
SHA256 (xfig-3.2.7a.tar.xz) = ca89986fc9ddb9f3c5a4f6f70e5423f98e2f33f5528a9d577fb05bbcc07ddf24
SIZE (xfig-3.2.7a.tar.xz) = 5055456

157
graphics/xfig/files/patch-Imakefile
View File

@ -1,157 +0,0 @@
--- Imakefile.orig 2012-08-09 10:14:15.000000000 -0700
+++ Imakefile 2013-09-02 16:51:37.000000000 -0700
@@ -30,9 +30,9 @@
XCOMM Also, you may have to uncomment and redefine MKDIRHIER because "make" looks
XCOMM for it relative to the BINDIR variable.
XCOMM
-XCOMM BINDIR = /usr/bin
+BINDIR = $(PREFIX)/bin
XCOMM MKDIRHIER = /bin/sh /usr/bin/X11/mkdirhier -p
-MKDIRHIER = mkdirhier
+MKDIRHIER = ${LOCALBASE}/bin/mkdirhier
XCOMM Uncomment and change XAPPLOADDIR to the directory where you want the
XCOMM app-defaults resource files to go. You will have to use the environment
@@ -45,7 +45,7 @@
XCOMM different tree than the "correct" tree that your X system expects. The usual
XCOMM purpose of DESTDIR is to test an install process by installing in a benign area.
-XCOMM XAPPLOADDIR = /home/user/xfig
+XAPPLOADDIR = ${LOCALBASE}/lib/X11/app-defaults
XCOMM Comment out the following definition for XAW3D if you don't to want to use
XCOMM the 3d Athena Widget Set
@@ -75,8 +75,8 @@
XCOMM Redefine the following if your PNG library, zlib library and/or include file
XCOMM are in different places
-PNGLIBDIR = $(USRLIBDIR)
-PNGINC = -I/usr/include
+PNGLIBDIR = ${LOCALBASE}/lib
+PNGINC = -I${LOCALBASE}/include/libpng
ZLIBDIR = $(USRLIBDIR)
XCOMM If don't want JPEG support, comment out the #define USEJPEG line
@@ -95,13 +95,13 @@
#define USEINSTALLEDJPEG
#ifdef USEJPEG
-# ifdef USEINSTALLEDJPEG
- JPEGLIBDIR = /usr/local/lib
- JPEGINC = -I/usr/include/X11
-# else
- JPEGLIBDIR = ../jpeg
- JPEGINC = -I$(JPEGLIBDIR)
-# endif /* USEINSTALLEDJPEG */
+#ifdef USEINSTALLEDJPEG
+JPEGLIBDIR = ${LOCALBASE}/lib
+JPEGINC = -I${LOCALBASE}/include
+#else
+JPEGLIBDIR = ../jpeg
+JPEGINC = -I$(JPEGLIBDIR)
+#endif /* USEINSTALLEDJPEG */
#endif /* USEJPEG */
XCOMM Uncomment the #define for USEXPM if you want to use the XPM
@@ -119,8 +119,8 @@
#define USEXPM_ICON
#ifdef USEXPM
-XPMLIBDIR = /usr/local/lib
-XPMINC = -I/usr/include/X11
+XPMLIBDIR = ${LOCALBASE}/lib
+XPMINC = -I${LOCALBASE}/X11
#endif
XCOMM Uncomment the following definiton if you want to use the small icons
@@ -162,7 +162,7 @@
XCOMM inline functions. With the "INLINE" keyword, you should notice that
XCOMM the display will be a bit faster in complex figures
-XCOMM USEINLINE = -DUSE_INLINE
+USEINLINE = -DUSE_INLINE
XCOMM use (and change) the following if you want the multi-key data base file
XCOMM somewhere other than the standard X11 library directory
@@ -174,11 +174,11 @@
XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
-XFIGDOCDIR = /usr/local/xfig/doc
+XFIGDOCDIR = $(DOCSDIR)
XCOMM MANDIR tells where the standard man pages should go (no need to change it
XCOMM if you want the man pages installed in the standard place on your system
-MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
+XCOMM MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
XCOMM MANDIR = /usr/local/xfig/man
XCOMM If your system doesn't have strstr undefine the following definition
@@ -391,8 +391,8 @@
install::
@if [ -d $(DESTDIR)$(XFIGLIBDIR) ]; then set +x; \
else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGLIBDIR) ; set +x; ); fi
- chmod a+x,u+w $(DESTDIR)$(XFIGLIBDIR)
- $(INSTALL) -m 644 -c CompKeyDB $(DESTDIR)$(XFIGLIBDIR)
+ ${CHMOD} a+x,u+w $(DESTDIR)$(XFIGLIBDIR)
+ $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) CompKeyDB $(DESTDIR)$(XFIGLIBDIR)
XCOMM Install program, libraries and documentation with "make install.all"
install.all::
@@ -407,11 +407,14 @@
XCOMM Install the documentation here with "make install.doc"
install.doc::
@echo Installing man pages to $(MANDIR)
- @if [ -d $(DESTDIR)$(XFIGDOCDIR) ]; then set +x; \
- else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGDOCDIR) ; set +x; ); fi
+ @$(MAKE) install.docdir
@$(MAKE) install.man
@$(MAKE) install.html
+install.docdir::
+ @if [ -d $(DESTDIR)$(XFIGDOCDIR) ]; then set +x; \
+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGDOCDIR) ; set +x; ); fi
+
XCOMM Install the HTML documentation here with "make install.html"
#ifdef I18N
@@ -424,24 +427,25 @@
#endif
install.rhtml::
+ @$(MAKE) install.docdir
@(cd Doc ; \
echo Copying pdf and html files to $(DESTDIR)$(XFIGDOCDIR) ; \
if [ -d $(DESTDIR)$(XFIGDOCDIR)/html ]; then set +x; \
else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGDOCDIR)/html ); fi ; \
- $(INSTALL) -m 644 -c xfig_man.html $(DESTDIR)$(XFIGDOCDIR) ; \
- $(INSTALL) -m 644 -c xfig_ref_en.pdf $(DESTDIR)$(XFIGDOCDIR) ; \
- $(INSTALL) -m 644 -c xfig-howto.pdf $(DESTDIR)$(XFIGDOCDIR) ; \
+ $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) xfig_ref_en.pdf $(DESTDIR)$(XFIGDOCDIR) ; \
+ $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) xfig-howto.pdf $(DESTDIR)$(XFIGDOCDIR) ; \
if [ -d html ]; then \
- ( cd html ; tar cf - *.* images ) | ( cd $(DESTDIR)$(XFIGDOCDIR)/html ; tar xf - ) ; fi ; \
+ ( cd html ; ${TAR} -cf - *.* images ) | ( cd $(DESTDIR)$(XFIGDOCDIR)/html ; exec ${TAR} -xpof - ) ; fi ; \
) ;
#ifdef I18N
install.jhtml::
@echo "Copying japanese html files to $(DESTDIR)$(XFIGDOCDIR)"
+ @$(MAKE) install.docdir
@(cd Doc/html/japanese ; \
if [ -d $(DESTDIR)$(XFIGDOCDIR)/html/japanese ]; then set +x; \
else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGDOCDIR)/html/japanese ); fi ; \
- tar cf - * | ( cd $(DESTDIR)$(XFIGDOCDIR)/html/japanese ; tar xf - ) ; \
+ ${TAR} -cf - * | ( cd $(DESTDIR)$(XFIGDOCDIR)/html/japanese ; exec ${TAR} -xpof - ) ; \
) ;
#endif
@@ -451,7 +455,7 @@
@if [ -d $(DESTDIR)$(OBJLIBDIR) ]; then set +x; \
else (set -x; $(MKDIRHIER) $(DESTDIR)$(OBJLIBDIR) ; set +x; ); fi
@if [ -d Libraries ]; then \
- (cd Libraries ; tar cf - */. ) | ( cd $(DESTDIR)$(OBJLIBDIR) ; tar xf - ) ; \
+ (cd Libraries ; ${TAR} -cf - */. ) | ( cd $(DESTDIR)$(OBJLIBDIR) ; exec ${TAR} -xpof - ) ; \
else echo No Object Libraries to install ; \
fi;

20
graphics/xfig/files/patch-main.c
View File

@ -1,20 +0,0 @@
--- main.c.orig 2011-06-18 20:50:16.000000000 -0700
+++ main.c 2011-06-18 20:50:52.000000000 -0700
@@ -273,7 +273,7 @@
{"browser", "Browser", XtRString, sizeof(char *),
XtOffset(appresPtr, browser), XtRString, (caddr_t) "firefox"},
{"pdfviewer", "Viewer", XtRString, sizeof(char *),
- XtOffset(appresPtr, pdf_viewer), XtRString, (caddr_t) "acroread"},
+ XtOffset(appresPtr, pdf_viewer), XtRString, (caddr_t) "xpdf"},
{"spinner_delay", "spinnerDelay", XtRInt, sizeof(int),
XtOffset(appresPtr, spinner_delay), XtRImmediate, (caddr_t) 500},
{"spinner_rate", "spinnerRate", XtRInt, sizeof(int),
@@ -629,7 +629,7 @@
int setup_visual (int *argc_p, char **argv, Arg *args);
void get_pointer_mapping (void);
-void main(int argc, char **argv)
+int main(int argc, char **argv)
{
Widget children[NCHILDREN];
XEvent event;

11
graphics/xfig/files/patch-src_main.c Normal file
View File

@ -0,0 +1,11 @@
--- src/main.c.orig 2018-04-04 21:07:37 UTC
+++ src/main.c
@@ -631,7 +631,7 @@ struct geom geom;
int setup_visual (int *argc_p, char **argv, Arg *args);
void get_pointer_mapping (void);
-void main(int argc, char **argv)
+int main(int argc, char **argv)
{
Widget children[NCHILDREN];
XEvent event;

11
graphics/xfig/files/patch-src_w__dir.c Normal file
View File

@ -0,0 +1,11 @@
--- src/w_dir.c.orig 2017-10-08 18:52:17 UTC
+++ src/w_dir.c
@@ -174,7 +174,7 @@ ShowHidden(Widget w, XtPointer client_data, XtPointer
/* if the export dir diverged from the file dir, leave it there */
void
-update_file_export_dir(const char *restrict dir)
+update_file_export_dir(const char *dir)
{
if (!strcmp(cur_file_dir, cur_export_dir))
strcpy(cur_export_dir, dir);

11
graphics/xfig/files/patch-src_w__dir.h Normal file
View File

@ -0,0 +1,11 @@
--- src/w_dir.h.orig 2017-08-30 20:49:01 UTC
+++ src/w_dir.h
@@ -64,7 +64,7 @@
extern Widget popup_dir_text;
extern void create_dirinfo(Boolean file_exp, Widget parent, Widget below, Widget *ret_beside, Widget *ret_below, Widget *mask_w, Widget *dir_w, Widget *flist_w, Widget *dlist_w, int file_width, Boolean file_panel);
-extern void update_file_export_dir(const char *restrict dir);
+extern void update_file_export_dir(const char *dir);
/* Xdir function declarations. */

12
graphics/xfig/files/patch-w_intersect.c
View File

@ -1,12 +0,0 @@
--- w_intersect.c.orig 2011-06-18 21:05:55.000000000 -0700
+++ w_intersect.c 2011-06-18 21:06:18.000000000 -0700
@@ -26,7 +26,9 @@
#include "w_msgpanel.h"
#include "f_util.h"
#include "u_quartic.h"
+#ifndef __FreeBSD__
#include <alloca.h>
+#endif
#include <math.h>
#undef I

5209
graphics/xfig/pkg-plist
View File

File diff suppressed because it is too large Load Diff