diff options
author | joerg <joerg@pkgsrc.org> | 2010-02-03 21:35:42 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2010-02-03 21:35:42 +0000 |
commit | cf552b4b71d83ae215a1d2ae3cc0100adb8dc505 (patch) | |
tree | 94fec91822701b1e732c767475cdeda021f9d18a | |
parent | dca39bc90fbe8d72c96caa9ab4ab5ae1427b279c (diff) | |
download | pkgsrc-cf552b4b71d83ae215a1d2ae3cc0100adb8dc505.tar.gz |
DESTDIR support
-rw-r--r-- | editors/xwpe/Makefile | 4 | ||||
-rw-r--r-- | editors/xwpe/distinfo | 4 | ||||
-rw-r--r-- | editors/xwpe/patches/patch-aa | 62 |
3 files changed, 42 insertions, 28 deletions
diff --git a/editors/xwpe/Makefile b/editors/xwpe/Makefile index 48a223e382a..93308548c7b 100644 --- a/editors/xwpe/Makefile +++ b/editors/xwpe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2007/01/30 23:09:50 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2010/02/03 21:35:42 joerg Exp $ # DISTNAME= xwpe-1.5.29a @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.identicalsoftware.com/xwpe/ COMMENT= Programming environment for UNIX systems +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_NCURSES= yes # tigetstr() diff --git a/editors/xwpe/distinfo b/editors/xwpe/distinfo index 60615bec42a..354da969bf6 100644 --- a/editors/xwpe/distinfo +++ b/editors/xwpe/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.4 2006/01/06 12:09:03 joerg Exp $ +$NetBSD: distinfo,v 1.5 2010/02/03 21:35:42 joerg Exp $ SHA1 (xwpe-1.5.29a.tar.gz) = 87b5045cff63225a310a0f4148bb04c46660c253 RMD160 (xwpe-1.5.29a.tar.gz) = da718bb9b14a26ea868f88a02233984c4d2943cd Size (xwpe-1.5.29a.tar.gz) = 307545 bytes -SHA1 (patch-aa) = ae0dabc0e22a651d0ea3c86b101efaa16468ee2c +SHA1 (patch-aa) = 1e2f1d13dc1f67f339b7c448b787f24e8d1926d9 SHA1 (patch-ab) = 23ec6cd425292e2fb58ef2c2dd0d6a62deb8214e diff --git a/editors/xwpe/patches/patch-aa b/editors/xwpe/patches/patch-aa index afc73732c01..ef4ac0b0d51 100644 --- a/editors/xwpe/patches/patch-aa +++ b/editors/xwpe/patches/patch-aa @@ -1,8 +1,14 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/07/06 07:58:49 xtraeme Exp $ +$NetBSD: patch-aa,v 1.2 2010/02/03 21:35:42 joerg 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 @@ +--- 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@ @@ -12,7 +18,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/07/06 07:58:49 xtraeme Exp $ DEFS=@DEFS@ -DLIBRARY_DIR=\"$(XWPELIBDIR)\" -DSELECTION INSTALL= cp LN_S= @LN_S@ -@@ -91,11 +90,11 @@ +@@ -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) \ @@ -26,40 +32,46 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/07/06 07:58:49 xtraeme Exp $ libxwpe-term.so: $(T_OFILES) $(CC) -shared $(T_OFILES) -o libxwpe-term.so -@@ -115,36 +114,29 @@ +@@ -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 -+ 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 +- 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 \ +- (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 +- 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 ++ ${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 $(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 $(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 @@ -68,9 +80,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/07/06 07:58:49 xtraeme Exp $ - 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 ++ ${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 |