diff options
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/xfm/Makefile | 14 | ||||
| -rw-r--r-- | sysutils/xfm/distinfo | 5 | ||||
| -rw-r--r-- | sysutils/xfm/patches/patch-ab | 11 | ||||
| -rw-r--r-- | sysutils/xfm/patches/patch-src_TextField.c | 28 |
4 files changed, 47 insertions, 11 deletions
diff --git a/sysutils/xfm/Makefile b/sysutils/xfm/Makefile index 7a1c8735798..04eeb620b59 100644 --- a/sysutils/xfm/Makefile +++ b/sysutils/xfm/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2012/10/23 19:51:38 asau Exp $ +# $NetBSD: Makefile,v 1.19 2015/10/14 20:17:28 wiz Exp $ DISTNAME= xfm-1.4.3 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= sysutils x11 MASTER_SITES= http://www.musikwissenschaft.uni-mainz.de/~ag/xfm/ @@ -12,9 +12,15 @@ LICENSE= gnu-gpl-v2 BUILD_TARGET+= all xfm.install.script Xfm.ad -WRKSRC= ${WRKDIR}/xfm-1.4.3 USE_IMAKE= YES +# does not directly support Xaw3d +.PHONY: buildlink-Xaw3d-inc-hack +pre-configure: buildlink-Xaw3d-inc-hack -.include "../../x11/Xaw3d/buildlink3.mk" +buildlink-Xaw3d-inc-hack: buildlink-directories + cd ${BUILDLINK_DIR}/include/X11 && ln -s Xaw3d Xaw +#BUILDLINK_TRANSFORM+= l:Xaw:Xaw3d + +.include "../../x11/libXaw3d/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xfm/distinfo b/sysutils/xfm/distinfo index 0933b716390..d5313592cdb 100644 --- a/sysutils/xfm/distinfo +++ b/sysutils/xfm/distinfo @@ -1,12 +1,13 @@ -$NetBSD: distinfo,v 1.6 2013/10/20 17:52:57 joerg Exp $ +$NetBSD: distinfo,v 1.7 2015/10/14 20:17:28 wiz Exp $ SHA1 (xfm-1.4.3.tar.gz) = 8d6235bb63e04491cc99603144b52884866b39e2 RMD160 (xfm-1.4.3.tar.gz) = b06c562b467e5085e5ecdd4273b64d554415ce69 Size (xfm-1.4.3.tar.gz) = 420962 bytes SHA1 (patch-aa) = 24ce4e78b18356db98ed2588f8da48380e1efd20 -SHA1 (patch-ab) = cd16fe1b8f0d2fb0c4c7846c81b0f5e0bfc4137c +SHA1 (patch-ab) = b8c1cff37974fee67272e1f7befe345654ceb819 SHA1 (patch-ac) = 40a32177cc5b64a49a51ea9c77062bfdc77da75d SHA1 (patch-ad) = 64709ecb67e91d8677545a7af54fa205079a77fd SHA1 (patch-ae) = 9e2a79a0a7becdca8bcdb30da457ef7b25ccd22d SHA1 (patch-af) = 075d38b00064ef6a853e62268e07a0432b1a7710 SHA1 (patch-ag) = 5c825371254e0056c5b932901bacc5599dd514d2 +SHA1 (patch-src_TextField.c) = 440ce47a2ba5e8cc2b6a70a5f487da84307df8ab diff --git a/sysutils/xfm/patches/patch-ab b/sysutils/xfm/patches/patch-ab index 5e7bfb8173f..d0db1dba764 100644 --- a/sysutils/xfm/patches/patch-ab +++ b/sysutils/xfm/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2006/03/29 22:39:49 joerg Exp $ +$NetBSD: patch-ab,v 1.3 2015/10/14 20:17:28 wiz Exp $ ---- src/Fm.h.orig Tue Aug 1 09:09:35 2000 -+++ src/Fm.h Tue Aug 1 09:16:04 2000 -@@ -19,10 +19,14 @@ +--- src/Fm.h.orig 2001-09-03 03:15:28.000000000 +0000 ++++ src/Fm.h +@@ -19,11 +19,15 @@ #include <malloc.h> #endif @@ -13,7 +13,8 @@ $NetBSD: patch-ab,v 1.2 2006/03/29 22:39:49 joerg Exp $ #pragma alloca #else #include <alloca.h> -+#endif #endif ++#endif #include <stdio.h> + #include <sys/types.h> /* just in case */ diff --git a/sysutils/xfm/patches/patch-src_TextField.c b/sysutils/xfm/patches/patch-src_TextField.c new file mode 100644 index 00000000000..8db9accfe34 --- /dev/null +++ b/sysutils/xfm/patches/patch-src_TextField.c @@ -0,0 +1,28 @@ +$NetBSD: patch-src_TextField.c,v 1.1 2015/10/14 20:17:28 wiz Exp $ + +--- src/TextField.c.orig 2000-04-04 15:05:36.000000000 +0000 ++++ src/TextField.c +@@ -705,11 +705,6 @@ TextFieldClassRec textFieldClassRec = { + { /* simple fields */ + /* change_sensitive */ XtInheritChangeSensitive + }, +-#ifdef XAW3D +- { /* ThreeD class fields */ +- /* shadowdraw */ (void(*)())TfwDrawShadows +- }, +-#endif + { /* textField fields */ + /* empty */ 0 + } +@@ -2315,11 +2310,6 @@ ReDisplay(tfw,False); + if (TF.label) + DrawLabel(tfw,False); + +-#ifdef XAW3D +- (*((TextFieldWidgetClass)(XtClass((Widget)tfw)))->threeD_class.shadowdraw)(w,ev,reg, +- (Boolean)(! (tfw->core.sensitive && !TF.readonly))); +-#endif +- + } + + #ifdef XAW3D |