kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

editors/xwpe: update to xwpe-1.5.30a.

Browse source 
# Changes (upstream)

1.5.30a
* Some additional comments
* Fedora compile fix

# Local Changes

* Fixed a couple of compile-time warnings.
* Fixed bug in error handling.
* Fixed a typo in header causing linker error on Linux.
* Honor package's own LIBS definition, while still passing LDFLAGS to
  properly set the runtime library path for X11 libs.
* Add missing LICENSE.
* Specify missing dependencies to allow the package to link against
  libICE/libSM.
* Add a post-install target to install .desktop file (borrowed from
  from AUR) and relevant pixmap (taken from the official site).
* Taking maintainership.
This commit is contained in:
vins 2022-12-08 08:51:55 +00:00
parent 2440bde963
commit a38c786ab2
10 changed files with 202 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
editors/xwpe/Makefile
View file

@ -1,14 +1,14 @@
# $NetBSD: Makefile,v 1.16 2017/01/04 11:31:59 roy Exp $
# $NetBSD: Makefile,v 1.17 2022/12/08 08:51:55 vins Exp $
#
DISTNAME= xwpe-1.5.29a
PKGREVISION= 6
DISTNAME= xwpe-1.5.30a
CATEGORIES= editors
MASTER_SITES= http://www.identicalsoftware.com/xwpe/
MAINTAINER= pkgsrc-users@NetBSD.org
MAINTAINER= vins@NetBSD.org
HOMEPAGE= http://www.identicalsoftware.com/xwpe/
COMMENT= Programming environment for UNIX systems
LICENSE= gnu-gpl-v2
GNU_CONFIGURE= yes
USE_TOOLS+= gmake
@ -19,7 +19,20 @@ BUILD_TARGET= # the one from the Makefile
BUILDLINK_DEPMETHOD.libXt?= build
INSTALLATION_DIRS+= share/applications
INSTALLATION_DIRS+= share/pixmaps
post-install:
# Run acme as a standalone application.
${INSTALL_DATA} ${FILESDIR}/xwpe.desktop \
${DESTDIR}${PREFIX}/share/applications
${INSTALL_DATA} ${FILESDIR}/xwpe.xpm \
${DESTDIR}${PREFIX}/share/pixmaps
.include "../../x11/libICE/buildlink3.mk"
.include "../../x11/libSM/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/curses.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

4
editors/xwpe/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:50:28 joerg Exp $
@comment $NetBSD: PLIST,v 1.4 2022/12/08 08:51:55 vins Exp $
bin/we
bin/wpe
bin/xwe
@ -10,3 +10,5 @@ man/man1/we.1
man/man1/wpe.1
man/man1/xwe.1
man/man1/xwpe.1
share/applications/xwpe.desktop
share/pixmaps/xwpe.xpm

15
editors/xwpe/distinfo
View file

@ -1,7 +1,10 @@
$NetBSD: distinfo,v 1.8 2021/10/26 10:21:44 nia Exp $
$NetBSD: distinfo,v 1.9 2022/12/08 08:51:55 vins Exp $
BLAKE2s (xwpe-1.5.29a.tar.gz) = 3adaa88af34e5ccd2cd4e4008eaec1da6fa35939adb50a8e72fccce9d3e73de6
SHA512 (xwpe-1.5.29a.tar.gz) = 4f8bdac60733702c3e34689a06f5876340e0b06d576dfaa0e3d1b977d88d85d55ae534757f7c76156148f1774e4b9b7c6caee105dd4c5b3559ed43a3ea60aae4
Size (xwpe-1.5.29a.tar.gz) = 307545 bytes
SHA1 (patch-aa) = 1e2f1d13dc1f67f339b7c448b787f24e8d1926d9
SHA1 (patch-ab) = 23ec6cd425292e2fb58ef2c2dd0d6a62deb8214e
BLAKE2s (xwpe-1.5.30a.tar.gz) = 5e33b6cb1880b38dbf551138e807b18a952d282a41411704ada6fabdb34680d4
SHA512 (xwpe-1.5.30a.tar.gz) = c5b182f798caeeaa7ba62bd3692690030623d317795d907e4fac3f524f53aa299af5d735d9b03185eaa07526f0146c4fa8d09efbbab6790f5e329fd52359b797
Size (xwpe-1.5.30a.tar.gz) = 325043 bytes
SHA1 (patch-aa) = cf7bc074e1dc8cda086dfe29ebfdca1c0f261c1d
SHA1 (patch-ab) = d2618c3656b8826019272537d251a66c867cba5d
SHA1 (patch-edit.h) = af55c26886af6447747f31b47f3af5f1a8726595
SHA1 (patch-we__main.c) = 5112e6ce7ab4c11afd230f4709fcf1c6ed702fc0
SHA1 (patch-we__xterm.c) = 5b63e0df612ffdff64838d1faf5b558d9179b3dc

