diff options
author | wiz <wiz@pkgsrc.org> | 2015-10-14 20:17:24 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2015-10-14 20:17:24 +0000 |
commit | 290b47c25a999a52f9ed37d876514732ed4b57d7 (patch) | |
tree | b62ce193139a28ca45bd0bf8ee8790b2683f16db /graphics/xfig | |
parent | 118e6b2bd6bde9db2382b4d4ef63bb866b781b22 (diff) | |
download | pkgsrc-290b47c25a999a52f9ed37d876514732ed4b57d7.tar.gz |
Switch from x11/Xaw3d to newer x11/libXaw3d.
Adapt some packages so they build with that.
Bump their PKGREVISIONs.
Diffstat (limited to 'graphics/xfig')
-rw-r--r-- | graphics/xfig/Makefile | 10 | ||||
-rw-r--r-- | graphics/xfig/distinfo | 5 | ||||
-rw-r--r-- | graphics/xfig/patches/patch-ab | 21 | ||||
-rw-r--r-- | graphics/xfig/patches/patch-e__edit.c | 15 |
4 files changed, 44 insertions, 7 deletions
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile index 349e9cadedf..d333e082a5c 100644 --- a/graphics/xfig/Makefile +++ b/graphics/xfig/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.70 2015/07/04 16:18:36 joerg Exp $ +# $NetBSD: Makefile,v 1.71 2015/10/14 20:17:26 wiz Exp $ DISTNAME= xfig.3.2.5b.full PKGNAME= xfig-3.2.5b -PKGREVISION= 10 +PKGREVISION= 11 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mcj/} @@ -40,6 +40,12 @@ SUBST_FILES.xaw= Imakefile .if defined(XAW_TYPE) && ${XAW_TYPE} == "3d" # define XAW3D and XAW3D1_5E SUBST_SED.xaw+= -e 's/.*\(\#define.XAW3D\)/\1/' +# does not directly support Xaw3d +.PHONY: buildlink-Xaw3d-inc-hack +pre-configure: buildlink-Xaw3d-inc-hack + +buildlink-Xaw3d-inc-hack: buildlink-directories + cd ${BUILDLINK_DIR}/include/X11 && ln -s Xaw3d Xaw .elif defined(XAW_TYPE) && ${XAW_TYPE} == "xpm" # define XAW3D, undef XAW3D1_5E SUBST_SED.xaw+= -e 's/.*\(\#define.XAW3D1_5E\)/XCOMM \1/' diff --git a/graphics/xfig/distinfo b/graphics/xfig/distinfo index f30fb11688b..9b48dc08112 100644 --- a/graphics/xfig/distinfo +++ b/graphics/xfig/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.26 2012/12/24 21:12:36 joerg Exp $ +$NetBSD: distinfo,v 1.27 2015/10/14 20:17:26 wiz Exp $ SHA1 (xfig.3.2.5b.full.tar.gz) = 0730d7e6bc217c0de02682efb0078821512bb542 RMD160 (xfig.3.2.5b.full.tar.gz) = aad4cfd808c116d34218e9890a898652e4f52ab6 Size (xfig.3.2.5b.full.tar.gz) = 5821049 bytes SHA1 (patch-aa) = c931f4735f7502cc9d7c116378dcd3b420a40c6f -SHA1 (patch-ab) = e3c240cc325804ec466e7ef77754791b18fd4338 +SHA1 (patch-ab) = 549f3795923e984988684f2ba29cafb437d9f83d SHA1 (patch-ac) = b43b811dce9aa3cdb5d18dc7c403a4a2e503fd44 SHA1 (patch-ad) = fc686b6509ff45f6aa8ba235b95eb85e1dbead88 SHA1 (patch-ae) = 8bb5d1c01faae34a6ad2cd1eaddf794cbf39a02e @@ -19,6 +19,7 @@ SHA1 (patch-ap) = 84a453de2badd82eb31d950981f086e48310d66f SHA1 (patch-aq) = 83c15caff521ab857b0a2744590cbd17f678c107 SHA1 (patch-d__text.c) = f57cb3c7d0b68a9d27e87538db17ae106acb0ba5 SHA1 (patch-d__text.h) = 3816e30a21c5c4dfd41a8e43d785babc2c8c7789 +SHA1 (patch-e__edit.c) = 9c3630139f3002a3ea65528e44a3af81af35093f SHA1 (patch-w__export.c) = 2787cb59a692d5e435249fea21d6978877db7ea7 SHA1 (patch-w__print.c) = 1856279ad76a2e71ea896a66d874a0b72330acd0 SHA1 (patch-w__util.c) = 35f2cfe73697c0b6005e3a8c3e46b44b2ed8f721 diff --git a/graphics/xfig/patches/patch-ab b/graphics/xfig/patches/patch-ab index 551f161db75..ebcdddf8cad 100644 --- a/graphics/xfig/patches/patch-ab +++ b/graphics/xfig/patches/patch-ab @@ -1,8 +1,14 @@ -$NetBSD: patch-ab,v 1.14 2011/02/17 08:46:50 markd Exp $ +$NetBSD: patch-ab,v 1.15 2015/10/14 20:17:26 wiz Exp $ ---- Imakefile.orig 2009-03-30 17:53:05.000000000 +0200 +--- Imakefile.orig 2009-03-30 15:53:05.000000000 +0000 +++ Imakefile -@@ -65,18 +65,21 @@ XCOMM #define XAW3D1_5E +@@ -60,23 +60,26 @@ XCOMM Uncomment the following if you hav + 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 #else @@ -56,6 +62,15 @@ $NetBSD: patch-ab,v 1.14 2011/02/17 08:46:50 markd Exp $ #endif XCOMM Uncomment the following definiton if you want to use the small icons +@@ -150,7 +153,7 @@ XCOMM Comment out the next line if you h + XCOMM If your setlocale() doesn't support the locale, you should + XCOMM add -DSETLOCALE to I18N_DEFS. + +-XCOMM #define I18N ++#define I18N + + XCOMM If using an input tablet uncomment the following + @@ -161,7 +164,7 @@ XCOMM uncomment the following line if yo XCOMM inline functions. With the "INLINE" keyword, you should notice that XCOMM the display will be a bit faster in complex figures diff --git a/graphics/xfig/patches/patch-e__edit.c b/graphics/xfig/patches/patch-e__edit.c new file mode 100644 index 00000000000..9d89403fe26 --- /dev/null +++ b/graphics/xfig/patches/patch-e__edit.c @@ -0,0 +1,15 @@ +$NetBSD: patch-e__edit.c,v 1.1 2015/10/14 20:17:26 wiz Exp $ + +--- e_edit.c.orig 2007-04-04 16:18:32.000000000 +0000 ++++ e_edit.c +@@ -4247,10 +4247,6 @@ str_panel(char *string, char *name, Widg + NextArg(XtNbottom, XtChainBottom); + NextArg(XtNleft, XtChainLeft); + NextArg(XtNright, XtChainRight); +-#ifdef I18N +- if (!appres.international || !international) +- NextArg(XtNinternational, False); +-#endif /* I18N */ + *pi_x = XtCreateManagedWidget(textname, asciiTextWidgetClass, form, Args, ArgCount); + + /* make CR do nothing for now */ |