pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang Deduplicate, move common code into more appropria...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d68a4202b6a6
branches:  trunk
changeset: 568565:d68a4202b6a6
user:      asau <asau%pkgsrc.org@localhost>
date:      Tue Dec 15 13:53:24 2009 +0000

description:
Deduplicate, move common code into more appropriate place.

diffstat:

 lang/erlang-doc/Makefile      |  8 +-------
 lang/erlang/Makefile          |  8 +-------
 lang/erlang/Makefile.versions |  8 +++++++-
 3 files changed, 9 insertions(+), 15 deletions(-)

diffs (61 lines):

diff -r 4074c10ac191 -r d68a4202b6a6 lang/erlang-doc/Makefile
--- a/lang/erlang-doc/Makefile  Tue Dec 15 13:50:58 2009 +0000
+++ b/lang/erlang-doc/Makefile  Tue Dec 15 13:53:24 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/12/15 13:32:10 asau Exp $
+# $NetBSD: Makefile,v 1.7 2009/12/15 13:53:24 asau Exp $
 
 DISTNAME=              otp_doc_html_${DIST_VERSION_MAJOR}${DIST_VERSION_MINOR:D-${DIST_VERSION_MINOR}}
 PKGNAME=               erlang-doc-${ERLANG_VERSION}
@@ -31,10 +31,4 @@
 
 .include "../../lang/erlang/Makefile.versions"
 
-# Generate PLIST
-.for _pkg_ _version_ in $(_VERSIONS)
-PRINT_PLIST_AWK+=      {if ($$0 ~ /\/$(_pkg_)-$(_version_)\//) {sub(/\/$(_pkg_)-$(_version_)\//,"/$(_pkg_)-$${VERSION.$(_pkg_)}/", $$0);}}
-.endfor
-PRINT_PLIST_AWK+=      {if ($$0 ~ /\/releases\/${DIST_VERSION_MAJOR}\//) {sub(/\/releases\/${DIST_VERSION_MAJOR}\//,"/releases/$${VERSION}/", $$0);}}
-
 .include "../../mk/bsd.pkg.mk"
diff -r 4074c10ac191 -r d68a4202b6a6 lang/erlang/Makefile
--- a/lang/erlang/Makefile      Tue Dec 15 13:50:58 2009 +0000
+++ b/lang/erlang/Makefile      Tue Dec 15 13:53:24 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2009/12/15 12:07:57 asau Exp $
+# $NetBSD: Makefile,v 1.43 2009/12/15 13:53:24 asau Exp $
 
 DISTNAME=              otp_src_${DIST_VERSION_MAJOR}${DIST_VERSION_MINOR:D-${DIST_VERSION_MINOR}}
 PKGNAME=               erlang-${ERLANG_VERSION}
@@ -73,12 +73,6 @@
 post-install:
        chmod -R go-w ${DESTDIR}${PREFIX}/lib/erlang/lib
 
-# Generate PLIST
-.for _pkg_ _version_ in $(_VERSIONS)
-PRINT_PLIST_AWK+=      {if ($$0 ~ /\/$(_pkg_)-$(_version_)\//) {sub(/\/$(_pkg_)-$(_version_)\//,"/$(_pkg_)-$${VERSION.$(_pkg_)}/", $$0);}}
-.endfor
-PRINT_PLIST_AWK+=      {if ($$0 ~ /\/releases\/${DIST_VERSION_MAJOR}\//) {sub(/\/releases\/${DIST_VERSION_MAJOR}\//,"/releases/$${VERSION}/", $$0);}}
-
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff -r 4074c10ac191 -r d68a4202b6a6 lang/erlang/Makefile.versions
--- a/lang/erlang/Makefile.versions     Tue Dec 15 13:50:58 2009 +0000
+++ b/lang/erlang/Makefile.versions     Tue Dec 15 13:53:24 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.versions,v 1.8 2009/12/15 13:33:47 asau Exp $
+# $NetBSD: Makefile.versions,v 1.9 2009/12/15 13:53:24 asau Exp $
 
 ERLANG_VERSION=                        13.2.3
 DIST_VERSION_MAJOR=            R13B03
@@ -67,3 +67,9 @@
 VERSION.${name}=${version}
 PLIST_SUBST+=  VERSION.${name}=${version}
 .endfor
+
+# Generate PLIST
+.for _pkg_ _version_ in $(_VERSIONS)
+PRINT_PLIST_AWK+=      {if ($$0 ~ /\/$(_pkg_)-$(_version_)\//) {sub(/\/$(_pkg_)-$(_version_)\//,"/$(_pkg_)-$${VERSION.$(_pkg_)}/", $$0);}}
+.endfor
+PRINT_PLIST_AWK+=      {if ($$0 ~ /\/releases\/${DIST_VERSION_MAJOR}\//) {sub(/\/releases\/${DIST_VERSION_MAJOR}\//,"/releases/$${VERSION}/", $$0);}}



Home | Main Index | Thread Index | Old Index