18
editors/xwpe/files/xwpe.desktop Normal file
View file

@ -0,0 +1,18 @@
[Desktop Entry]
Version=1.0
Type=Application
Name=Xwpe
GenericName=Borland-like Text Editor
Comment=Xwpe Integrated Development Environment
Exec=xwpe
Keywords=text;editor;ide;borland;
Keywords[fr]=texte;éditeur;borland;
Categories=Utility;TextEditor;IDE;Development;
MimeType=text/plain;text/english;text/x-c;text/x-c++; text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-pascal;text/x-fortran;
Icon=xwpe
TryExec=xwpe
Exec=xwpe %F
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;IDE;Development;

84
editors/xwpe/files/xwpe.xpm Normal file
View file

@ -0,0 +1,84 @@
/* XPM */
static char * xwpe_w_xpm[] = {
"48 48 33 1",
" c None",
". c #C3C8D6",
"+ c #D1D9E4",
"@ c #DEE7EE",
"# c #ADADB1",
"$ c #E7F4F4",
"% c #9C99A7",
"& c #B6B8C9",
"* c #564C54",
"= c #565655",
"- c #7E7888",
"; c #030205",
"> c #645864",
", c #8F8996",
"' c #776882",
") c #2B1C41",
"! c #506978",
"~ c #437D8B",
"{ c #4A3876",
"] c #484A83",
"^ c #7C69E8",
"/ c #8A7CE3",
"( c #6148ED",
"_ c #6B57E3",
": c #290C44",
"< c #9D95E4",
"[ c #4623F9",
"} c #4636B6",
"| c #5537DE",
"1 c #401DE2",
"2 c #462699",
"3 c #2E223C",
"4 c #9085DC",
".+++@@@+#$$@%##############################%@&..",
"%%@@++$++@@+&*============================-@$.%;",
"#*#+.+++@$$@$.============================&++#*;",
"#=-+.+.&+@+@$@>=========================*,++#'=;",
"#=='.&#%.@@@@..);;;;;;#==;;;;;;;;;;;;;;;'&.&'==;",
"#===>&-',.$@&&+.!~~~~~#==;~~~~~~~~~~~~~%.+.,===;",
"#===)%-%#-,,#+$+-~~~~~#==;~~~~~~~~~~~~!+.+%#===;",
"#===;!%&&#,%@@@.%!~~~~#==;~~~##~~~~~~!.@+.!#===;",
"#===;~!....%.@++#%=~~~#==;~~##~~~~~~!.$$@!~#===;",
"#===;~!,#&&.&%,..-,!~~#==;~~##~~~~~~+$$@!~~#===;",
"#===;~~,'&++++%,-,&-!~#==;~~#~~~~~~!..@%!~~#===;",
"#===;~~~!>%.+&%%-'+.'~#==;~~~~~~~~!+@.&!~~~#===;",
"#===;~~~~'-#+++&,'-&+!#==;~~~~~~~!$$$&!~~~~#===;",
"#===;~~~~!--...&#&--.#%==;~~~~~~~.$$+!~~~~~#===;",
"#===;~~~~~!,,.%#.+.%#&,*=;~~~~~~'.@@#!~~~~~#===;",
"#*==;~~~~~~,&%&&#%##&,,>=;~~~~~-#&&#~~~~~~~#===;",
"-{{{;~~~~!]]^/%&&-((_^#^{:]]]]]_^<-!~!]]]]]'{{{:",
">[[[:~~~~}[[[/.#+%[[[_#([[[[[[[[[|=~~][[[[[[[[[1",
"=[[[:~~~=[[[[^+++/[[[-/|[[}}|([[[1]~~{[[[}}(2223",
">[[[:~~~}[[[[]!+&([[|#/[[[_!%@([[[]~!1[[]~~#===;",
"-[[[:~~]1[[[[]~!/[[[<.^[[[>'.$_[[[]~![[[]~~#===;",
",[[[:~~{[[[[[]~!([[(&._[[1!&%.([[1]~][[[]~~#===;",
",[[['#,1[[1[['#,1[|<@&|[[(#.%%[[[|%#}[[|>'''{{=;",
",[[[{=2[[{1[[{=2[[(++<[[[_&../[[[2==1[[[[[[[[2=;",
",[[[{*[[[*1[[{*[[[4@.^[[[|^/([[[1*={[[[111111{=;",
",[[[:)[[:;1[[:)[[1.+@|[[[[[[[[[[:;;:[[[::::'{==;",
",[[[)}[1!!1[[]}[[/$$+[[[[[[[[[[^!~~}[[[~~~~#===;",
"'[[[[[[]~!1[[1[[(++@4[[[_4##&&-'!~~}[[1~~~~#===;",
"-[[[[[2!#,1[[[[[4@.-}[[[4.+..&#''!][[[{~~~~#===;",
",[[[[[}##!1[[[[|#&'!}[[[%.+#%,--'%_[[[!~~~~#===;",
",[[[[[~##!1[[[[_%#-!}[[|%##>-%#,#*}[[[1111111==;",
",[[[[{~#~!1[[[[#.,~][[[{%%%>>%&&%-}[[[[[[[[[[==;",
",1[[1!~~~~{[[[_+-~~]1[[{*,,-#++..#([[[[[[[[[{==;",
"#===;~~~~~~!$$$%~~~~~~#=*%+,.@@.&+++,!~~~~~#===;",
"#===;~~~~~!&$@+!~~~~~~#==:&&#++&.++@@%!~~~~#===;",
"#===;~~~~!&+.&'~~~~~~~#==;!%#+++++@@@&#~~~~#===;",
"#===;~~~~,.@+!~~~~~~~~#*=;~,@@@@$+++++@!~~~#===;",
"#===;~~~!.@$&!~~~~~~~~#==;~!%++@+&&...@#!~~#===;",
"#===;~~!&@@+!~~~~~~~~~#==;~~!%&+@+.+++@+&!~#===;",
"#===;~!++$.!~~~~~~~~~~#==;~~~=@$$+@@$$$@@!~#===;",
"#===;~,.@+!~~~~~~~~~~~#==;~~~~,$$$$+.+$@+.!#===;",
"#===;-..+#!~~~~~~~~~~~#==;~~~~~,$@@.+++@+&&,===;",
"#===>&,',~~~~~~~~~~~~~#==;~~~~~!.@.&+@+&...,===;",
"#===+#-'%##############==#######%$+.@@++.+.,>==;",
"#==%&#,>=========================>@+$$$+..#%%>=;",
"#*#@++>==========================*%+$$$$@++&&%*;",
"%%@+@-=============================&$$$$@@@&&#,;",
"-$+.>;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;.+$@....+,&,"};

