Index: head/x11-toolkits/blt/Makefile =================================================================== --- head/x11-toolkits/blt/Makefile (revision 517119) +++ head/x11-toolkits/blt/Makefile (revision 517120) @@ -1,50 +1,50 @@ # Created by: Kenjiro Cho # $FreeBSD$ PORTNAME= blt PORTVERSION= 2.5.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits tk MASTER_SITES= SF/wize DISTNAME= ${PORTNAME}-src-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= doconnor@gsoft.com.au COMMENT= Extension to the Tk toolkit LICENSE= MIT WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:R} USES= gmake jpeg shebangfix tk:tea zip SHEBANG_FILES= demos/scripts/xcolors.tcl SHEBANG_LANG= bltwish bltwish_OLD_CMD=../bltwish bltwish_CMD= ${PREFIX}/bin/bltwish # installed by this port, so not LOCALBASE USE_LDCONFIG= yes CFLAGS+= -I${TCL_INCLUDEDIR}/generic \ -I${TK_INCLUDEDIR}/generic \ -I${TK_INCLUDEDIR}/unix MAKE_JOBS_UNSAFE=yes PLIST_SUB+= BLTVER=${PORTVERSION:R} \ BLTSHORTVER=${PORTVERSION:R:S/.//} CONFIGURE_ARGS= --enable-jpeg=${LOCALBASE} \ post-patch: ${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \ ${REINPLACE_CMD} -e '/^INSTALL_ROOT/s|$$|$${DESTDIR}|' ${FIND} ${WRKSRC}/demos -name "*.tcl" | ${XARGS} \ ${REINPLACE_CMD} -e 's|../src/bltwish|${LOCALBASE}/bin/bltwish|' post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so .include .if ${TCL_VER} > 8.5 CFLAGS+= -DUSE_INTERP_RESULT -DUSE_INTERP_ERRORLINE .endif .include Index: head/x11-toolkits/blt/files/patch-generic_Makefile.in =================================================================== --- head/x11-toolkits/blt/files/patch-generic_Makefile.in (revision 517119) +++ head/x11-toolkits/blt/files/patch-generic_Makefile.in (revision 517120) @@ -1,37 +1,45 @@ ---- generic/Makefile.in.orig 2010-12-10 23:39:42 UTC -+++ generic/Makefile.in -@@ -161,6 +161,8 @@ +--- generic/Makefile.in.orig 2010-12-10 23:39:42.000000000 +0000 ++++ generic/Makefile.in 2019-09-11 06:18:57.418320000 +0000 +@@ -148,6 +148,7 @@ + bltwish = bltwish + bltsh = bltsh + headers = $(srcdir)/blt.h \ ++ $(srcdir)/bltOldConfig.h \ + $(srcdir)/bltBind.h \ + $(srcdir)/bltChain.h \ + bltHash.h \ +@@ -161,6 +162,8 @@ libvers_a = libBLT$(version).a tcl_only_lib_a = libBLTlite.a tcl_only_libvers_a = libBLTlite$(version).a +stub_a = libBLTstub.a +stub_libvers_a = libBLTstub$(version).a CC_SWITCHES = $(EXTRA_CFLAGS) $(CFLAGS) $(DEFINES) $(INCLUDES) INSTALL = @INSTALL@ -@@ -215,13 +217,15 @@ +@@ -215,13 +218,15 @@ $(INSTALL) -m 0755 $(bltwish) $(INSTALL_ROOT)$(bindir) $(INSTALL) -m 0755 $(bltsh) $(INSTALL_ROOT)$(bindir) -install-lib: $(lib_a) $(tcl_only_lib_a) +install-lib: $(lib_a) $(tcl_only_lib_a) $(stub_a) $(INSTALL_DATA) $(lib_a) $(INSTALL_ROOT)$(libdir)/$(libvers_a) (cd $(INSTALL_ROOT)$(libdir); $(RM) $(lib_a) ; $(LN_S) $(libvers_a) $(lib_a)) $(RANLIB) $(INSTALL_ROOT)$(libdir)/$(libvers_a) $(INSTALL_DATA) $(tcl_only_lib_a) $(INSTALL_ROOT)$(libdir)/$(tcl_only_libvers_a) (cd $(INSTALL_ROOT)$(libdir); $(RM) $(tcl_only_lib_a) ; $(LN_S) $(tcl_only_libvers_a) $(tcl_only_lib_a)) $(RANLIB) $(INSTALL_ROOT)$(libdir)/$(tcl_only_libvers_a) + $(INSTALL_DATA) $(stub_a) $(INSTALL_ROOT)$(libdir)/$(stub_libvers_a) + (cd $(INSTALL_ROOT)$(libdir); $(RM) $(stub_a) ; $(LN_S) $(stub_libvers_a) $(stub_a)) (cd shared; $(MAKE) install) mkdirs: -@@ -244,7 +248,7 @@ +@@ -244,7 +249,7 @@ $(LINT) $(LINTFLAGS) $(DEFINES) $(INCLUDES) $(SRCS) libBLTstub.a: - $(CC) -I$(srcdir) @INCLUDES@ -c $(srcdir)/bltStubLib.c + $(CC) -fPIC -I$(srcdir) @INCLUDES@ -c $(srcdir)/bltStubLib.c $(AR) libBLTstub.a bltStubLib.o $(RANLIB) libBLTstub.a Index: head/x11-toolkits/blt/pkg-plist =================================================================== --- head/x11-toolkits/blt/pkg-plist (revision 517119) +++ head/x11-toolkits/blt/pkg-plist (revision 517120) @@ -1,209 +1,210 @@ lib/libBLT%%BLTSHORTVER%%.a lib/libBLT%%BLTSHORTVER%%.so lib/libBLTlite%%BLTSHORTVER%%.so lib/libBLT.a lib/libBLTlite.a lib/libBLTlite%%BLTSHORTVER%%.a lib/libBLTstub.a lib/libBLTstub%%BLTSHORTVER%%.a bin/bltwish%%BLTSHORTVER%% bin/bltsh%%BLTSHORTVER%% bin/bltwish bin/bltsh include/blt.h include/bltBind.h include/bltChain.h include/bltDecls.h include/bltHash.h include/bltList.h +include/bltOldConfig.h include/bltPool.h include/bltTree.h include/bltVector.h lib/blt%%BLTVER%%/bltCanvEps.pro lib/blt%%BLTVER%%/bltGraph.pro lib/blt%%BLTVER%%/dd_protocols/dd-color.tcl lib/blt%%BLTVER%%/dd_protocols/dd-file.tcl lib/blt%%BLTVER%%/dd_protocols/dd-number.tcl lib/blt%%BLTVER%%/dd_protocols/dd-text.tcl lib/blt%%BLTVER%%/dd_protocols/tclIndex lib/blt%%BLTVER%%/demos/barchart1.tcl lib/blt%%BLTVER%%/demos/barchart2.tcl lib/blt%%BLTVER%%/demos/barchart3.tcl lib/blt%%BLTVER%%/demos/barchart4.tcl lib/blt%%BLTVER%%/demos/barchart5.tcl lib/blt%%BLTVER%%/demos/bgexec1.tcl lib/blt%%BLTVER%%/demos/bgexec2.tcl lib/blt%%BLTVER%%/demos/bgexec3.tcl lib/blt%%BLTVER%%/demos/bgexec4.tcl lib/blt%%BLTVER%%/demos/bitmap.tcl lib/blt%%BLTVER%%/demos/bitmaps/face.xbm lib/blt%%BLTVER%%/demos/bitmaps/fish/left.xbm lib/blt%%BLTVER%%/demos/bitmaps/fish/left1.xbm lib/blt%%BLTVER%%/demos/bitmaps/fish/left1m.xbm lib/blt%%BLTVER%%/demos/bitmaps/fish/leftm.xbm lib/blt%%BLTVER%%/demos/bitmaps/fish/mid.xbm lib/blt%%BLTVER%%/demos/bitmaps/fish/midm.xbm lib/blt%%BLTVER%%/demos/bitmaps/fish/right.xbm lib/blt%%BLTVER%%/demos/bitmaps/fish/right1.xbm lib/blt%%BLTVER%%/demos/bitmaps/fish/right1m.xbm lib/blt%%BLTVER%%/demos/bitmaps/fish/rightm.xbm lib/blt%%BLTVER%%/demos/bitmaps/greenback.xbm lib/blt%%BLTVER%%/demos/bitmaps/hand/hand01.xbm lib/blt%%BLTVER%%/demos/bitmaps/hand/hand01m.xbm lib/blt%%BLTVER%%/demos/bitmaps/hand/hand02.xbm lib/blt%%BLTVER%%/demos/bitmaps/hand/hand02m.xbm lib/blt%%BLTVER%%/demos/bitmaps/hand/hand03.xbm lib/blt%%BLTVER%%/demos/bitmaps/hand/hand03m.xbm lib/blt%%BLTVER%%/demos/bitmaps/hand/hand04.xbm lib/blt%%BLTVER%%/demos/bitmaps/hand/hand04m.xbm lib/blt%%BLTVER%%/demos/bitmaps/hand/hand05.xbm lib/blt%%BLTVER%%/demos/bitmaps/hand/hand05m.xbm lib/blt%%BLTVER%%/demos/bitmaps/hand/hand06.xbm lib/blt%%BLTVER%%/demos/bitmaps/hand/hand06m.xbm lib/blt%%BLTVER%%/demos/bitmaps/hand/hand07.xbm lib/blt%%BLTVER%%/demos/bitmaps/hand/hand07m.xbm lib/blt%%BLTVER%%/demos/bitmaps/hand/hand08.xbm lib/blt%%BLTVER%%/demos/bitmaps/hand/hand08m.xbm lib/blt%%BLTVER%%/demos/bitmaps/hand/hand09.xbm lib/blt%%BLTVER%%/demos/bitmaps/hand/hand09m.xbm lib/blt%%BLTVER%%/demos/bitmaps/hand/hand10.xbm lib/blt%%BLTVER%%/demos/bitmaps/hand/hand10m.xbm lib/blt%%BLTVER%%/demos/bitmaps/hand/hand11.xbm lib/blt%%BLTVER%%/demos/bitmaps/hand/hand11m.xbm lib/blt%%BLTVER%%/demos/bitmaps/hand/hand12.xbm lib/blt%%BLTVER%%/demos/bitmaps/hand/hand12m.xbm lib/blt%%BLTVER%%/demos/bitmaps/hand/hand13.xbm lib/blt%%BLTVER%%/demos/bitmaps/hand/hand13m.xbm lib/blt%%BLTVER%%/demos/bitmaps/hand/hand14.xbm lib/blt%%BLTVER%%/demos/bitmaps/hand/hand14m.xbm lib/blt%%BLTVER%%/demos/bitmaps/hobbes.xbm lib/blt%%BLTVER%%/demos/bitmaps/hobbes_mask.xbm lib/blt%%BLTVER%%/demos/bitmaps/sharky.xbm lib/blt%%BLTVER%%/demos/bitmaps/xbob.xbm lib/blt%%BLTVER%%/demos/busy1.tcl lib/blt%%BLTVER%%/demos/busy2.tcl lib/blt%%BLTVER%%/demos/dnd1.tcl lib/blt%%BLTVER%%/demos/dnd2.tcl lib/blt%%BLTVER%%/demos/dragdrop1.tcl lib/blt%%BLTVER%%/demos/dragdrop2.tcl lib/blt%%BLTVER%%/demos/eps.tcl lib/blt%%BLTVER%%/demos/graph1.tcl lib/blt%%BLTVER%%/demos/graph2.tcl lib/blt%%BLTVER%%/demos/graph3.tcl lib/blt%%BLTVER%%/demos/graph4.tcl lib/blt%%BLTVER%%/demos/graph5.tcl lib/blt%%BLTVER%%/demos/graph6.tcl lib/blt%%BLTVER%%/demos/graph7.tcl lib/blt%%BLTVER%%/demos/hierbox1.tcl lib/blt%%BLTVER%%/demos/hierbox2.tcl lib/blt%%BLTVER%%/demos/hierbox3.tcl lib/blt%%BLTVER%%/demos/hierbox4.tcl lib/blt%%BLTVER%%/demos/hiertable1.tcl lib/blt%%BLTVER%%/demos/hiertable2.tcl lib/blt%%BLTVER%%/demos/htext.txt lib/blt%%BLTVER%%/demos/htext1.tcl lib/blt%%BLTVER%%/demos/images/blt98.gif lib/blt%%BLTVER%%/demos/images/buckskin.gif lib/blt%%BLTVER%%/demos/images/chalk.gif lib/blt%%BLTVER%%/demos/images/close.gif lib/blt%%BLTVER%%/demos/images/close2.gif lib/blt%%BLTVER%%/demos/images/clouds.gif lib/blt%%BLTVER%%/demos/images/corrugated_metal.gif lib/blt%%BLTVER%%/demos/images/folder.gif lib/blt%%BLTVER%%/demos/images/folder_blue.gif lib/blt%%BLTVER%%/demos/images/folder_blue_open.gif lib/blt%%BLTVER%%/demos/images/mini-book1.gif lib/blt%%BLTVER%%/demos/images/mini-book2.gif lib/blt%%BLTVER%%/demos/images/mini-display.gif lib/blt%%BLTVER%%/demos/images/mini-doc.gif lib/blt%%BLTVER%%/demos/images/mini-filemgr.gif lib/blt%%BLTVER%%/demos/images/mini-ofolder.gif lib/blt%%BLTVER%%/demos/images/mini-windows.gif lib/blt%%BLTVER%%/demos/images/ofolder.gif lib/blt%%BLTVER%%/demos/images/open.gif lib/blt%%BLTVER%%/demos/images/open2.gif lib/blt%%BLTVER%%/demos/images/out.ps lib/blt%%BLTVER%%/demos/images/qv100.t.gif lib/blt%%BLTVER%%/demos/images/rain.gif lib/blt%%BLTVER%%/demos/images/sample.gif lib/blt%%BLTVER%%/demos/images/smblue_rock.gif lib/blt%%BLTVER%%/demos/images/stopsign.gif lib/blt%%BLTVER%%/demos/images/tan_paper.gif lib/blt%%BLTVER%%/demos/images/tan_paper2.gif lib/blt%%BLTVER%%/demos/images/txtrflag.gif lib/blt%%BLTVER%%/demos/scripts/barchart2.tcl lib/blt%%BLTVER%%/demos/scripts/bgtest.tcl lib/blt%%BLTVER%%/demos/scripts/clone.tcl lib/blt%%BLTVER%%/demos/scripts/demo.tcl lib/blt%%BLTVER%%/demos/scripts/globe.tcl lib/blt%%BLTVER%%/demos/scripts/graph1.tcl lib/blt%%BLTVER%%/demos/scripts/graph2.tcl lib/blt%%BLTVER%%/demos/scripts/graph3.tcl lib/blt%%BLTVER%%/demos/scripts/graph5.tcl lib/blt%%BLTVER%%/demos/scripts/graph8.tcl lib/blt%%BLTVER%%/demos/scripts/page.tcl lib/blt%%BLTVER%%/demos/scripts/patterns.tcl lib/blt%%BLTVER%%/demos/scripts/ps.tcl lib/blt%%BLTVER%%/demos/scripts/send.tcl lib/blt%%BLTVER%%/demos/scripts/stipples.tcl lib/blt%%BLTVER%%/demos/scripts/xcolors.tcl lib/blt%%BLTVER%%/demos/spline.tcl lib/blt%%BLTVER%%/demos/stripchart1.tcl lib/blt%%BLTVER%%/demos/tabnotebook1.tcl lib/blt%%BLTVER%%/demos/tabnotebook2.tcl lib/blt%%BLTVER%%/demos/tabnotebook3.tcl lib/blt%%BLTVER%%/demos/tabset1.tcl lib/blt%%BLTVER%%/demos/tabset2.tcl lib/blt%%BLTVER%%/demos/tabset3.tcl lib/blt%%BLTVER%%/demos/tabset4.tcl lib/blt%%BLTVER%%/demos/treeview1.tcl lib/blt%%BLTVER%%/demos/winop1.tcl lib/blt%%BLTVER%%/demos/winop2.tcl lib/blt%%BLTVER%%/dnd.tcl lib/blt%%BLTVER%%/dragdrop.tcl lib/blt%%BLTVER%%/graph.tcl lib/blt%%BLTVER%%/hierbox.tcl lib/blt%%BLTVER%%/init.tcl lib/blt%%BLTVER%%/pkgIndex.tcl lib/blt%%BLTVER%%/tabnotebook.tcl lib/blt%%BLTVER%%/tabset.tcl lib/blt%%BLTVER%%/tclIndex lib/blt%%BLTVER%%/treeview.tcl lib/blt%%BLTVER%%/treeview.xbm lib/blt%%BLTVER%%/treeview_m.xbm lib/blt%%BLTVER%%/tvutil.tcl man/man3/Blt_Tree.3.gz man/man3/Blt_TreeCreate.3.gz man/man3/Blt_TreeCreateNode.3.gz man/man3/Blt_TreeDeleteNode.3.gz man/man3/Blt_TreeExists.3.gz man/man3/Blt_TreeGetNode.3.gz man/man3/Blt_TreeGetToken.3.gz man/man3/Blt_TreeName.3.gz man/man3/Blt_TreeNodeId.3.gz man/man3/Blt_TreeReleaseToken.3.gz man/mann/BLT.n.gz man/mann/barchart.n.gz man/mann/beep.n.gz man/mann/bgexec.n.gz man/mann/bitmap.n.gz man/mann/bltdebug.n.gz man/mann/busy.n.gz man/mann/container.n.gz man/mann/cutbuffer.n.gz man/mann/dragdrop.n.gz man/mann/eps.n.gz man/mann/graph.n.gz man/mann/hierbox.n.gz man/mann/hiertable.n.gz man/mann/htext.n.gz man/mann/spline.n.gz man/mann/stripchart.n.gz man/mann/table.n.gz man/mann/tabset.n.gz man/mann/tile.n.gz man/mann/tree.n.gz man/mann/treeview.n.gz man/mann/vector.n.gz man/mann/watch.n.gz man/mann/winop.n.gz