diff options
| author | agc <agc> | 2010-07-04 07:06:23 +0000 |
|---|---|---|
| committer | agc <agc> | 2010-07-04 07:06:23 +0000 |
| commit | 2c2dd6294866939bbc7216371e898c870a8893d9 (patch) | |
| tree | 388af7db675f4eefbd61575c786172c35b8ef703 /editors | |
| parent | 17ba331ffe9c291e38258265cc85edfe5d8325cc (diff) | |
| download | pkgsrc-2c2dd6294866939bbc7216371e898c870a8893d9.tar.gz | |
Pullup previous changes on HEAD to pkgsrc-2010Q2 branch to fix branching
error, and to sync with reality.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/gnuserv/Makefile | 7 | ||||
| -rw-r--r-- | editors/gnuserv/distinfo | 3 | ||||
| -rw-r--r-- | editors/gnuserv/patches/patch-ab | 16 |
3 files changed, 23 insertions, 3 deletions
diff --git a/editors/gnuserv/Makefile b/editors/gnuserv/Makefile index dc0fb1d81a6..08e60260edb 100644 --- a/editors/gnuserv/Makefile +++ b/editors/gnuserv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2009/12/14 23:42:10 joerg Exp $ +# $NetBSD: Makefile,v 1.13.6.1 2010/07/04 07:12:07 agc Exp $ DISTNAME= gnuserv-3.12.7 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -12,14 +12,17 @@ COMMENT= Improved version of emacsserver for GNU Emacs CONFLICTS+= xemacs-[0-9]* +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= YES .include "../../x11/libXau/buildlink3.mk" EL_FILES= devices.el gnuserv.el gnuserv-compat.el post-install: + ${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX} cd ${WRKSRC} && for FILE in ${EL_FILES}; do \ - ${INSTALL_DATA} $${FILE} $${FILE}c ${EMACS_LISPPREFIX}; \ + ${INSTALL_DATA} $${FILE} $${FILE}c ${DESTDIR}${EMACS_LISPPREFIX}; \ done .if ${X11_TYPE} == "modular" diff --git a/editors/gnuserv/distinfo b/editors/gnuserv/distinfo index b50ca0e37f0..659cafb0e0f 100644 --- a/editors/gnuserv/distinfo +++ b/editors/gnuserv/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.3 2005/02/23 17:15:10 agc Exp $ +$NetBSD: distinfo,v 1.3.48.1 2010/07/04 07:12:07 agc Exp $ SHA1 (gnuserv-3.12.7.tar.gz) = 5f5fd98b068fd1b221d32a0760c9914455e197b5 RMD160 (gnuserv-3.12.7.tar.gz) = 2fd5a28fb86cc05c26da50cab8d9ee036f2e2d00 Size (gnuserv-3.12.7.tar.gz) = 93709 bytes SHA1 (patch-aa) = f10c267b84290265df2a757454b0548bf8383889 +SHA1 (patch-ab) = f96a239e3efa786e8af84a3e7b9421c00a573735 diff --git a/editors/gnuserv/patches/patch-ab b/editors/gnuserv/patches/patch-ab new file mode 100644 index 00000000000..9fcde1effed --- /dev/null +++ b/editors/gnuserv/patches/patch-ab @@ -0,0 +1,16 @@ +$NetBSD: patch-ab,v 1.1.2.2 2010/07/04 07:12:07 agc Exp $ + +DESTDIR support + +--- Makefile.in.orig 2004-10-20 01:20:54.000000000 +0000 ++++ Makefile.in +@@ -42,8 +42,8 @@ CFLAGS = @CFLAGS@ + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ + +-prefix = @prefix@ ++prefix = $(DESTDIR)@prefix@ + exec_prefix = @exec_prefix@ + + # The directory for installing executable programs that users can run. + bindir = $(exec_prefix)/bin |