30
editors/xwpe/patches/patch-aa
View file

@ -1,8 +1,11 @@
$NetBSD: patch-aa,v 1.2 2010/02/03 21:35:42 joerg Exp $
$NetBSD: patch-aa,v 1.3 2022/12/08 08:51:56 vins Exp $
--- Makefile.in.orig 2002-06-05 02:53:50.000000000 +0000
* DESTDIR support.
* Properly honor runtime library path for X11 libs.
--- Makefile.in.orig 2005-07-07 01:53:09.000000000 +0000
+++ Makefile.in
@@ -9,13 +9,12 @@ srcdir= @srcdir@
@@ -9,7 +9,7 @@ srcdir= @srcdir@
#Destination Directory
prefix=@prefix@
exec_prefix=@exec_prefix@
@ -11,28 +14,25 @@ $NetBSD: patch-aa,v 1.2 2010/02/03 21:35:42 joerg Exp $
LIBDIR=@libdir@
XWPELIBDIR= $(LIBDIR)/xwpe
MANDIR=@mandir@
-LIBS=@LIBS@
-XLIBS=@X_LIBS@ @X_PRE_LIBS@ @X_EXTRA_LIBS@
+LIBS=${LDFLAGS}
DEFS=@DEFS@ -DLIBRARY_DIR=\"$(XWPELIBDIR)\" -DSELECTION
INSTALL= cp
LN_S= @LN_S@
@@ -91,11 +90,11 @@ HFILES= attrb.h edit.h keys.h \
@@ -91,14 +91,14 @@ HFILES= attrb.h edit.h keys.h \
xwpe: $(OFILES) $(X_OFILES) $(T_OFILES)
$(CC) $(CFLAGS) $(DEFS) $(OFILES) $(X_OFILES) $(T_OFILES) \
- $(LIBS) $(XLIBS) -o xwpe
+ $(LIBS) -lncurses -lX11 -o xwpe
+ $(LDFLAGS) $(LIBS) $(XLIBS) -o xwpe
# $(CC) -Wl,-E $(CFLAGS) $(DEFS) $(OFILES) $(LIBS) -o xwpe
libxwpe-x11.so: $(X_OFILES)
- $(CC) -shared $(X_OFILES) $(XLIBS) -o libxwpe-x11.so
+ $(CC) -shared $(X_OFILES) -lX11 -o libxwpe-x11.so
+ $(CC) -shared $(X_OFILES) $(LDFLAGS) $(XLIBS) -o libxwpe-x11.so
libxwpe-term.so: $(T_OFILES)
$(CC) -shared $(T_OFILES) -o libxwpe-term.so
@@ -115,36 +114,27 @@ distclean:
- $(CC) -shared $(T_OFILES) -o libxwpe-term.so
+ $(CC) -shared $(T_OFILES) $(LDFLAGS) -o libxwpe-term.so
#$(X_OFILES) $(T_OFILES): $(HFILES)
# $(CC) -fPIC $(CFLAGS) $(DEFS) -c $(subst .o,.c,$@)
@@ -115,36 +115,27 @@ distclean:
# Bug Note: Currently xwpe and xwe are installed even if X windows versions
# are not compiled. (They will function as wpe and we respectively.)
install_fst: xwpe

