diff options
| -rw-r--r-- | lang/erlang-doc/Makefile | 12 | ||||
| -rw-r--r-- | lang/erlang-man/Makefile | 6 | ||||
| -rw-r--r-- | lang/erlang/Makefile | 12 | ||||
| -rw-r--r-- | lang/erlang/distinfo | 3 | ||||
| -rw-r--r-- | lang/erlang/patches/patch-af | 14 |
5 files changed, 34 insertions, 13 deletions
diff --git a/lang/erlang-doc/Makefile b/lang/erlang-doc/Makefile index 815ff344c05..c99f6dfc978 100644 --- a/lang/erlang-doc/Makefile +++ b/lang/erlang-doc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/01/04 14:05:06 ghen Exp $ +# $NetBSD: Makefile,v 1.4 2008/01/04 14:10:06 ghen Exp $ DISTNAME= otp_doc_html_${DIST_VERSION_MAJOR}-${DIST_VERSION_MINOR} PKGNAME= erlang-doc-${ERLANG_VERSION} @@ -14,16 +14,18 @@ DIST_SUBDIR= erlang # needs erlang installed for its directory structure DEPENDS+= erlang-${ERLANG_VERSION}{,nb*}:../../lang/erlang +PKG_DESTDIR_SUPPORT= user-destdir + NO_CONFIGURE= yes NO_BUILD= yes # these files are already installed by ../../lang/erlang: -DUPLICATE_FILES= lib/cosEvent-${VERSION.cosEvent:Q}/info -DUPLICATE_FILES+= lib/cosEventDomain-${VERSION.cosEventDomain:Q}/info -DUPLICATE_FILES+= lib/mnesia_session-${VERSION.mnesia_session:Q}/info +DUPLICATE_FILES= lib/cosEvent-${VERSION.cosEvent}/info +DUPLICATE_FILES+= lib/cosEventDomain-${VERSION.cosEventDomain}/info +DUPLICATE_FILES+= lib/mnesia_session-${VERSION.mnesia_session}/info do-install: - cd ${WRKDIR} && ${PAX} ${DUPLICATE_FILES:=-s,%,,} -rw doc erts-${VERSION.erts:Q} lib ${PREFIX:Q}/lib/erlang/ + cd ${WRKDIR} && pax ${DUPLICATE_FILES:=-s,%,,} -rw doc erts-${VERSION.erts} lib ${DESTDIR}${PREFIX}/lib/erlang/ .include "../../lang/erlang/Makefile.versions" diff --git a/lang/erlang-man/Makefile b/lang/erlang-man/Makefile index 27c20f2d916..c458a53bd7b 100644 --- a/lang/erlang-man/Makefile +++ b/lang/erlang-man/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/01/04 14:05:06 ghen Exp $ +# $NetBSD: Makefile,v 1.4 2008/01/04 14:10:06 ghen Exp $ DISTNAME= otp_doc_man_${DIST_VERSION_MAJOR}-${DIST_VERSION_MINOR} PKGNAME= erlang-man-${ERLANG_VERSION} @@ -14,11 +14,13 @@ DIST_SUBDIR= erlang # needs erlang installed for its directory structure DEPENDS+= erlang-${ERLANG_VERSION}{,nb*}:../../lang/erlang +PKG_DESTDIR_SUPPORT= user-destdir + NO_CONFIGURE= yes NO_BUILD= yes do-install: - cd ${WRKDIR} && ${PAX} -rw man ${PREFIX:Q}/lib/erlang/ + cd ${WRKDIR} && pax -rw man ${DESTDIR}${PREFIX}/lib/erlang/ .include "../../lang/erlang/Makefile.versions" diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index ad80d16c595..c55ecac88ec 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2008/01/04 14:05:05 ghen Exp $ +# $NetBSD: Makefile,v 1.35 2008/01/04 14:10:05 ghen Exp $ DISTNAME= otp_src_${DIST_VERSION_MAJOR}-${DIST_VERSION_MINOR} PKGNAME= erlang-${ERLANG_VERSION} @@ -11,6 +11,8 @@ COMMENT= Concurrent functional programming language DIST_SUBDIR= erlang +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= yes OVERRIDE_DIRDEPTH= 4 USE_TOOLS+= gmake perl:run @@ -38,10 +40,10 @@ PLIST_SRC+= PLIST.common_end .include "Makefile.versions" post-install: - chmod -R go-w ${PREFIX}/lib/erlang/lib/kernel-${VERSION.kernel}/examples - chmod -R go-w ${PREFIX}/lib/erlang/lib/ssl-${VERSION.ssl}/examples - rm ${PREFIX}/lib/erlang/lib/observer-${VERSION.observer}/priv/bin/*.bat - rm ${PREFIX}/lib/erlang/lib/webtool-${VERSION.webtool}/priv/bin/*.bat + chmod -R go-w ${DESTDIR}${PREFIX}/lib/erlang/lib/kernel-${VERSION.kernel}/examples + chmod -R go-w ${DESTDIR}${PREFIX}/lib/erlang/lib/ssl-${VERSION.ssl}/examples + rm ${DESTDIR}${PREFIX}/lib/erlang/lib/observer-${VERSION.observer}/priv/bin/*.bat + rm ${DESTDIR}${PREFIX}/lib/erlang/lib/webtool-${VERSION.webtool}/priv/bin/*.bat .include "../../security/openssl/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo index dc15170cf9a..08ff83a2933 100644 --- a/lang/erlang/distinfo +++ b/lang/erlang/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2008/01/04 14:05:05 ghen Exp $ +$NetBSD: distinfo,v 1.14 2008/01/04 14:10:05 ghen Exp $ SHA1 (erlang/otp_src_R12B-0.tar.gz) = e2c6e18d22e34a799fc6bc25fa2d25eedb30bccc RMD160 (erlang/otp_src_R12B-0.tar.gz) = cb07ea37f2b56e1ea2fc07c9063b647df7635b2b @@ -6,3 +6,4 @@ Size (erlang/otp_src_R12B-0.tar.gz) = 41074760 bytes SHA1 (patch-aa) = 795bca5194b365ddaff8b10d46246423d44f7bda SHA1 (patch-ab) = 1bf4d079f0138d97b0a86a8d75e87fce14586c49 SHA1 (patch-ae) = fba8ebcba12fae810f1c554b678f0b434e364833 +SHA1 (patch-af) = 182b8c1555fc424bbb4fdc44bbb1ac22ba5641f0 diff --git a/lang/erlang/patches/patch-af b/lang/erlang/patches/patch-af new file mode 100644 index 00000000000..9942982a9a5 --- /dev/null +++ b/lang/erlang/patches/patch-af @@ -0,0 +1,14 @@ +$NetBSD: patch-af,v 1.1 2008/01/04 14:10:06 ghen Exp $ + +DESTDIR support. + +--- Makefile.in.orig 2007-11-26 19:57:49.000000000 +0100 ++++ Makefile.in +@@ -51,6 +51,7 @@ exec_prefix = @exec_prefix@ + # rpms. + #INSTALL_PREFIX = + # Naah...override `prefix' instead. ++INSTALL_PREFIX=${DESTDIR} + + # The directory in which user executables (ERL_BASE_PUB_FILES) are put + BINDIR = $(INSTALL_PREFIX)@bindir@ |