diff options
Diffstat (limited to 'editors/xwpe/patches/patch-aa')
| -rw-r--r-- | editors/xwpe/patches/patch-aa | 76 |
1 files changed, 76 insertions, 0 deletions
diff --git a/editors/xwpe/patches/patch-aa b/editors/xwpe/patches/patch-aa new file mode 100644 index 00000000000..afc73732c01 --- /dev/null +++ b/editors/xwpe/patches/patch-aa @@ -0,0 +1,76 @@ +$NetBSD: patch-aa,v 1.1.1.1 2004/07/06 07:58:49 xtraeme Exp $ + +--- Makefile.in.orig 2003-10-30 02:15:04.000000000 +0100 ++++ Makefile.in 2003-10-30 02:21:43.000000000 +0100 +@@ -14,8 +14,7 @@ + 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 @@ + + xwpe: $(OFILES) $(X_OFILES) $(T_OFILES) + $(CC) $(CFLAGS) $(DEFS) $(OFILES) $(X_OFILES) $(T_OFILES) \ +- $(LIBS) $(XLIBS) -o xwpe ++ $(LIBS) -lncurses -lX11 -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 + + libxwpe-term.so: $(T_OFILES) + $(CC) -shared $(T_OFILES) -o libxwpe-term.so +@@ -115,36 +114,29 @@ + # 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 +- if test ! -d $(DESTDIR); then mkdir -p $(DESTDIR); fi +- if test ! -d $(XWPELIBDIR); then mkdir -p $(XWPELIBDIR); fi ++ if test ! -d $(DESTDIR); then ${BSD_INSTALL_DATA_DIR} $(DESTDIR); fi ++ if test ! -d $(XWPELIBDIR); then ${BSD_INSTALL_DATA_DIR} $(XWPELIBDIR); fi + rm -f $(DESTDIR)/wpe $(DESTDIR)/xwpe $(DESTDIR)/we $(DESTDIR)/xwe +- $(INSTALL) xwpe $(DESTDIR)/we +- chmod ugo+x $(DESTDIR)/we ++ ${BSD_INSTALL_PROGRAM} xwpe $(DESTDIR)/we + (cd $(DESTDIR) && $(LN_S) we xwe) + (cd $(DESTDIR) && $(LN_S) we xwpe) + (cd $(DESTDIR) && $(LN_S) we wpe) + rm -f $(XWPELIBDIR)/help.xwpe + if test ! -f $(XWPELIBDIR)/syntax_def; then \ +- $(INSTALL) syntax_def $(XWPELIBDIR)/syntax_def; \ +- chmod ugo=r $(XWPELIBDIR)/syntax_def; fi +- if test ! -d $(MANDIR)/man1; then mkdir -p $(MANDIR)/man1; fi ++ ${BSD_INSTALL_DATA} syntax_def $(XWPELIBDIR)/syntax_def; fi ++ if test ! -d $(MANDIR)/man1; then ${BSD_INSTALL_MAN_DIR} $(MANDIR)/man1; fi + rm -f $(MANDIR)/man1/xwpe.1 $(MANDIR)/man1/xwe.1 + rm -f $(MANDIR)/man1/wpe.1 $(MANDIR)/man1/we.1 +- $(INSTALL) xwe.1 wpe.1 we.1 $(MANDIR)/man1 +- chmod ugo=r $(MANDIR)/man1/xwe.1 +- chmod ugo=r $(MANDIR)/man1/wpe.1 $(MANDIR)/man1/we.1 ++ ${BSD_INSTALL_MAN} xwe.1 wpe.1 we.1 $(MANDIR)/man1 + if test -f libxwpe-x11.so; then \ +- $(INSTALL) libxwpe-x11.so $(XWPELIBDIR)/libxwpe-x11.so; fi ++ ${BSD_INSTALL_DATA} libxwpe-x11.so $(XWPELIBDIR)/libxwpe-x11.so; fi + if test -f libxwpe-term.so; then \ +- $(INSTALL) libxwpe-term.so $(XWPELIBDIR)/libxwpe-term.so; fi ++ ${BSD_INSTALL_DATA} libxwpe-term.so $(XWPELIBDIR)/libxwpe-term.so; fi + + install: install_fst +- $(INSTALL) help.xwpe_eng $(XWPELIBDIR)/help.xwpe +- chmod ugo=r $(XWPELIBDIR)/help.xwpe +- $(INSTALL) help.key_eng $(XWPELIBDIR)/help.key +- chmod ugo=r $(XWPELIBDIR)/help.key +- $(INSTALL) xwpe.1_eng $(MANDIR)/man1/xwpe.1 +- chmod ugo=r $(MANDIR)/man1/xwpe.1 ++ ${BSD_INSTALL_DATA} help.xwpe_eng $(XWPELIBDIR)/help.xwpe ++ ${BSD_INSTALL_DATA} help.key_eng $(XWPELIBDIR)/help.key ++ ${BSD_INSTALL_DATA} xwpe.1_eng $(MANDIR)/man1/xwpe.1 + + # German install uses old documention as no updated version is available + install_german: install_fst |