10
editors/xwpe/patches/patch-ab
View file

@ -1,13 +1,17 @@
$NetBSD: patch-ab,v 1.1 2006/01/04 21:43:44 joerg Exp $
$NetBSD: patch-ab,v 1.2 2022/12/08 08:51:56 vins Exp $
--- we_debug.c.orig 2006-01-04 21:40:11.000000000 +0000
Depend on [n]curses to provide prototypes for tparm and tgoto.
--- we_debug.c.orig 2005-07-07 01:53:09.000000000 +0000
+++ we_debug.c
@@ -52,8 +52,6 @@ extern BUFFER *e_p_w_buffer;
@@ -62,10 +62,6 @@ extern BUFFER *e_p_w_buffer;
extern char *att_no;
extern char *e_tmp_dir;
-#ifdef NOTPARM
-char *tparm();
-char *tgoto();
-#endif
#ifdef DEFTPUTS
int tputs();
#endif

15
editors/xwpe/patches/patch-edit.h Normal file
View file

@ -0,0 +1,15 @@
$NetBSD: patch-edit.h,v 1.1 2022/12/08 08:51:56 vins Exp $
Fix typo in int declaration.
--- edit.h.orig 2005-07-07 01:53:09.000000000 +0000
+++ edit.h
@@ -794,7 +794,7 @@ int e_d_reinit_watches(FENSTER *f,char *
/* we_gpm.c */
#ifdef HAVE_LIBGPM
int WpeGpmInit(void);
-int WpeGpmMouse(int *g);
+int WpeGpmMouseInit(void);
#endif
/* WeLinux.c */

19
editors/xwpe/patches/patch-we__main.c Normal file
View file

@ -0,0 +1,19 @@
$NetBSD: patch-we__main.c,v 1.1 2022/12/08 08:51:56 vins Exp $
Repair bug in error message when immediately running out of memory.
--- we_main.c.orig 2005-07-07 01:53:09.000000000 +0000
+++ we_main.c
@@ -307,8 +307,10 @@ int main(int argc, char **argv)
int so = 0, sd = 1;
char *tp;
- if ((cn = (ECNT *)MALLOC(sizeof(ECNT))) == NULL)
- e_error(e_msg[ERR_LOWMEM], 2, fb);
+ if ((cn = (ECNT *)MALLOC(sizeof(ECNT))) == NULL) {
+ printf(" Fatal Error: %s\n", e_msg[ERR_LOWMEM]);
+ return 0;
+ }
ECNT_Init(cn);
e_ini_unix(&argc, argv);
e_switch_screen(1);

15
editors/xwpe/patches/patch-we__xterm.c Normal file
View file

@ -0,0 +1,15 @@
$NetBSD: patch-we__xterm.c,v 1.1 2022/12/08 08:51:56 vins Exp $
Fix warning about incompatible pointer type.
--- we_xterm.c.orig 2005-07-07 01:53:09.000000000 +0000
+++ we_xterm.c
@@ -95,7 +95,7 @@ int WpeDllInit(int *argc, char **argv)
e_u_ini_size = e_ini_size;
e_u_setlastpic = e_setlastpic;
WpeMouseChangeShape = (void (*)(WpeMouseShape))WpeNullFunction;
- WpeMouseRestoreShape = (void (*)(WpeMouseShape))WpeNullFunction;
+ WpeMouseRestoreShape = WpeNullFunction;
/* WpeMouseChangeShape = WpeXMouseChangeShape;
WpeMouseRestoreShape = WpeXMouseRestoreShape;*/
WpeDisplayEnd = WpeNullFunction;