Date: Fri, 6 Sep 2013 14:09:26 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r326499 - in head/graphics/xfig: . files Message-ID: <201309061409.r86E9Qw3022637@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Fri Sep 6 14:09:25 2013 New Revision: 326499 URL: http://svnweb.freebsd.org/changeset/ports/326499 Log: graphics/xfig: update to 3.2.5c - Update to 3.2.5c [1] - Convert lib depends to new syntax PR: ports/181771 [1] Submitted by: Matthew Luckie <mjl luckie.org.nz> (maintainer) Deleted: head/graphics/xfig/files/patch-f_readpng.c head/graphics/xfig/files/patch-f_wrpng.c Modified: head/graphics/xfig/Makefile head/graphics/xfig/distinfo head/graphics/xfig/files/patch-Imakefile (contents, props changed) head/graphics/xfig/files/patch-main.c (contents, props changed) head/graphics/xfig/files/patch-w_intersect.c (contents, props changed) head/graphics/xfig/pkg-plist Modified: head/graphics/xfig/Makefile ============================================================================== --- head/graphics/xfig/Makefile Fri Sep 6 14:01:54 2013 (r326498) +++ head/graphics/xfig/Makefile Fri Sep 6 14:09:25 2013 (r326499) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= xfig -PORTVERSION= 3.2.5b -PORTREVISION= 1 +PORTVERSION= 3.2.5c CATEGORIES= graphics MASTER_SITES= SF/mcj/mcj-source/ DISTNAME= ${PORTNAME}.${PORTVERSION}.full @@ -11,9 +10,9 @@ DISTNAME= ${PORTNAME}.${PORTVERSION}.ful MAINTAINER= mjl@luckie.org.nz COMMENT= A drawing program for X11 -LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png15:${PORTSDIR}/graphics/png \ - Xaw3d.8:${PORTSDIR}/x11-toolkits/Xaw3d +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libpng15.so:${PORTSDIR}/graphics/png \ + libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d RUN_DEPENDS= fig2dev:${PORTSDIR}/print/transfig CONFLICTS= xfig-[12].* xfig-3.1* xfig-3.2.[1234]* @@ -53,6 +52,10 @@ USES+= gettext .endif post-extract: + @cd ${WRKSRC}/Doc && ${FIND} . -type f -name "*.orig" -delete + @${RM} -f ${WRKSRC}/Doc/html/images/pspbrwse.jbf + @${RM} -f ${WRKSRC}/Libraries/Examples/xfig.exe.stackdump + @${RM} -f ${WRKSRC}/Libraries/Fasteners/Fasteners.tar @cd ${WRKSRC}/Doc && ${FIND} -s . -type d -print0 | ${XARGS} -0 ${CHMOD} a+rx @cd ${WRKSRC}/Doc && ${FIND} . -type f -print0 | ${XARGS} -0 ${CHMOD} a-x+r @${CHMOD} a+rx ${WRKSRC}/Libraries Modified: head/graphics/xfig/distinfo ============================================================================== --- head/graphics/xfig/distinfo Fri Sep 6 14:01:54 2013 (r326498) +++ head/graphics/xfig/distinfo Fri Sep 6 14:09:25 2013 (r326499) @@ -1,2 +1,2 @@ -SHA256 (xfig.3.2.5b.full.tar.gz) = 5c01cf6d79f4de04e3d9efc9f3e4ea046e880d6610f210c8551bb0a713e985c2 -SIZE (xfig.3.2.5b.full.tar.gz) = 5821049 +SHA256 (xfig.3.2.5c.full.tar.gz) = ea628f975b79ab175ab29220cc118274466497f6217f2989928317be2993a1f9 +SIZE (xfig.3.2.5c.full.tar.gz) = 6078933 Modified: head/graphics/xfig/files/patch-Imakefile ============================================================================== --- head/graphics/xfig/files/patch-Imakefile Fri Sep 6 14:01:54 2013 (r326498) +++ head/graphics/xfig/files/patch-Imakefile Fri Sep 6 14:09:25 2013 (r326499) @@ -1,7 +1,5 @@ -$FreeBSD$ - ---- Imakefile.orig 2009-03-30 08:53:05.000000000 -0700 -+++ Imakefile 2011-06-18 21:04:40.000000000 -0700 +--- 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. @@ -23,39 +21,28 @@ $FreeBSD$ XCOMM Comment out the following definition for XAW3D if you don't to want to use XCOMM the 3d Athena Widget Set -@@ -60,7 +60,7 @@ - XCOMM some new features, including "Tips", which replace xfig's "help balloons" - XCOMM NOTE: This is the default for many X systems now. - --XCOMM #define XAW3D1_5E -+#define XAW3D1_5E - - #ifdef XAW3D1_5E - DUSEXAW3D = -DXAW3D -DXAW3D1_5E -@@ -75,9 +75,9 @@ +@@ -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/local/include --ZLIBDIR = $(USRLIBDIR) +-PNGINC = -I/usr/include +PNGLIBDIR = ${LOCALBASE}/lib +PNGINC = -I${LOCALBASE}/include/libpng -+XCOMM ZLIBDIR = $(USRLIBDIR) + ZLIBDIR = $(USRLIBDIR) XCOMM If don't want JPEG support, comment out the #define USEJPEG line - XCOMM Uncomment the #define for USEJPEG if you want to be able to import @@ -95,13 +95,13 @@ #define USEINSTALLEDJPEG #ifdef USEJPEG -- #ifdef USEINSTALLEDJPEG +-# ifdef USEINSTALLEDJPEG - JPEGLIBDIR = /usr/local/lib - JPEGINC = -I/usr/include/X11 -- #else +-# else - JPEGLIBDIR = ../jpeg - JPEGINC = -I$(JPEGLIBDIR) -- #endif /* USEINSTALLEDJPEG */ +-# endif /* USEINSTALLEDJPEG */ +#ifdef USEINSTALLEDJPEG +JPEGLIBDIR = ${LOCALBASE}/lib +JPEGINC = -I${LOCALBASE}/include @@ -71,13 +58,13 @@ $FreeBSD$ #ifdef USEXPM -XPMLIBDIR = /usr/local/lib --XPMINC = -I/usr/local/include/X11 +-XPMINC = -I/usr/include/X11 +XPMLIBDIR = ${LOCALBASE}/lib -+XPMINC = -I${LOCALBASE}/include/X11 ++XPMINC = -I${LOCALBASE}/X11 #endif XCOMM Uncomment the following definiton if you want to use the small icons -@@ -161,7 +161,7 @@ +@@ -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 @@ -86,7 +73,7 @@ $FreeBSD$ XCOMM use (and change) the following if you want the multi-key data base file XCOMM somewhere other than the standard X11 library directory -@@ -173,11 +173,11 @@ +@@ -174,11 +174,11 @@ XCOMM XFIGDOCDIR tells where the html and pdf documentation should go XCOMM XFIGDOCDIR = $(DOCDIR)/xfig @@ -100,16 +87,7 @@ $FreeBSD$ XCOMM MANDIR = /usr/local/xfig/man XCOMM If your system doesn't have strstr undefine the following definition -@@ -251,7 +251,7 @@ - #endif /* USEJPEG */ - - #ifdef I18N --I18N_DEFS = -DI18N -DSETLOCALE -+I18N_DEFS = -DI18N - I18N_SRC = w_i18n.c - I18N_OBJ = w_i18n.o - #endif -@@ -390,8 +390,8 @@ +@@ -391,8 +391,8 @@ install:: @if [ -d $(DESTDIR)$(XFIGLIBDIR) ]; then set +x; \ else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGLIBDIR) ; set +x; ); fi @@ -120,7 +98,7 @@ $FreeBSD$ XCOMM Install program, libraries and documentation with "make install.all" install.all:: -@@ -406,11 +406,14 @@ +@@ -407,11 +407,14 @@ XCOMM Install the documentation here with "make install.doc" install.doc:: @echo Installing man pages to $(MANDIR) @@ -137,7 +115,7 @@ $FreeBSD$ XCOMM Install the HTML documentation here with "make install.html" #ifdef I18N -@@ -423,24 +426,26 @@ +@@ -424,24 +427,25 @@ #endif install.rhtml:: @@ -149,7 +127,6 @@ $FreeBSD$ - $(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_man.html $(DESTDIR)$(XFIGDOCDIR) ; \ + $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) xfig_ref_en.pdf $(DESTDIR)$(XFIGDOCDIR) ; \ + $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) xfig-howto.pdf $(DESTDIR)$(XFIGDOCDIR) ; \ if [ -d html ]; then \ @@ -169,7 +146,7 @@ $FreeBSD$ ) ; #endif -@@ -450,7 +455,7 @@ +@@ -451,7 +455,7 @@ @if [ -d $(DESTDIR)$(OBJLIBDIR) ]; then set +x; \ else (set -x; $(MKDIRHIER) $(DESTDIR)$(OBJLIBDIR) ; set +x; ); fi @if [ -d Libraries ]; then \ Modified: head/graphics/xfig/files/patch-main.c ============================================================================== --- head/graphics/xfig/files/patch-main.c Fri Sep 6 14:01:54 2013 (r326498) +++ head/graphics/xfig/files/patch-main.c Fri Sep 6 14:09:25 2013 (r326499) @@ -1,5 +1,3 @@ -$FreeBSD$ - --- 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 @@ Modified: head/graphics/xfig/files/patch-w_intersect.c ============================================================================== --- head/graphics/xfig/files/patch-w_intersect.c Fri Sep 6 14:01:54 2013 (r326498) +++ head/graphics/xfig/files/patch-w_intersect.c Fri Sep 6 14:09:25 2013 (r326499) @@ -1,5 +1,3 @@ -$FreeBSD$ - --- 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 @@ Modified: head/graphics/xfig/pkg-plist ============================================================================== --- head/graphics/xfig/pkg-plist Fri Sep 6 14:01:54 2013 (r326498) +++ head/graphics/xfig/pkg-plist Fri Sep 6 14:09:25 2013 (r326499) @@ -69,6 +69,7 @@ lib/X11/xfig/CompKeyDB %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/cd_disk.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/dat-drive.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/dat-drive2.fig +%%PORTDOCS%%lib/X11/xfig/Libraries/Computers/datacard.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/desktop1.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/desktop2.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/desktop3.fig @@ -91,6 +92,7 @@ lib/X11/xfig/CompKeyDB %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/qic-drive.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/r320.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/scanner.fig +%%PORTDOCS%%lib/X11/xfig/Libraries/Computers/screen.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/server.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/sparc5.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/sun_d1000.fig @@ -105,6 +107,7 @@ lib/X11/xfig/CompKeyDB %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/tower3.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/ultra2.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/ultra30.fig +%%PORTDOCS%%lib/X11/xfig/Libraries/Computers/usbpen.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/va-jbot.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/va-server-11xx.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/va-server-1hd.fig @@ -116,6 +119,7 @@ lib/X11/xfig/CompKeyDB %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/va-server-4hd.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/va-server-5df.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/va-server-nhs.fig +%%PORTDOCS%%lib/X11/xfig/Libraries/Computers/xbox.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Computers/xterminal.fig %%PORTDOCS%%lib/X11/xfig/Libraries/DSP/1toN.fig %%PORTDOCS%%lib/X11/xfig/Libraries/DSP/1toNtime.fig @@ -177,6 +181,7 @@ lib/X11/xfig/CompKeyDB %%PORTDOCS%%lib/X11/xfig/Libraries/Electrical/telephone_outlet.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Physical/README %%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Physical/bal_mike.fig +%%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Physical/bnc.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Physical/conn_db15.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Physical/conn_db25.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Physical/conn_db37.fig @@ -1204,7 +1209,6 @@ lib/X11/xfig/CompKeyDB %%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Schematic/pnp.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Schematic/pushbutton_nc.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Schematic/pushbutton_no.fig -%%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Schematic/relay.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Schematic/relay_dpdt.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Schematic/relay_spdt.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Electronic/Schematic/resistor.fig @@ -1300,7 +1304,6 @@ lib/X11/xfig/CompKeyDB %%PORTDOCS%%lib/X11/xfig/Libraries/Fasteners/Bolts/Roundhead_Shld_bolt.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Fasteners/Bolts/Roundhead_Slotted_bolt.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Fasteners/Bolts/Roundhead_bolt.fig -%%PORTDOCS%%lib/X11/xfig/Libraries/Fasteners/Fasteners.tar.gz %%PORTDOCS%%lib/X11/xfig/Libraries/Fasteners/Machinescrews/Hexhead_Shld_screw.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Fasteners/Machinescrews/Hexhead_screw.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Fasteners/Machinescrews/Panhead_Slotted_screw.fig @@ -2154,6 +2157,9 @@ lib/X11/xfig/CompKeyDB %%PORTDOCS%%lib/X11/xfig/Libraries/Music/modern/treble_staff.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Music/modern/whole-dotted.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Music/modern/whole.fig +%%PORTDOCS%%lib/X11/xfig/Libraries/Networks/cloud.fig +%%PORTDOCS%%lib/X11/xfig/Libraries/Networks/router.fig +%%PORTDOCS%%lib/X11/xfig/Libraries/Networks/wlan.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/ATM/asx1000.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/ATM/asx200.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/ATM/asx4000.fig @@ -2168,8 +2174,10 @@ lib/X11/xfig/CompKeyDB %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Devices/bridge.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Devices/dsu-csu.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Devices/firewall.fig +%%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Devices/firewall-pair.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Devices/generic_hw.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Devices/imux.fig +%%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Devices/internet.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Devices/microwave1.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Devices/microwave2.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Devices/netcloud.fig @@ -2195,12 +2203,15 @@ lib/X11/xfig/CompKeyDB %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Hubs/hub3.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Hubs/hub4.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Hubs/netgearhub.fig +%%PORTDOCS%%lib/X11/xfig/Libraries/Networks/NodeB.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/README %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Routers/cisco_7010.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Routers/cisco_7513.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Routers/router.fig +%%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Routers/router-pair.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Routers/router2.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Routers/router3.fig +%%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Routers/router4.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Switches/ExtremeSummit.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Switches/cisco_catalyst.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Switches/cisco_catalyst4006.fig @@ -2210,6 +2221,8 @@ lib/X11/xfig/CompKeyDB %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Switches/extreme_blk_dmnd.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Switches/extreme_summit.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Switches/switch.fig +%%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Switches/switch2.fig +%%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Switches/switch-pair.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/Switches/switching_hub.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/TestEquip/smartbit.fig %%PORTDOCS%%lib/X11/xfig/Libraries/Networks/TestEquip/smartbit2K.fig @@ -2781,7 +2794,6 @@ lib/X11/xfig/CompKeyDB %%PORTDOCS%%%%DOCSDIR%%/html/images/snap-accel.png %%PORTDOCS%%%%DOCSDIR%%/html/images/spell-check-panel.png %%PORTDOCS%%%%DOCSDIR%%/html/images/spinner.png -%%PORTDOCS%%%%DOCSDIR%%/html/images/splash-screen.png %%PORTDOCS%%%%DOCSDIR%%/html/images/spline-curves.png %%PORTDOCS%%%%DOCSDIR%%/html/images/spline-examples.png %%PORTDOCS%%%%DOCSDIR%%/html/images/spline-line-button.png @@ -2835,7 +2847,6 @@ lib/X11/xfig/CompKeyDB %%PORTDOCS%%%%DOCSDIR%%/html/index.html %%PORTDOCS%%%%DOCSDIR%%/html/installation.html %%PORTDOCS%%%%DOCSDIR%%/html/introduction.html -%%PORTDOCS%%%%DOCSDIR%%/html/introduction.html.save %%JPORTDOCS%%%%DOCSDIR%%/html/japanese/accelerators.html %%JPORTDOCS%%%%DOCSDIR%%/html/japanese/attributes.html %%JPORTDOCS%%%%DOCSDIR%%/html/japanese/authors.html @@ -2910,7 +2921,6 @@ lib/X11/xfig/CompKeyDB %%PORTDOCS%%%%DOCSDIR%%/html/printing.html %%PORTDOCS%%%%DOCSDIR%%/html/screen_image_map.html %%PORTDOCS%%%%DOCSDIR%%/xfig-howto.pdf -%%PORTDOCS%%%%DOCSDIR%%/xfig_man.html %%PORTDOCS%%%%DOCSDIR%%/xfig_ref_en.pdf %%JPORTDOCS%%@dirrm %%DOCSDIR%%/html/japanese %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309061409.r86E9Qw3022637>