[BACK]Return to patch-aa CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / editors / xwpe / patches

File: [cvs.NetBSD.org] / pkgsrc / editors / xwpe / patches / patch-aa (download)

Revision 1.2, Wed Feb 3 21:35:42 2010 UTC (11 years, 10 months ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2021Q3-base, pkgsrc-2021Q3, pkgsrc-2021Q2-base, pkgsrc-2021Q2, pkgsrc-2021Q1-base, pkgsrc-2021Q1, pkgsrc-2020Q4-base, pkgsrc-2020Q4, pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, pkgsrc-2015Q4-base, pkgsrc-2015Q4, pkgsrc-2015Q3-base, pkgsrc-2015Q3, pkgsrc-2015Q2-base, pkgsrc-2015Q2, pkgsrc-2015Q1-base, pkgsrc-2015Q1, pkgsrc-2014Q4-base, pkgsrc-2014Q4, pkgsrc-2014Q3-base, pkgsrc-2014Q3, pkgsrc-2014Q2-base, pkgsrc-2014Q2, pkgsrc-2014Q1-base, pkgsrc-2014Q1, pkgsrc-2013Q4-base, pkgsrc-2013Q4, pkgsrc-2013Q3-base, pkgsrc-2013Q3, pkgsrc-2013Q2-base, pkgsrc-2013Q2, pkgsrc-2013Q1-base, pkgsrc-2013Q1, pkgsrc-2012Q4-base, pkgsrc-2012Q4, pkgsrc-2012Q3-base, pkgsrc-2012Q3, pkgsrc-2012Q2-base, pkgsrc-2012Q2, pkgsrc-2012Q1-base, pkgsrc-2012Q1, pkgsrc-2011Q4-base, pkgsrc-2011Q4, pkgsrc-2011Q3-base, pkgsrc-2011Q3, pkgsrc-2011Q2-base, pkgsrc-2011Q2, pkgsrc-2011Q1-base, pkgsrc-2011Q1, pkgsrc-2010Q4-base, pkgsrc-2010Q4, pkgsrc-2010Q3-base, pkgsrc-2010Q3, pkgsrc-2010Q2-base, pkgsrc-2010Q2, pkgsrc-2010Q1-base, pkgsrc-2010Q1, HEAD
Changes since 1.1: +36 -24 lines

DESTDIR support

$NetBSD: patch-aa,v 1.2 2010/02/03 21:35:42 joerg Exp $

--- Makefile.in.orig	2002-06-05 02:53:50.000000000 +0000
+++ Makefile.in
@@ -9,13 +9,12 @@ srcdir=		@srcdir@
 #Destination Directory
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-DESTDIR=@bindir@
+BINDIR=@bindir@
 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 \
 
 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,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
-	if test ! -d $(DESTDIR); then mkdir -p $(DESTDIR); fi
-	if test ! -d $(XWPELIBDIR); then mkdir -p $(XWPELIBDIR); fi
-	rm -f $(DESTDIR)/wpe $(DESTDIR)/xwpe $(DESTDIR)/we $(DESTDIR)/xwe
-	$(INSTALL) xwpe $(DESTDIR)/we
-	chmod ugo+x $(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
-	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_DATA_DIR} ${DESTDIR}$(BINDIR)
+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(XWPELIBDIR)
+	rm -f ${DESTDIR}$(BINDIR)/wpe ${DESTDIR}$(BINDIR)/xwpe ${DESTDIR}$(BINDIR)/we ${DESTDIR}$(BINDIR)/xwe
+	${BSD_INSTALL_PROGRAM} xwpe ${DESTDIR}$(BINDIR)/we
+	(cd ${DESTDIR}$(BINDIR) && $(LN_S) we xwe)
+	(cd ${DESTDIR}$(BINDIR) && $(LN_S) we xwpe)
+	(cd ${DESTDIR}$(BINDIR) && $(LN_S) we wpe)
+	rm -f ${DESTDIR}$(XWPELIBDIR)/help.xwpe
+	if test ! -f ${DESTDIR}$(XWPELIBDIR)/syntax_def; then  \
+	  ${BSD_INSTALL_DATA} syntax_def ${DESTDIR}$(XWPELIBDIR)/syntax_def; fi
+	${BSD_INSTALL_MAN_DIR} ${DESTDIR}$(MANDIR)/man1
+	${BSD_INSTALL_MAN} xwe.1 wpe.1 we.1 ${DESTDIR}$(MANDIR)/man1
 	if test -f libxwpe-x11.so; then \
-	  $(INSTALL) libxwpe-x11.so $(XWPELIBDIR)/libxwpe-x11.so; fi
+	  ${BSD_INSTALL_DATA} libxwpe-x11.so ${DESTDIR}$(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 ${DESTDIR}$(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 ${DESTDIR}$(XWPELIBDIR)/help.xwpe
+	${BSD_INSTALL_DATA} help.key_eng ${DESTDIR}$(XWPELIBDIR)/help.key
+	${BSD_INSTALL_DATA} xwpe.1_eng ${DESTDIR}$(MANDIR)/man1/xwpe.1
 
 # German install uses old documention as no updated version is available
 install_german:	install_fst