Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 3 Oct 2013 13:30:29 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r329184 - in head/lang: perl5.12 perl5.14 perl5.16 perl5.18
Message-ID:  <201310031330.r93DUTGF083234@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Thu Oct  3 13:30:29 2013
New Revision: 329184
URL: http://svnweb.freebsd.org/changeset/ports/329184

Log:
  - Fixup staging with pkgng.
  - Always use new LIB_DEPENDS format.
  
  Pointy hat to:	myself

Modified:
  head/lang/perl5.12/Makefile
  head/lang/perl5.12/pkg-plist
  head/lang/perl5.14/Makefile
  head/lang/perl5.14/pkg-plist
  head/lang/perl5.16/Makefile
  head/lang/perl5.16/pkg-plist
  head/lang/perl5.18/Makefile
  head/lang/perl5.18/pkg-plist

Modified: head/lang/perl5.12/Makefile
==============================================================================
--- head/lang/perl5.12/Makefile	Thu Oct  3 13:27:52 2013	(r329183)
+++ head/lang/perl5.12/Makefile	Thu Oct  3 13:30:29 2013	(r329184)
@@ -101,7 +101,7 @@ CONFIGURE_ARGS+=	-Doptimize="${CFLAGS}"
 
 .if ${PORT_OPTIONS:MGDBM}
 CONFIGURE_ARGS+=	-Di_gdbm
-LIB_DEPENDS+=		gdbm:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS+=		libgdbm.so:${PORTSDIR}/databases/gdbm
 .else
 CONFIGURE_ARGS+=	-Ui_gdbm
 .endif
@@ -194,6 +194,9 @@ post-patch:
 .endif
 
 post-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/man/man3
