diff options
| author | obache <obache@pkgsrc.org> | 2007-12-20 15:11:06 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2007-12-20 15:11:06 +0000 |
| commit | abbc70d1c3e175baf4998eb92179ef7474f4b789 (patch) | |
| tree | 5c4622d676fd5d6ea1a1fb841bc7029127fb0b7f | |
| parent | ca65197cab07a86f8c20d3e147009aa9dc3f4c26 (diff) | |
| download | pkgsrc-abbc70d1c3e175baf4998eb92179ef7474f4b789.tar.gz | |
Fix possibility of installation problem.
While here, add DESTDIR support.
| -rw-r--r-- | net/ftplibpp/Makefile | 6 | ||||
| -rw-r--r-- | net/ftplibpp/distinfo | 4 | ||||
| -rw-r--r-- | net/ftplibpp/patches/patch-aa | 12 |
3 files changed, 12 insertions, 10 deletions
diff --git a/net/ftplibpp/Makefile b/net/ftplibpp/Makefile index df0fa5f519b..89198fb5262 100644 --- a/net/ftplibpp/Makefile +++ b/net/ftplibpp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2007/12/20 14:54:48 obache Exp $ +# $NetBSD: Makefile,v 1.8 2007/12/20 15:11:06 obache Exp $ # DISTNAME= ftplibpp-1.0.1 @@ -14,7 +14,9 @@ USE_TOOLS+= gmake INSTALLATION_DIRS= include lib share/doc/ftplibpp +PKG_DESTDIR_SUPPORT= user-destdir + post-install: - ${INSTALL_DATA} ${WRKSRC}/ftplibpp.html ${PREFIX}/share/doc/ftplibpp + ${INSTALL_DATA} ${WRKSRC}/ftplibpp.html ${DESTDIR}${PREFIX}/share/doc/ftplibpp .include "../../mk/bsd.pkg.mk" diff --git a/net/ftplibpp/distinfo b/net/ftplibpp/distinfo index 3ba0edeebcc..1463b9bb2dc 100644 --- a/net/ftplibpp/distinfo +++ b/net/ftplibpp/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 12:13:46 agc Exp $ +$NetBSD: distinfo,v 1.3 2007/12/20 15:11:06 obache Exp $ SHA1 (ftplibpp-1.0.1.tar.gz) = 51bfa48cf54efd23becdc83eb0f5d16f3e7bec21 RMD160 (ftplibpp-1.0.1.tar.gz) = 6ea80510ba4aace8cf73474ab2bcb9373d799070 Size (ftplibpp-1.0.1.tar.gz) = 26688 bytes -SHA1 (patch-aa) = cee3f7f31cf7d429249fcb80bf57966339fab0c2 +SHA1 (patch-aa) = d4b1d2a39fe2a157a671eeb012a2f5a6f77f39c0 diff --git a/net/ftplibpp/patches/patch-aa b/net/ftplibpp/patches/patch-aa index c9c80c1a6dd..de29f9b5ade 100644 --- a/net/ftplibpp/patches/patch-aa +++ b/net/ftplibpp/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/09/06 16:27:03 cjep Exp $ +$NetBSD: patch-aa,v 1.2 2007/12/20 15:11:06 obache Exp $ ---- Makefile.orig 2003-08-12 02:34:35.000000000 +0100 +--- Makefile.orig 2003-08-12 01:34:35.000000000 +0000 +++ Makefile @@ -3,6 +3,8 @@ SONAME = 1 @@ -24,13 +24,13 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/09/06 16:27:03 cjep Exp $ - install -m 644 libftp.so.$(SOVERSION) /usr/local/lib - install -m 644 ftplib.h /usr/local/include - (cd /usr/local/lib && \ -+ install -m 644 libftp.so.$(SOVERSION) ${PREFIX}/lib -+ install -m 644 ftplib.h ${PREFIX}/include -+ (cd ${PREFIX}/lib && \ ++ ${BSD_INSTALL_LIB} libftp.so.$(SOVERSION) ${DESTDIR}${PREFIX}/lib ++ ${BSD_INSTALL_DATA} ftplib.h ${DESTDIR}${PREFIX}/include ++ (cd ${DESTDIR}${PREFIX}/lib && \ ln -sf libftp.so.$(SOVERSION) libftp.so.$(SONAME) && \ ln -sf libftp.so.$(SONAME) libftp.so) -# -(cd /usr/local/bin && \ -+# -(cd ${PREFIX}/bin && \ ++# -(cd ${DESTDIR}${PREFIX}/bin && \ # for f in ftpdir ftpget ftplist ftprm ftpsend; \ # do ln -s qftp $$f; done) |