+	@${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto
+	@${MKDIR} ${STAGEDIR}${SITE_PERL}/auto
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION}
 .if ${OSVERSION} >= 900022
 	@${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf

Modified: head/lang/perl5.12/pkg-plist
==============================================================================
--- head/lang/perl5.12/pkg-plist	Thu Oct  3 13:27:52 2013	(r329183)
+++ head/lang/perl5.12/pkg-plist	Thu Oct  3 13:30:29 2013	(r329184)
@@ -3184,16 +3184,14 @@ man/man1/xsubpp.1.gz
 @dirrm lib/perl5/%%PERL_VER%%/perl/man
 @dirrm lib/perl5/%%PERL_VER%%/perl
 @dirrm lib/perl5/%%PERL_VER%%/overload
-@dirrm lib/perl5/%%PERL_VER%%/man/man3
-@dirrm lib/perl5/%%PERL_VER%%/man
 @dirrm lib/perl5/%%PERL_VER%%/inc/latest
 @dirrm lib/perl5/%%PERL_VER%%/inc
 @dirrm lib/perl5/%%PERL_VER%%/encoding
 @dirrm lib/perl5/%%PERL_VER%%/autodie/exception
 @dirrm lib/perl5/%%PERL_VER%%/autodie
 @dirrm lib/perl5/%%PERL_VER%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/sys
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/machine
+@dirrmtry lib/perl5/%%PERL_VER%%/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/man
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
 @dirrmtry %%SITE_PERL%%/auto

Modified: head/lang/perl5.14/Makefile
==============================================================================
--- head/lang/perl5.14/Makefile	Thu Oct  3 13:27:52 2013	(r329183)
+++ head/lang/perl5.14/Makefile	Thu Oct  3 13:30:29 2013	(r329184)
@@ -98,7 +98,7 @@ CONFIGURE_ARGS+=	-Doptimize="${CFLAGS}"
 
 .if ${PORT_OPTIONS:MGDBM}
 CONFIGURE_ARGS+=	-Di_gdbm
-LIB_DEPENDS+=		gdbm:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS+=		libgdbm.so:${PORTSDIR}/databases/gdbm
 .else
 CONFIGURE_ARGS+=	-Ui_gdbm
 .endif
@@ -191,6 +191,9 @@ post-patch:
 .endif
 
 post-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/man/man3
+	@${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto
+	@${MKDIR} ${STAGEDIR}${SITE_PERL}/auto
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION}
 .if ${OSVERSION} >= 900022
 	@${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf

Modified: head/lang/perl5.14/pkg-plist
==============================================================================
--- head/lang/perl5.14/pkg-plist	Thu Oct  3 13:27:52 2013	(r329183)
+++ head/lang/perl5.14/pkg-plist	Thu Oct  3 13:30:29 2013	(r329184)
@@ -3334,16 +3334,14 @@ man/man1/xsubpp.1.gz
 @dirrm lib/perl5/%%PERL_VER%%/perl/man
 @dirrm lib/perl5/%%PERL_VER%%/perl
 @dirrm lib/perl5/%%PERL_VER%%/overload
-@dirrm lib/perl5/%%PERL_VER%%/man/man3
-@dirrm lib/perl5/%%PERL_VER%%/man
 @dirrm lib/perl5/%%PERL_VER%%/inc/latest
 @dirrm lib/perl5/%%PERL_VER%%/inc
 @dirrm lib/perl5/%%PERL_VER%%/encoding
 @dirrm lib/perl5/%%PERL_VER%%/autodie/exception
 @dirrm lib/perl5/%%PERL_VER%%/autodie
 @dirrm lib/perl5/%%PERL_VER%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/sys
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/machine
+@dirrmtry lib/perl5/%%PERL_VER%%/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/man
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
 @dirrmtry %%SITE_PERL%%/auto

Modified: head/lang/perl5.16/Makefile
==============================================================================
--- head/lang/perl5.16/Makefile	Thu Oct  3 13:27:52 2013	(r329183)
+++ head/lang/perl5.16/Makefile	Thu Oct  3 13:30:29 2013	(r329184)
@@ -97,7 +97,7 @@ CONFIGURE_ARGS+=	-Doptimize="${CFLAGS}"
 
 .if ${PORT_OPTIONS:MGDBM}
 CONFIGURE_ARGS+=	-Di_gdbm
-LIB_DEPENDS+=		gdbm:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS+=		libgdbm.so:${PORTSDIR}/databases/gdbm
 .else
 CONFIGURE_ARGS+=	-Ui_gdbm
 .endif
@@ -190,6 +190,9 @@ post-patch:
 .endif
 
 post-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/man/man3
+	@${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto
+	@${MKDIR} ${STAGEDIR}${SITE_PERL}/auto
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION}
 .if ${OSVERSION} >= 900022
 	@${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf

Modified: head/lang/perl5.16/pkg-plist
==============================================================================
--- head/lang/perl5.16/pkg-plist	Thu Oct  3 13:27:52 2013	(r329183)
+++ head/lang/perl5.16/pkg-plist	Thu Oct  3 13:30:29 2013	(r329184)
@@ -3237,16 +3237,14 @@ man/man1/zipdetails.1.gz
 @dirrm lib/perl5/%%PERL_VER%%/perl/man
 @dirrm lib/perl5/%%PERL_VER%%/perl
 @dirrm lib/perl5/%%PERL_VER%%/overload
-@dirrm lib/perl5/%%PERL_VER%%/man/man3
-@dirrm lib/perl5/%%PERL_VER%%/man
 @dirrm lib/perl5/%%PERL_VER%%/inc/latest
 @dirrm lib/perl5/%%PERL_VER%%/inc
 @dirrm lib/perl5/%%PERL_VER%%/encoding
 @dirrm lib/perl5/%%PERL_VER%%/autodie/exception
 @dirrm lib/perl5/%%PERL_VER%%/autodie
 @dirrm lib/perl5/%%PERL_VER%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/sys
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/machine
+@dirrmtry lib/perl5/%%PERL_VER%%/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/man
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
 @dirrmtry %%SITE_PERL%%/auto

Modified: head/lang/perl5.18/Makefile
==============================================================================
--- head/lang/perl5.18/Makefile	Thu Oct  3 13:27:52 2013	(r329183)
+++ head/lang/perl5.18/Makefile	Thu Oct  3 13:30:29 2013	(r329184)
@@ -47,7 +47,7 @@ DEBUG_CONFIGURE_ON=	-Doptimize="-g" -DDE
 DEBUG_CONFIGURE_OFF=	-Doptimize="${CFLAGS}"
 GDBM_CONFIGURE_ON=	-Di_gdbm
 GDBM_CONFIGURE_OFF=	-Ui_gdbm
-GDBM_LIB_DEPENDS=	gdbm:${PORTSDIR}/databases/gdbm
+GDBM_LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
 PERL_64BITINT_CONFIGURE_ON=	-Duse64bitint
 MULTIPLICITY_CONFIGURE_ON=	-Dusemultiplicity=y
 SITECUSTOMIZE_CONFIGURE_ON=	-Dusesitecustomize
@@ -172,6 +172,9 @@ post-patch:
 .endif
 
 post-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/man/man3
+	@${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto
+	@${MKDIR} ${STAGEDIR}${SITE_PERL}/auto
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION}
 .if ${OSVERSION} >= 900022
 	@${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf

Modified: head/lang/perl5.18/pkg-plist
==============================================================================
--- head/lang/perl5.18/pkg-plist	Thu Oct  3 13:27:52 2013	(r329183)
+++ head/lang/perl5.18/pkg-plist	Thu Oct  3 13:30:29 2013	(r329184)
@@ -3127,7 +3127,6 @@ man/man1/zipdetails.1.gz
 @dirrm lib/perl5/%%PERL_VER%%/unicore/lib
 @dirrm lib/perl5/%%PERL_VER%%/unicore/To
 @dirrm lib/perl5/%%PERL_VER%%/unicore
-@dirrm lib/perl5/%%PERL_VER%%/Version
 @dirrm lib/perl5/%%PERL_VER%%/User
 @dirrm lib/perl5/%%PERL_VER%%/Unicode/Collate/Locale
 @dirrm lib/perl5/%%PERL_VER%%/Unicode/Collate/CJK
@@ -3260,16 +3259,14 @@ man/man1/zipdetails.1.gz
 @dirrm lib/perl5/%%PERL_VER%%/perl/man
 @dirrm lib/perl5/%%PERL_VER%%/perl
 @dirrm lib/perl5/%%PERL_VER%%/overload
-@dirrm lib/perl5/%%PERL_VER%%/man/man3
-@dirrm lib/perl5/%%PERL_VER%%/man
 @dirrm lib/perl5/%%PERL_VER%%/inc/latest
 @dirrm lib/perl5/%%PERL_VER%%/inc
 @dirrm lib/perl5/%%PERL_VER%%/encoding
 @dirrm lib/perl5/%%PERL_VER%%/autodie/exception
 @dirrm lib/perl5/%%PERL_VER%%/autodie
 @dirrm lib/perl5/%%PERL_VER%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/sys
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/machine
+@dirrmtry lib/perl5/%%PERL_VER%%/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/man
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
 @dirrmtry %%SITE_PERL%%/auto



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310031330.r93DUTGF083234>