Index: www/spidereyeballs/Portfile
===================================================================
--- www/spidereyeballs/Portfile	(revision 93513)
+++ www/spidereyeballs/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem        1.0
+PortGroup			perl5	1.0
 
 name              spidereyeballs
 version           0.21
@@ -16,11 +17,11 @@
 master_sites      sourceforge:project/spidereyeballs/spidereyeballs/${version}
 distname		  Spidy-${version}
 checksums		  sha1 90e3cf5514bc81d9d83675256f8b3f71c34407d8
-depends_lib	  port:perl5.12 port:p5.12-html-template \
-				  port:p5.12-xml-parser port:p5.12-image-size
+depends_lib	  port:perl${perl5.major} port:p${perl5.major}-html-template \
+				  port:p${perl5.major}-xml-parser port:p${perl5.major}-image-size
 depends_run		  port:ImageMagick
 
-configure.cmd           ${prefix}/bin/perl5.12
+configure.cmd           ${prefix}/bin/perl${perl5.major}
 configure.pre_args      Makefile.PL
 configure.args			--prefix=${prefix}
 destroot.target			install
Index: www/wml/Portfile
===================================================================
--- www/wml/Portfile	(revision 93513)
+++ www/wml/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name                    wml
 version                 2.0.11
@@ -32,18 +33,18 @@
                         patch-no_tidy.diff \
                         patch-no_txt2html.diff
 
-depends_run             port:p5.12-eperl \
+depends_run             port:p${perl5.major}-eperl \
                         port:m4 \
                         port:tidy
 
 depends_lib             port:gdbm \
                         port:gettext \
                         port:libiconv \
-                        port:p5.12-getopt-long \
-                        port:p5.12-bit-vector \
-                        port:p5.12-image-size \
-                        port:p5.12-io \
-                        port:p5.12-term-readkey
+                        port:p${perl5.major}-getopt-long \
+                        port:p${perl5.major}-bit-vector \
+                        port:p${perl5.major}-image-size \
+                        port:p${perl5.major}-io \
+                        port:p${perl5.major}-term-readkey
 
 depends_build           port:lynx
 
Index: multimedia/cws2fws-pl/Portfile
===================================================================
--- multimedia/cws2fws-pl/Portfile	(revision 93513)
+++ multimedia/cws2fws-pl/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup			perl5	1.0
 
 name                cws2fws-pl
 version             0.0.1
@@ -15,7 +16,7 @@
 master_sites        http://zefonseca.com/cws2fws/release/
 distfiles           cws2fws
 
-depends_run         port:p5.12-io-compress
+depends_run         port:p${perl5.major}-io-compress
 
 checksums           rmd160  733a7fa884771c4a5d66eaafc5d89c867048ca20
 
@@ -25,7 +26,7 @@
 }
 
 patch {
-    reinplace "s|^#!/usr/bin/perl|#!${prefix}/bin/perl5.12|" "${worksrcpath}/cws2fws.pl"
+    reinplace "s|^#!/usr/bin/perl|#!${prefix}/bin/perl${perl5.major}|" "${worksrcpath}/cws2fws.pl"
 }
 
 use_configure       no
Index: multimedia/libgpod/Portfile
===================================================================
--- multimedia/libgpod/Portfile	(revision 93513)
+++ multimedia/libgpod/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup			perl5	1.0
 
 name                libgpod
 version             0.8.0
@@ -23,7 +24,7 @@
 depends_build       path:bin/pkg-config:pkgconfig \
                     port:intltool
 
-depends_lib         port:p5.12-xml-parser \
+depends_lib         port:p${perl5.major}-xml-parser \
                     port:libplist \
                     port:gdk-pixbuf2 \
                     port:taglib \
Index: multimedia/dvdrip/Portfile
===================================================================
--- multimedia/dvdrip/Portfile	(revision 93513)
+++ multimedia/dvdrip/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup			perl5	1.0
 
 name                dvdrip
 version             0.98.8
@@ -17,9 +18,9 @@
 platforms           darwin
 master_sites        http://www.exit1.org/dvdrip/dist/
 checksums           md5 61b77b298b14c6bde83713e93e9ea4d8
-depends_lib         port:p5.12-libintl-perl \
+depends_lib         port:p${perl5.major}-libintl-perl \
                     port:transcode \
-                    port:p5.12-gtk2
+                    port:p${perl5.major}-gtk2
 
 # transcode is not universal
 universal_variant   no
Index: multimedia/gnupod/Portfile
===================================================================
--- multimedia/gnupod/Portfile	(revision 93513)
+++ multimedia/gnupod/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name              gnupod
 version           0.99.7
@@ -18,12 +19,12 @@
 extract.suffix    .tgz
 checksums         sha1 3aa4b32cc896af435fb52d4bb154ee950ad08ce1
 
-depends_lib       port:perl5.12 port:p5.12-mp3-info port:p5.12-digest-md5 \
-                  port:p5.12-xml-parser port:p5.12-unicode-string \
-                  port:p5.12-libwww-perl port:p5.12-digest-sha1 port:p5.12-timedate \
+depends_lib       port:perl${perl5.major} port:p${perl5.major}-mp3-info port:p${perl5.major}-digest-md5 \
+                  port:p${perl5.major}-xml-parser port:p${perl5.major}-unicode-string \
+                  port:p${perl5.major}-libwww-perl port:p${perl5.major}-digest-sha1 port:p${perl5.major}-timedate \
 		  port:lame
 
-configure.perl    ${prefix}/bin/perl5.12
+configure.perl    ${prefix}/bin/perl${perl5.major}
 
 configure.args    --infodir=${prefix}/share/info
 
@@ -36,12 +37,12 @@
 
 # should also use timidity
 variant flac description "Enable FLAC" {
-    depends_lib-append  port:flac port:p5.12-audio-flac-header
+    depends_lib-append  port:flac port:p${perl5.major}-audio-flac-header
 }
 
 # should use Ogg::Vorbis::Header::PurePerl, won't work
 variant vorbis description "Enable Ogg/Vorbis" {
-    depends_lib-append  port:vorbis-tools port:p5.12-libvorbis-perl
+    depends_lib-append  port:vorbis-tools port:p${perl5.major}-libvorbis-perl
 }
 
 variant aac description "Enable AAC" {
Index: games/xqf/Portfile
===================================================================
--- games/xqf/Portfile	(revision 93513)
+++ games/xqf/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name            xqf
 version         1.0.5
@@ -30,7 +31,7 @@
 
 depends_lib         port:gtk1 \
                     port:gdk-pixbuf \
-                    port:p5.12-xml-parser \
+                    port:p${perl5.major}-xml-parser \
                     port:readline
 
 depends_run         port:qstat
Index: games/frozenbubble2/Portfile
===================================================================
--- games/frozenbubble2/Portfile	(revision 93513)
+++ games/frozenbubble2/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem	      1.0
+PortGroup			perl5	1.0
 
 name		      frozenbubble2
 categories	      games
@@ -25,9 +26,9 @@
 use_bzip2	      yes
 
 depends_build        port:pkgconfig
-depends_lib	      port:perl5.12 path:lib/pkgconfig/sdl.pc:libsdl port:libsdl_image \
-		      port:libsdl_mixer port:p5.12-sdl_perl port:libsdl_pango
-depends_run	      port:p5.12-locale-gettext
+depends_lib	      port:perl${perl5.major} path:lib/pkgconfig/sdl.pc:libsdl port:libsdl_image \
+		      port:libsdl_mixer port:p${perl5.major}-sdl_perl port:libsdl_pango
+depends_run	      port:p${perl5.major}-locale-gettext
 
 livecheck.type        freecode
 livecheck.name        frozen-bubble
@@ -36,7 +37,7 @@
 
 configure {
     foreach file [glob ${worksrcpath}/frozen-bubble*] {
-        reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.12|g" ${file}
+        reinplace "s|/usr/bin/perl|${prefix}/bin/perl${perl5.major}|g" ${file}
     }
 }
 
Index: games/pioneers/Portfile
===================================================================
--- games/pioneers/Portfile	(revision 93513)
+++ games/pioneers/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup			perl5	1.0
 PortGroup           app 1.0
 
 name                pioneers
@@ -20,7 +21,7 @@
 
 homepage            http://pio.sourceforge.net/
 platforms           freebsd darwin
-depends_build       port:gettext port:grep port:intltool port:p5.12-xml-parser \
+depends_build       port:gettext port:grep port:intltool port:p${perl5.major}-xml-parser \
                     port:perl5 port:pkgconfig port:rarian
 depends_lib         port:atk port:expat port:fontconfig port:freetype \
                     port:gettext port:gtk2 port:libiconv \
Index: graphics/imageindex/Portfile
===================================================================
--- graphics/imageindex/Portfile	(revision 93513)
+++ graphics/imageindex/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem        1.0
+PortGroup			perl5	1.0
 
 name              imageindex
 
@@ -20,16 +21,16 @@
                   sha1    56ff666cb59258cc06052ccbe91ca06cb42f8cca \
                   rmd160  cffde483a8dddcef7f415c38b8ee3a9487444ecb
 
-depends_lib       port:p5.12-perlmagick
+depends_lib       port:p${perl5.major}-perlmagick
 
-depends_run       port:p5.12-image-info
+depends_run       port:p${perl5.major}-image-info
 
 use_configure     no
 
-build.args        PREFIX=${prefix} PERLPATH=${prefix}/bin/perl5.12
+build.args        PREFIX=${prefix} PERLPATH=${prefix}/bin/perl${perl5.major}
 
 destroot.cmd      make install
-destroot.args     PREFIX=${destroot}${prefix} PERLPATH=${prefix}/bin/perl5.12
+destroot.args     PREFIX=${destroot}${prefix} PERLPATH=${prefix}/bin/perl${perl5.major}
 
 livecheck.type    regex
 livecheck.regex   ${name}-(\[0-9.\]+)\\.tar
Index: graphics/hugin-app/Portfile
===================================================================
--- graphics/hugin-app/Portfile	(revision 93513)
+++ graphics/hugin-app/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 PortGroup cmake	1.0
 
 name			hugin-app
@@ -34,7 +35,7 @@
 			port:libxml2
 
 depends_run		port:enblend \
-			port:p5.12-image-exiftool
+			port:p${perl5.major}-image-exiftool
 
 checksums		md5 ac8a129b4c3021233df6d9368c8164cf \
 			sha1 22e1ad3846291a9bbe58570683e213921a6f0116 \
Index: security/log2timeline/Portfile
===================================================================
--- security/log2timeline/Portfile	(revision 93513)
+++ security/log2timeline/Portfile	(working copy)
@@ -28,34 +28,34 @@
 checksums           sha1    eca77c1b957a23150b1d906a7e9790e46d6ff277 \
                     rmd160  654bab031ce713253b133a94ac5d44dc3b976c9c
 
-depends_lib         port:perl5.12 \
-                    port:p5.12-archive-zip \
-                    port:p5.12-carp-assert \
-                    port:p5.12-datetime-format-strptime \
-                    port:p5.12-datetime-timezone \
-                    port:p5.12-dbd-sqlite \
-                    port:p5.12-dbi \
-                    port:p5.12-digest-crc \
-                    port:p5.12-gtk2 \
-                    port:p5.12-html-parser \
-                    port:p5.12-html-scrubber \
-                    port:p5.12-image-exiftool \
-                    port:p5.12-libwww-perl \
-                    port:p5.12-net-pcap \
-                    port:p5.12-netpacket \
-                    port:p5.12-xml-libxml \
-                    port:p5.12-datemanip \
-                    port:p5.12-parse-win32registry \
-                    port:p5.12-file-mork \
-                    port:p5.12-data-hexify \
-                    port:p5.12-version \
-                    port:p5.12-params-validate \
-                    port:p5.12-xml-entities \
-                    port:p5.12-mac-propertylist
+depends_lib         port:perl${perl5.major} \
+                    port:p${perl5.major}-archive-zip \
+                    port:p${perl5.major}-carp-assert \
+                    port:p${perl5.major}-datetime-format-strptime \
+                    port:p${perl5.major}-datetime-timezone \
+                    port:p${perl5.major}-dbd-sqlite \
+                    port:p${perl5.major}-dbi \
+                    port:p${perl5.major}-digest-crc \
+                    port:p${perl5.major}-gtk2 \
+                    port:p${perl5.major}-html-parser \
+                    port:p${perl5.major}-html-scrubber \
+                    port:p${perl5.major}-image-exiftool \
+                    port:p${perl5.major}-libwww-perl \
+                    port:p${perl5.major}-net-pcap \
+                    port:p${perl5.major}-netpacket \
+                    port:p${perl5.major}-xml-libxml \
+                    port:p${perl5.major}-datemanip \
+                    port:p${perl5.major}-parse-win32registry \
+                    port:p${perl5.major}-file-mork \
+                    port:p${perl5.major}-data-hexify \
+                    port:p${perl5.major}-version \
+                    port:p${perl5.major}-params-validate \
+                    port:p${perl5.major}-xml-entities \
+                    port:p${perl5.major}-mac-propertylist
 
 supported_archs     noarch
 
-configure.cmd       ${prefix}/bin/perl5.12 Makefile.PL
+configure.cmd       ${prefix}/bin/perl${perl5.major} Makefile.PL
 configure.pre_args
 
 post-destroot {
Index: security/metasploit2/Portfile
===================================================================
--- security/metasploit2/Portfile	(revision 93513)
+++ security/metasploit2/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 name		metasploit2
 version		2.7
 revision	1
@@ -26,16 +27,16 @@
 checksums	md5 ea592cfb006e1b2510b533cece4ecb18 \
 		sha1 da5d41dfa13e549aacd4fbf2994877cbe80ceed9
 
-depends_lib	port:perl5.12 \
-		port:p5.12-term-readline-gnu \
-		port:p5.12-net-ssleay
+depends_lib	port:perl${perl5.major} \
+		port:p${perl5.major}-term-readline-gnu \
+		port:p${perl5.major}-net-ssleay
 
 use_configure   no
 build           {
 			## remove the .svn/ directories, no need to move them around
 			system "cd ${worksrcpath} && find . -type d -name '\.svn' | xargs /bin/rm -rf"
 			foreach file [glob -directory ${worksrcpath} msf*] {
-				reinplace "s|#!/usr/bin/perl|#!${prefix}/bin/perl5.12|" $file
+				reinplace "s|#!/usr/bin/perl|#!${prefix}/bin/perl${perl5.major}|" $file
 			}
 		}
 destroot        { 
Index: security/makepasswd/Portfile
===================================================================
--- security/makepasswd/Portfile	(revision 93513)
+++ security/makepasswd/Portfile	(working copy)
@@ -1,5 +1,6 @@
 # $Id$
 PortSystem        1.0
+PortGroup			perl5	1.0
 name              makepasswd
 version           1.10-3
 revision          1
@@ -21,7 +22,7 @@
                   patch-makepasswd.diff \
                   sha1 58b6d05b1da01ae75cb04fadd27aa6902fe9d403
 
-depends_lib       port:p5.12-crypt-passwdmd5
+depends_lib       port:p${perl5.major}-crypt-passwdmd5
 
 extract.cmd       ar
 extract.pre_args  -x
@@ -30,7 +31,7 @@
 
 configure         {}
 post-configure    {
-                  reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.12|g" \
+                  reinplace "s|/usr/bin/perl|${prefix}/bin/perl${perl5.major}|g" \
                   "${worksrcpath}/usr/bin/makepasswd"
                   }
 
Index: security/tinyca2/Portfile
===================================================================
--- security/tinyca2/Portfile	(revision 93513)
+++ security/tinyca2/Portfile	(working copy)
@@ -1,5 +1,6 @@
 # $Id$
 PortSystem	1.0
+PortGroup			perl5	1.0
 
 name			tinyca2
 version			0.7.5
@@ -16,8 +17,8 @@
 checksums		md5 d3b547305e89785fbe8262be244a2321 \
 			sha1 841355ab8478a7e7b1a3d6bba4dd31293ae11cc4
 depends_lib		port:openssl port:zip \
-			port:gettext port:p5.12-gtk2 \
-			port:p5.12-locale-gettext
+			port:gettext port:p${perl5.major}-gtk2 \
+			port:p${perl5.major}-locale-gettext
 
 patchfiles		patch-tinyca2
 
@@ -31,7 +32,7 @@
 	reinplace s|@OPENSSL@|${prefix}/bin/openssl|g ${worksrcpath}/tinyca2
 	reinplace s|@ZIP@|${prefix}/bin/zip|g ${worksrcpath}/tinyca2
 	reinplace s|@TAR@|/usr/bin/tar|g ${worksrcpath}/tinyca2
-	reinplace s|/usr/bin/perl|${prefix}/bin/perl5.12|g ${worksrcpath}/tinyca2
+	reinplace s|/usr/bin/perl|${prefix}/bin/perl${perl5.major}|g ${worksrcpath}/tinyca2
 }
 
 pre-build {
Index: databases/postgresql_autodoc/Portfile
===================================================================
--- databases/postgresql_autodoc/Portfile	(revision 93513)
+++ databases/postgresql_autodoc/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name			postgresql_autodoc
 version			1.31
@@ -19,11 +20,11 @@
 				sha1  2f9dbd73593ce71229fcaf72d5e69c18b8812117 \
 				rmd160 7c7b3a60c79acde53fa8eb542d4d435423324002
 
-depends_lib		port:perl5.12 \
-				port:p5.12-dbi \
-				port:p5.12-dbd-pg \
-				port:p5.12-html-template \
-				port:p5.12-term-readkey
+depends_lib		port:perl${perl5.major} \
+				port:p${perl5.major}-dbi \
+				port:p${perl5.major}-dbd-pg \
+				port:p${perl5.major}-html-template \
+				port:p${perl5.major}-term-readkey
 
 worksrcdir		${name}
 
Index: databases/libgda3/Portfile
===================================================================
--- databases/libgda3/Portfile	(revision 93513)
+++ databases/libgda3/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name		libgda3
 version		3.0.4
@@ -27,8 +28,8 @@
 	port:libiconv \
 	port:libxml2 \
 	port:ncurses \
-	port:p5.12-xml-parser \
-	port:perl5.12 \
+	port:p${perl5.major}-xml-parser \
+	port:perl${perl5.major} \
 	port:readline \
 	port:zlib \
 	path:lib/pkgconfig/glib-2.0.pc:glib2
@@ -41,7 +42,7 @@
 
 patchfiles      patch-glib-2.32.diff
 
-configure.perl  ${prefix}/bin/perl5.12
+configure.perl  ${prefix}/bin/perl${perl5.major}
 configure.env-append  INTLTOOL_PERL=${configure.perl}
 
 configure.args  --mandir=${prefix}/share/man
Index: databases/mysql-zrm/Portfile
===================================================================
--- databases/mysql-zrm/Portfile	(revision 93513)
+++ databases/mysql-zrm/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem		1.0
+PortGroup			perl5	1.0
 
 name			mysql-zrm
 version			2.0
@@ -20,8 +21,8 @@
 distname		MySQL-zrm-${version}
 checksums		md5 13a82abeb181d265af553770d1db6718 \
 				sha1 fbc38a346755fb228296af2a447cb5fd74d5d246
-depends_lib		port:p5.12-dbi \
-			port:p5.12-xml-parser
+depends_lib		port:p${perl5.major}-dbi \
+			port:p${perl5.major}-xml-parser
 use_configure		no
 patchfiles		patch-mysql-zrm-backup-0 \
 			patch-mysql-zrm-verify-backup-1 \
@@ -35,7 +36,7 @@
 	# Not the most efficient way to do this, but much more readable
 	foreach f [exec find ${worksrcpath} -type f -print] {
 		reinplace "s|/opt/csw/bin|${prefix}/bin|" ${f}
-		reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.12|" ${f}
+		reinplace "s|/usr/bin/perl|${prefix}/bin/perl${perl5.major}|" ${f}
 		reinplace "s|/usr/bin/mysql-zrm|${prefix}/bin/mysql-zrm|" ${f}
 		reinplace "s|/usr/lib/mysql-zrm|${prefix}/lib/mysql-zrm|" ${f}
 		reinplace "s|/usr/share/mysql-zrm|${prefix}/share/mysql-zrm|" ${f}
Index: math/pspp-devel/Portfile
===================================================================
--- math/pspp-devel/Portfile	(revision 93513)
+++ math/pspp-devel/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup			perl5	1.0
 PortGroup           app 1.0
 
 name                pspp-devel
Index: math/qalculate-gtk/Portfile
===================================================================
--- math/qalculate-gtk/Portfile	(revision 93513)
+++ math/qalculate-gtk/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name		qalculate-gtk
 version		0.9.7
@@ -38,7 +39,7 @@
 use_parallel_build	yes
 
 # needs to be same as used by intltool
-configure.perl  ${prefix}/bin/perl5.12
+configure.perl  ${prefix}/bin/perl${perl5.major}
 
 post-destroot {
     file delete ${destroot}${prefix}/bin/qalculate
Index: math/libqalculate/Portfile
===================================================================
--- math/libqalculate/Portfile	(revision 93513)
+++ math/libqalculate/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name		libqalculate
 version		0.9.7
@@ -28,7 +29,7 @@
                     sha1    c15f7f3a97995decf62cc964956fc1e374ecd78c \
                     rmd160  cc9e198769bea9731f92d2f3836875c83f715674
 
-depends_build port:p5.12-xml-parser \
+depends_build port:p${perl5.major}-xml-parser \
     port:pkgconfig
 
 depends_lib	port:cln\
Index: erlang/tsung/Portfile
===================================================================
--- erlang/tsung/Portfile	(revision 93513)
+++ erlang/tsung/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup			perl5	1.0
 
 name                tsung
 version             1.4.2
@@ -27,7 +28,7 @@
 depends_lib         port:erlang \
                     port:mochiweb \
                     port:gnuplot \
-                    port:p5.12-template-toolkit \
+                    port:p${perl5.major}-template-toolkit \
                     port:rrdtool
 
 patchfiles          patch-Makefile.in.diff
@@ -35,10 +36,10 @@
 build.target        all doc
 
 post-patch {
-    reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.12|" \
+    reinplace "s|/usr/bin/perl|${prefix}/bin/perl${perl5.major}|" \
         ${worksrcpath}/src/tsung-rrd.pl.in \
         ${worksrcpath}/src/tsung_stats.pl.in
-    reinplace "s|/usr/bin/env perl|${prefix}/bin/perl5.12|" \
+    reinplace "s|/usr/bin/env perl|${prefix}/bin/perl${perl5.major}|" \
         ${worksrcpath}/src/log2tsung.pl.in
     reinplace "s| /usr/bin/python|${prefix}/bin/python2.7|" \
         ${worksrcpath}/src/tsung-plotter/tsung/tsung.py
Index: science/perlprimer/Portfile
===================================================================
--- science/perlprimer/Portfile	(revision 93513)
+++ science/perlprimer/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup			perl5	1.0
 
 name                perlprimer
 version             1.1.20
@@ -22,7 +23,7 @@
 master_sites        sourceforge
 use_bzip2           yes
 
-depends_lib         port:p5.12-tk port:p5.12-libwww-perl
+depends_lib         port:p${perl5.major}-tk port:p${perl5.major}-libwww-perl
 
 checksums           sha1    00ae0bafbf3773c15e6f4b2dd0bb7b0d47427f8b \
                     rmd160  d92a9beea4e612a7f86ba08b36823422c576cd81
@@ -34,7 +35,7 @@
 destroot {
    xinstall -m 755 -W ${worksrcpath} perlprimer.pl ${destroot}${prefix}/bin
    ln -s perlprimer.pl ${destroot}${prefix}/bin/perlprimer
-   reinplace "s|#!/usr/bin/perl|#!${prefix}/bin/perl5.12|g" \
+   reinplace "s|#!/usr/bin/perl|#!${prefix}/bin/perl${perl5.major}|g" \
       ${destroot}${prefix}/bin/perlprimer.pl
    xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
    xinstall -m 644 -W ${worksrcpath} Changelog ReadMe ReadMe.txt gcg.603 \
Index: science/magicspp/Portfile
===================================================================
--- science/magicspp/Portfile	(revision 93513)
+++ science/magicspp/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup			perl5	1.0
 
 name                magicspp
 version             2.10.0
@@ -33,7 +34,7 @@
                     port:mesa \
                     port:xorg-libXau \
                     port:xorg-libXdmcp \
-                    port:p5.12-xml-parser \
+                    port:p${perl5.major}-xml-parser \
                     port:gd2 \
                     path:lib/pkgconfig/pango.pc:pango \
                     port:ghostscript
Index: science/gpredict/Portfile
===================================================================
--- science/gpredict/Portfile	(revision 93513)
+++ science/gpredict/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup			perl5	1.0
 
 name                gpredict
 version             1.3
@@ -30,4 +31,4 @@
                     port:pkgconfig
 depends_lib         port:goocanvas \
                     port:curl \
-                    port:p5.12-xml-parser
+                    port:p${perl5.major}-xml-parser
Index: editors/ackmate/Portfile
===================================================================
--- editors/ackmate/Portfile	(revision 93513)
+++ editors/ackmate/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem              1.0
+PortGroup			perl5	1.0
 PortGroup               xcode 1.0
 
 name                    ackmate
@@ -18,4 +19,4 @@
 git.url                 http://github.com/protocool/${real_name}.git
 git.branch              8b0c84cc668612946cee
 depends_build           port:ragel
-depends_lib             port:p5.12-app-ack
+depends_lib             port:p${perl5.major}-app-ack
Index: editors/zim/Portfile
===================================================================
--- editors/zim/Portfile	(revision 93513)
+++ editors/zim/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup			perl5	1.0
 
 name                zim
 version             0.28
@@ -27,8 +28,8 @@
                     sha1    c0d1d5ad956ee682f01ecbd89009eb9f0852f34c \
                     rmd160  b6ecc7c6f094670754b4219e7506edefd00b2ca1
 
-depends_lib         port:p5.12-gtk2 port:p5.12-module-build port:p5.12-file-mimeinfo \
-                    port:p5.12-file-basedir port:p5.12-file-desktopentry
+depends_lib         port:p${perl5.major}-gtk2 port:p${perl5.major}-module-build port:p${perl5.major}-file-mimeinfo \
+                    port:p${perl5.major}-file-basedir port:p${perl5.major}-file-desktopentry
 
 configure.pre_args  ""
 
Index: mail/muttprint/Portfile
===================================================================
--- mail/muttprint/Portfile	(revision 93513)
+++ mail/muttprint/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup			perl5	1.0
 
 name                muttprint
 version             0.72d
@@ -21,14 +22,14 @@
 
 checksums           sha1 532a1c7ed019b0b50c78caf7eeb17f5cd34d3d1e
 
-depends_lib         port:p5.12-text-iconv port:dialog
+depends_lib         port:p${perl5.major}-text-iconv port:dialog
 
 use_configure       no
 
 destroot            {
                     file mkdir ${destroot}${prefix}/bin ${destroot}${prefix}/share/man/man1
                     xinstall -m 755 ${worksrcpath}/${name} ${destroot}${prefix}/bin
-                    reinplace "s|#!/usr/bin/perl|#!${prefix}/bin/perl5.12|" ${destroot}${prefix}/bin/${name}
+                    reinplace "s|#!/usr/bin/perl|#!${prefix}/bin/perl${perl5.major}|" ${destroot}${prefix}/bin/${name}
                     xinstall -m 0644 ${worksrcpath}/doc/manpages/en/muttprint.1.gz ${destroot}${prefix}/share/man/man1
                     }
 
Index: mail/mailqfmt/Portfile
===================================================================
--- mail/mailqfmt/Portfile	(revision 93513)
+++ mail/mailqfmt/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem 		1.0
+PortGroup			perl5	1.0
 name			mailqfmt
 version			0.6
 revision        1
@@ -14,7 +15,7 @@
 master_sites	 	http://www.dt.e-technik.uni-dortmund.de/~ma/postfix/
 distfiles		${name}.pl
 checksums	 	md5 e1d452850f59cd004d2d4930758a4a28
-depends_lib-append	port:p5.12-libwww-perl port:postfix
+depends_lib-append	port:p${perl5.major}-libwww-perl port:postfix
 
 variant apple_postfix description {uses the mail queues of macosx postfix} {
 	depends_lib-delete	port:postfix
@@ -25,7 +26,7 @@
 	  file copy ${distpath}/mailqfmt.pl ${workpath}/mailqfmt
 	}
 post-patch { 
-	  reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.12|g" \
+	  reinplace "s|/usr/bin/perl|${prefix}/bin/perl${perl5.major}|g" \
 	    ${workpath}/mailqfmt
 
 if { ![variant_isset apple_postfix] } {
Index: mail/sqlgrey/Portfile
===================================================================
--- mail/sqlgrey/Portfile	(revision 93513)
+++ mail/sqlgrey/Portfile	(working copy)
@@ -17,10 +17,10 @@
 
 supported_archs     noarch
 
-depends_lib         port:p5.12-dbi \
-                    port:p5.12-io-multiplex \
-                    port:p5.12-net-dns \
-                    port:p5.12-net-server
+depends_lib         port:p${perl5.major}-dbi \
+                    port:p${perl5.major}-io-multiplex \
+                    port:p${perl5.major}-net-dns \
+                    port:p${perl5.major}-net-server
 
 depends_run         port:postfix
 
@@ -81,15 +81,15 @@
 default_variants    +mysql
 
 variant mysql description {add mysql driver support} {
-    depends_lib-append  port:p5.12-dbd-mysql
+    depends_lib-append  port:p${perl5.major}-dbd-mysql
 }
 
 variant sqlite description {add sqlite driver support} {
-    depends_lib-append  port:p5.12-dbd-sqlite
+    depends_lib-append  port:p${perl5.major}-dbd-sqlite
 }
 
 variant postgresql description {add postgres driver support} {
-    depends_lib-append  port:p5.12-dbd-pg
+    depends_lib-append  port:p${perl5.major}-dbd-pg
 }
 
 livecheck.version   ${version}
Index: mail/signing-party/Portfile
===================================================================
--- mail/signing-party/Portfile	(revision 93513)
+++ mail/signing-party/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup			perl5	1.0
 
 name                signing-party
 version             1.1.4
@@ -28,14 +29,14 @@
 
 use_configure       no
 
-depends_lib         port:perl5.12 \
-                    port:p5.12-class-methodmaker \
-                    port:p5.12-mailtools \
-                    port:p5.12-term-readkey \
-                    port:p5.12-gnupg-interface \
-                    port:p5.12-text-iconv \
-                    port:p5.12-text-template \
-                    port:p5.12-mime-tools \
+depends_lib         port:perl${perl5.major} \
+                    port:p${perl5.major}-class-methodmaker \
+                    port:p${perl5.major}-mailtools \
+                    port:p${perl5.major}-term-readkey \
+                    port:p${perl5.major}-gnupg-interface \
+                    port:p${perl5.major}-text-iconv \
+                    port:p${perl5.major}-text-template \
+                    port:p${perl5.major}-mime-tools \
                     port:qprint
 depends_run         bin:gpg:gnupg \
                     port:dialog
@@ -46,7 +47,7 @@
                     CFLAGS="${configure.cflags} [get_canonical_archflags]"
 
 pre-build {
-    reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.12|" \
+    reinplace "s|/usr/bin/perl|${prefix}/bin/perl${perl5.major}|" \
         ${worksrcpath}/caff/caff \
         ${worksrcpath}/caff/pgp-clean \
         ${worksrcpath}/caff/pgp-fixkey \
Index: mail/imapsync/Portfile
===================================================================
--- mail/imapsync/Portfile	(revision 93513)
+++ mail/imapsync/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name                imapsync
 version             1.488
@@ -21,18 +22,18 @@
                     sha1    3bd73000b606ad523255a7de42d89427a0626f77 \
                     rmd160  4caa332d730d1f7dea4d9b8196d7397b2b8f6104
 
-depends_run         port:perl5.12 \
-                    port:p5.12-digest-md5 \
-                    port:p5.12-mail-imapclient \
-                    port:p5.12-term-readkey \
-                    port:p5.12-io-socket-ssl \
-                    port:p5.12-datemanip \
-                    port:p5.12-digest-hmac
+depends_run         port:perl${perl5.major} \
+                    port:p${perl5.major}-digest-md5 \
+                    port:p${perl5.major}-mail-imapclient \
+                    port:p${perl5.major}-term-readkey \
+                    port:p${perl5.major}-io-socket-ssl \
+                    port:p${perl5.major}-datemanip \
+                    port:p${perl5.major}-digest-hmac
 
 supported_archs     noarch
 
 post-patch {
-    reinplace "s|^#!.*|#!${prefix}/bin/perl5.12|g" ${worksrcpath}/imapsync
+    reinplace "s|^#!.*|#!${prefix}/bin/perl${perl5.major}|g" ${worksrcpath}/imapsync
 }
 
 use_configure       no
Index: mail/t-prot/Portfile
===================================================================
--- mail/t-prot/Portfile	(revision 93513)
+++ mail/t-prot/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup			perl5	1.0
 
 name                t-prot
 version             2.5
@@ -20,8 +21,8 @@
                     sha1 c0987d1bbcb0c8ca1156204510ae68765f5e7588 \
                     rmd160 8568da171a75510af309a0375a626bbfc910c9a9
 
-depends_lib         port:p5.12-getopt-mixed \
-                    port:p5.12-locale-gettext
+depends_lib         port:p${perl5.major}-getopt-mixed \
+                    port:p${perl5.major}-locale-gettext
 
 use_configure       no
 
Index: mail/perfect_maildir/Portfile
===================================================================
--- mail/perfect_maildir/Portfile	(revision 93513)
+++ mail/perfect_maildir/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup			perl5	1.0
 
 name                perfect_maildir
 version             0.3
@@ -18,8 +19,8 @@
                     rmd160 f076ea65732d1c49996f68c19956aa33b2eaaed3
 distfiles           ${name}.pl
 
-depends_lib         port:perl5.12 \
-                    port:p5.12-timedate
+depends_lib         port:perl${perl5.major} \
+                    port:p${perl5.major}-timedate
 
 extract {
     file mkdir ${worksrcpath}
@@ -27,7 +28,7 @@
 }
 
 patch {
-    reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.12|g" ${worksrcpath}/${name}.pl
+    reinplace "s|/usr/bin/perl|${prefix}/bin/perl${perl5.major}|g" ${worksrcpath}/${name}.pl
 }
 
 use_configure       no
Index: mail/pflogsumm/Portfile
===================================================================
--- mail/pflogsumm/Portfile	(revision 93513)
+++ mail/pflogsumm/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name			pflogsumm
 version			1.1.3
@@ -37,10 +38,10 @@
 extract.only	        ${distname}${extract.suffix}
 platforms		darwin freebsd
 
-set perl5.bin	        ${prefix}/bin/perl5.12
+set perl5.bin	        ${prefix}/bin/perl${perl5.major}
 
-depends_lib     port:perl5.12
-depends_run		port:p5.12-date-calc
+depends_lib     port:perl${perl5.major}
+depends_run		port:p${perl5.major}-date-calc
 
 set cgi_path		""
 set maillog_path	""
Index: mail/amavisd-new/Portfile
===================================================================
--- mail/amavisd-new/Portfile	(revision 93513)
+++ mail/amavisd-new/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup			perl5	1.0
 
 name                amavisd-new
 version             2.7.0
@@ -24,23 +25,23 @@
                     sha256  534b3d91c31e0e87a73602c84dfeb4b30b4ea64dee99fcceabd59b1bc0082b0b
 
 depends_run         port:perl5 \
-                    port:p5.12-archive-zip \
-                    port:p5.12-berkeleydb \
-                    port:p5.12-convert-tnef \
-                    port:p5.12-convert-uulib \
-                    port:p5.12-digest-md5 \
-                    port:p5.12-io-compress \
-                    port:p5.12-io-stringy \
-                    port:p5.12-mail-dkim \
-                    port:p5.12-mailtools \
-                    port:p5.12-mime-tools \
-                    port:p5.12-mime-base64 \
-                    port:p5.12-net-server \
-                    port:p5.12-time-hires \
-                    port:p5.12-unix-syslog \
-                    port:p5.12-mail-spamassassin \
-                    port:p5.12-dbd-mysql \
-                    port:p5.12-mail-clamav \
+                    port:p${perl5.major}-archive-zip \
+                    port:p${perl5.major}-berkeleydb \
+                    port:p${perl5.major}-convert-tnef \
+                    port:p${perl5.major}-convert-uulib \
+                    port:p${perl5.major}-digest-md5 \
+                    port:p${perl5.major}-io-compress \
+                    port:p${perl5.major}-io-stringy \
+                    port:p${perl5.major}-mail-dkim \
+                    port:p${perl5.major}-mailtools \
+                    port:p${perl5.major}-mime-tools \
+                    port:p${perl5.major}-mime-base64 \
+                    port:p${perl5.major}-net-server \
+                    port:p${perl5.major}-time-hires \
+                    port:p${perl5.major}-unix-syslog \
+                    port:p${perl5.major}-mail-spamassassin \
+                    port:p${perl5.major}-dbd-mysql \
+                    port:p${perl5.major}-mail-clamav \
                     port:clamav \
                     port:clamav-server
 
@@ -49,7 +50,7 @@
 set amavisd_home    ${prefix}/var/amavis
 
 post-patch {
-    reinplace "s|#!/usr/bin/perl|#!${prefix}/bin/perl5.12|" \
+    reinplace "s|#!/usr/bin/perl|#!${prefix}/bin/perl${perl5.major}|" \
               ${worksrcpath}/amavisd
     file copy ${worksrcpath}/amavisd.conf ${worksrcpath}/amavisd.conf.example
     reinplace "s|\$daemon_user\  =\ 'vscan'|\$daemon_user\  =\ '${daemon_user}'|" \
Index: mail/mb2md/Portfile
===================================================================
--- mail/mb2md/Portfile	(revision 93513)
+++ mail/mb2md/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem		1.0
+PortGroup			perl5	1.0
 
 name			mb2md
 version			3.20
@@ -22,8 +23,8 @@
 checksums		md5 b47eaa6ae4231a42f4a15564a08eb439
 platforms		darwin
 
-depends_run		port:perl5.12 \
-				port:p5.12-timedate
+depends_run		port:perl${perl5.major} \
+				port:p${perl5.major}-timedate
 
 pre-extract		{ file mkdir ${worksrcpath} }
 extract.post_args	">${worksrcpath}/${name}-${version}.pl"
@@ -34,7 +35,7 @@
 
 build {
 	file copy ${worksrcpath}/${name}-${version}.pl ${worksrcpath}/${name}
-	reinplace "s|^#!.*perl|#!${prefix}/bin/perl5.12|" ${worksrcpath}/${name}
+	reinplace "s|^#!.*perl|#!${prefix}/bin/perl${perl5.major}|" ${worksrcpath}/${name}
 }
 
 destroot {
Index: mail/pemail/Portfile
===================================================================
--- mail/pemail/Portfile	(revision 93513)
+++ mail/pemail/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name			pemail
 version			1.2
@@ -21,13 +22,13 @@
 master_sites		sourceforge
 checksums		md5 4fbd8f9e8a3912c3b86bbe4a69ed29cd
 
-depends_lib		port:perl5.12
-depends_run		port:p5.12-mail-pop3client \
-				port:p5.12-mime-lite \
-				port:p5.12-term-readkey
+depends_lib		port:perl${perl5.major}
+depends_run		port:p${perl5.major}-mail-pop3client \
+				port:p${perl5.major}-mime-lite \
+				port:p${perl5.major}-term-readkey
 
 configure	{
-	reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.12|g" ${worksrcpath}/pemail.pl
+	reinplace "s|/usr/bin/perl|${prefix}/bin/perl${perl5.major}|g" ${worksrcpath}/pemail.pl
 }
 
 build			{}
Index: mail/sympa/Portfile
===================================================================
--- mail/sympa/Portfile	(revision 93513)
+++ mail/sympa/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem	1.0
+PortGroup			perl5	1.0
 
 name			sympa
 version			5.4.7
@@ -33,30 +34,30 @@
 			port:mod_fcgid \
 			port:openssl \
 			port:postfix \
-			port:p5.12-libwww-perl \
-			port:p5.12-archive-zip \
-			port:p5.12-convert-asn1 \
-			port:p5.12-pathtools \
-			port:p5.12-dbi \
-			port:p5.12-dbd-mysql \
-			port:p5.12-mailtools \
-			port:p5.12-io-stringy \
-			port:p5.12-mime-tools \
-			port:p5.12-mime-charset \
-			port:p5.12-mime-encwords \
-			port:p5.12-crypt-openssl-x509 \
-			port:p5.12-fcgi \
-			port:p5.12-libintl-perl \
-			port:p5.12-template-toolkit \
-			port:p5.12-crypt-ciphersaber \
-			port:p5.12-mhonarc \
-			port:p5.12-regexp-common \
-			port:p5.12-xml-libxml \
-			port:p5.12-io-socket-ssl \
-			port:p5.12-soap-lite \
-			port:p5.12-perl-ldap \
-			port:p5.12-html-format \
-			port:p5.12-html-stripscripts-parser
+			port:p${perl5.major}-libwww-perl \
+			port:p${perl5.major}-archive-zip \
+			port:p${perl5.major}-convert-asn1 \
+			port:p${perl5.major}-pathtools \
+			port:p${perl5.major}-dbi \
+			port:p${perl5.major}-dbd-mysql \
+			port:p${perl5.major}-mailtools \
+			port:p${perl5.major}-io-stringy \
+			port:p${perl5.major}-mime-tools \
+			port:p${perl5.major}-mime-charset \
+			port:p${perl5.major}-mime-encwords \
+			port:p${perl5.major}-crypt-openssl-x509 \
+			port:p${perl5.major}-fcgi \
+			port:p${perl5.major}-libintl-perl \
+			port:p${perl5.major}-template-toolkit \
+			port:p${perl5.major}-crypt-ciphersaber \
+			port:p${perl5.major}-mhonarc \
+			port:p${perl5.major}-regexp-common \
+			port:p${perl5.major}-xml-libxml \
+			port:p${perl5.major}-io-socket-ssl \
+			port:p${perl5.major}-soap-lite \
+			port:p${perl5.major}-perl-ldap \
+			port:p${perl5.major}-html-format \
+			port:p${perl5.major}-html-stripscripts-parser
 
 configure.args		--with-bindir=${prefix}/bin/${name} \
                         --with-sbindir=${prefix}/bin/${name} \
@@ -80,7 +81,7 @@
                         --with-spooldir=${prefix}/var/${name}/spool \
 \
                         --with-mandir=${prefix}/man \
-                        --with-perl=${prefix}/bin/perl5.12 \
+                        --with-perl=${prefix}/bin/perl${perl5.major} \
                         --with-openssl=${prefix}/bin/openssl \
 \
                         --with-user=www \
@@ -91,8 +92,8 @@
                         --with-postmap=${prefix}/sbin/postmap
 
 variant postgresql {
-    depends_lib-append      port:p5.12-dbd-pg
-    depends_lib-delete      port:p5.12-dbd-mysql
+    depends_lib-append      port:p${perl5.major}-dbd-pg
+    depends_lib-delete      port:p${perl5.major}-dbd-mysql
 }
 
 variant server  {
Index: mail/postgrey/Portfile
===================================================================
--- mail/postgrey/Portfile	(revision 93513)
+++ mail/postgrey/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem	 1.0
+PortGroup			perl5	1.0
 
 name		 postgrey
 version		 1.32
@@ -23,9 +24,9 @@
 checksums        md5 524a4e165bf997996f3bccade394712f
 
 build.target
-depends_lib-append	port:p5.12-io-multiplex
-depends_lib-append	port:p5.12-net-server
-depends_lib-append	port:p5.12-berkeleydb
+depends_lib-append	port:p${perl5.major}-io-multiplex
+depends_lib-append	port:p${perl5.major}-net-server
+depends_lib-append	port:p${perl5.major}-berkeleydb
 
 startupitem.create      yes
 startupitem.start       "${prefix}/share/postgrey/postgrey.sh start"
@@ -33,7 +34,7 @@
 
 configure {
   system "echo all: > ${worksrcpath}/Makefile"
-  reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.12|g" \
+  reinplace "s|/usr/bin/perl|${prefix}/bin/perl${perl5.major}|g" \
   	${worksrcpath}/postgrey \
 	${worksrcpath}/contrib/postgreyreport
   reinplace "s|/etc/postfix|${prefix}/etc/postgrey|g" \
Index: aqua/PsyncX/Portfile
===================================================================
--- aqua/PsyncX/Portfile	(revision 93513)
+++ aqua/PsyncX/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup			perl5	1.0
 PortGroup           xcode 1.0
 
 name                PsyncX
@@ -23,7 +24,7 @@
 svn.revision        29
 worksrcdir          trunk
 
-depends_lib         port:p5.12-macosx-file
+depends_lib         port:p${perl5.major}-macosx-file
 
 # p5.12-macosx-file is 32-bit only
 supported_archs     i386 ppc
Index: devel/cvsweb/Portfile
===================================================================
--- devel/cvsweb/Portfile	(revision 93513)
+++ devel/cvsweb/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name		cvsweb
 version		3.0.6
@@ -19,12 +20,12 @@
 		ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/scop/
 checksums	md5 0e1eec962b1db00e01b295fff84b6e89
 
-depends_build	port:perl5.12 \
-		port:p5.12-ipc-run \
-		port:p5.12-file-temp \
-		port:p5.12-uri \
-		port:p5.12-mime-types \
-		port:p5.12-string-ediff \
+depends_build	port:perl${perl5.major} \
+		port:p${perl5.major}-ipc-run \
+		port:p${perl5.major}-file-temp \
+		port:p${perl5.major}-uri \
+		port:p${perl5.major}-mime-types \
+		port:p${perl5.major}-string-ediff \
 		port:cvsgraph
 
 use_configure	no
@@ -55,7 +56,7 @@
 	eval xinstall -m 755 [glob ${worksrcpath}/icons/*] ${destroot}${icons_path}
 	eval xinstall -m 755 [glob ${worksrcpath}/css/*] ${destroot}${css_path}
 
-	reinplace "s|#!/usr/bin/perl|#!${prefix}/bin/perl5.12|g" \
+	reinplace "s|#!/usr/bin/perl|#!${prefix}/bin/perl${perl5.major}|g" \
 		"${destroot}${cgi_path}/cvsweb.cgi"
 	reinplace "s|/usr/local/etc/cvsweb/cvsweb.conf|${httpd_conf_path}cvsweb.conf|g" \
 		"${destroot}${cgi_path}/cvsweb.cgi"
Index: devel/git-core/Portfile
===================================================================
--- devel/git-core/Portfile	(revision 93513)
+++ devel/git-core/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup			perl5	1.0
 
 name                git-core
 version             1.7.10.2
@@ -26,10 +27,10 @@
                     sha256  bc57810ec8d87f7a10f320e31ceeb1f9eaf254e62e0f6414af67f17d0cf7d522 \
 
 depends_run         port:rsync \
-                    port:p5.12-error \
-                    port:p5.12-term-readkey
+                    port:p${perl5.major}-error \
+                    port:p${perl5.major}-term-readkey
 
-depends_lib         port:perl5.12 \
+depends_lib         port:perl${perl5.major} \
                     port:curl \
                     port:zlib \
                     port:openssl \
@@ -56,7 +57,7 @@
                     CURLDIR=${prefix} \
                     OPENSSLDIR=${prefix} \
                     ICONVDIR=${prefix} \
-                    PERL_PATH="${prefix}/bin/perl5.12" \
+                    PERL_PATH="${prefix}/bin/perl${perl5.major}" \
                     NO_FINK=1 \
                     NO_DARWIN_PORTS=1 \
                     NO_R_TO_GCC_LINKER=1 \
@@ -149,8 +150,8 @@
 
 variant svn description {Bi-directional subversion repository support} {
     depends_run-append  port:subversion \
-                        port:p5.12-libwww-perl \
-                        port:p5.12-svn-simple
+                        port:p${perl5.major}-libwww-perl \
+                        port:p${perl5.major}-svn-simple
 }
 
 variant bash_completion {
Index: devel/gnome-bindings-perl5/Portfile
===================================================================
--- devel/gnome-bindings-perl5/Portfile	(revision 93513)
+++ devel/gnome-bindings-perl5/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem      1.0
+PortGroup			perl5	1.0
 
 name            gnome-bindings-perl5
 version         2.30.2
@@ -19,14 +20,14 @@
 
 homepage        http://www.gnome.org/
 
-depends_lib     port:p5.12-glib    \
-                port:p5.12-gnome2-canvas    \
-                port:p5.12-gnome2-gconf    \
-                port:p5.12-gnome2-vfs    \
-                port:p5.12-gnome2    \
-                port:p5.12-gtk2-gladexml \
-                port:p5.12-gtk2    \
-                port:p5.12-pango
+depends_lib     port:p${perl5.major}-glib    \
+                port:p${perl5.major}-gnome2-canvas    \
+                port:p${perl5.major}-gnome2-gconf    \
+                port:p${perl5.major}-gnome2-vfs    \
+                port:p${perl5.major}-gnome2    \
+                port:p${perl5.major}-gtk2-gladexml \
+                port:p${perl5.major}-gtk2    \
+                port:p${perl5.major}-pango
 
 distfiles
 
Index: devel/mtn-browse/Portfile
===================================================================
--- devel/mtn-browse/Portfile	(revision 93513)
+++ devel/mtn-browse/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup			perl5	1.0
 
 name                mtn-browse
 version             0.72
@@ -23,16 +24,16 @@
                     sha1    1490c29d7d9e4cea47b594f6848a72b7a1c5265b \
                     rmd160  e2f2bfd767f31c3781f662fb91a73a9e4a7b774e
 
-depends_run         port:p5.12-monotone-automatestdio \
-                    port:p5.12-gnome2 \
-                    port:p5.12-gtk2-gladexml \
-                    port:p5.12-gtk2-sourceview \
-                    port:p5.12-libintl-perl
+depends_run         port:p${perl5.major}-monotone-automatestdio \
+                    port:p${perl5.major}-gnome2 \
+                    port:p${perl5.major}-gtk2-gladexml \
+                    port:p${perl5.major}-gtk2-sourceview \
+                    port:p${perl5.major}-libintl-perl
 
 use_configure       no
 
 build {
-    reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.12|g" \
+    reinplace "s|/usr/bin/perl|${prefix}/bin/perl${perl5.major}|g" \
         ${worksrcpath}/mtn-browse \
         ${worksrcpath}/linux-installer
 }
Index: devel/bugzilla/Portfile
===================================================================
--- devel/bugzilla/Portfile	(revision 93513)
+++ devel/bugzilla/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem		1.0
+PortGroup			perl5	1.0
 
 name			bugzilla
 version			2.22.3
@@ -29,22 +30,22 @@
                         rmd160  787f84e343297b1a8caee8310354e01f7c8cc2f8
 
 depends_lib		port:apache2 \
-			port:perl5.12 \
-			port:p5.12-appconfig \
-			port:p5.12-timedate \
-			port:p5.12-dbi \
-			port:p5.12-dbd-mysql \
-			port:p5.12-xml-parser \
-			port:p5.12-patchreader \
-			port:p5.12-gd \
-			port:p5.12-gdtextutil \
-			port:p5.12-gdgraph \
-			port:p5.12-chart \
-			port:p5.12-template-toolkit \
-			port:p5.12-mime-tools \
+			port:perl${perl5.major} \
+			port:p${perl5.major}-appconfig \
+			port:p${perl5.major}-timedate \
+			port:p${perl5.major}-dbi \
+			port:p${perl5.major}-dbd-mysql \
+			port:p${perl5.major}-xml-parser \
+			port:p${perl5.major}-patchreader \
+			port:p${perl5.major}-gd \
+			port:p${perl5.major}-gdtextutil \
+			port:p${perl5.major}-gdgraph \
+			port:p${perl5.major}-chart \
+			port:p${perl5.major}-template-toolkit \
+			port:p${perl5.major}-mime-tools \
 			port:patchutils \
-			port:p5.12-perl-ldap \
-			port:p5.12-xml-twig
+			port:p${perl5.major}-perl-ldap \
+			port:p${perl5.major}-xml-twig
 
 variant mysql4 conflicts mysql5 description "Use mysql4 database" {
                 depends_lib-append   port:mysql4
@@ -66,7 +67,7 @@
 	}
 	foreach item [glob ${worksrcpath}/*.cgi ${worksrcpath}/*.pl \
                            ${worksrcpath}/contrib/*.pl ${worksrcpath}/docs/*.pl] {
-		reinplace "s%^#!.*perl%#!${prefix}/bin/perl5.12%" ${item}
+		reinplace "s%^#!.*perl%#!${prefix}/bin/perl${perl5.major}%" ${item}
 	}
 	foreach item [glob ${worksrcpath}/*.pl ${worksrcpath}/contrib/*.pl \
                            ${worksrcpath}/Bugzilla/*.pm ${worksrcpath}/docs/html/*.html \
Index: devel/vcheck/Portfile
===================================================================
--- devel/vcheck/Portfile	(revision 93513)
+++ devel/vcheck/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name		vcheck
 version		1.2.1
@@ -18,11 +19,11 @@
 use_bzip2	yes
 checksums	md5 712cb91d13ffb4b347b094c9935abca1
 
-depends_lib	port:perl5.12
-depends_run	port:p5.12-libwww-perl
+depends_lib	port:perl${perl5.major}
+depends_run	port:p${perl5.major}-libwww-perl
 
 patch {
-    reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.12|" ${worksrcpath}/vcheck
+    reinplace "s|/usr/bin/perl|${prefix}/bin/perl${perl5.major}|" ${worksrcpath}/vcheck
 }
 
 use_configure	no
Index: devel/archway/Portfile
===================================================================
--- devel/archway/Portfile	(revision 93513)
+++ devel/archway/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name              archway
 version           0.2.1
@@ -24,6 +25,6 @@
 
 use_configure     no
 build             {}
-destroot.destdir  PERL=${prefix}/bin/perl5.12 DESTDIR=${destroot} prefix=${prefix}
+destroot.destdir  PERL=${prefix}/bin/perl${perl5.major} DESTDIR=${destroot} prefix=${prefix}
 
-depends_lib       port:arch port:p5.12-gtk2
+depends_lib       port:arch port:p${perl5.major}-gtk2
Index: devel/shared-mime-info/Portfile
===================================================================
--- devel/shared-mime-info/Portfile	(revision 93513)
+++ devel/shared-mime-info/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem      1.0
+PortGroup			perl5	1.0
 
 name            shared-mime-info
 version         1.0
@@ -26,7 +27,7 @@
                 port:intltool
 
 # The perl executable should be the one explicitly required by intltool
-configure.env-append  INTLTOOL_PERL=${prefix}/bin/perl5.12
+configure.env-append  INTLTOOL_PERL=${prefix}/bin/perl${perl5.major}
 
 depends_lib     path:lib/pkgconfig/glib-2.0.pc:glib2 \
                 port:libxml2
Index: audio/flac2mp3/Portfile
===================================================================
--- audio/flac2mp3/Portfile	(revision 93513)
+++ audio/flac2mp3/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 name            flac2mp3
 version         20041223
 revision        1
@@ -20,8 +21,8 @@
 build           {}
 destroot        {
         xinstall ${distpath}/${name}${extract.suffix} ${destroot}${prefix}/bin
-        reinplace "s|#!/usr/bin/perl|#!${prefix}/bin/perl5.12|g" \
+        reinplace "s|#!/usr/bin/perl|#!${prefix}/bin/perl${perl5.major}|g" \
             "${destroot}${prefix}/bin/${name}${extract.suffix}"
 }
 
-depends_lib     port:lame port:flac port:p5.12-mp3-info
+depends_lib     port:lame port:flac port:p${perl5.major}-mp3-info
Index: xfce/xfce-utils/Portfile
===================================================================
--- xfce/xfce-utils/Portfile	(revision 93513)
+++ xfce/xfce-utils/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name            xfce-utils
 version         4.6.2
@@ -19,12 +20,12 @@
                 sha1 6373886c3d70e576859741bde747a235567ffd8e \
                 rmd160 06c33863da0f80f16ef154307e4b89085bc3958f
 
-depends_build   port:perl5.12 port:p5.12-xml-parser \
+depends_build   port:perl${perl5.major} port:p${perl5.major}-xml-parser \
                 port:intltool port:pkgconfig
 depends_lib     port:libxfce4util port:libxfcegui4 port:xfconf
 
-configure.env   PERL=${prefix}/bin/perl5.12 \
-                INTLTOOL_PERL=${prefix}/bin/perl5.12
+configure.env   PERL=${prefix}/bin/perl${perl5.major} \
+                INTLTOOL_PERL=${prefix}/bin/perl${perl5.major}
 configure.args  --disable-gdm --with-xsession-prefix=${prefix}
 
 # make sure that midori is added to the browser search list
Index: xfce/xfprint/Portfile
===================================================================
--- xfce/xfprint/Portfile	(revision 93513)
+++ xfce/xfprint/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name            xfprint
 version         4.6.1
@@ -21,9 +22,9 @@
 
 depends_lib     port:libxfcegui4 port:a2ps
 depends_build   port:libxfce4util port:libxfcegui4 port:xfconf \
-                port:intltool port:perl5.12 port:p5.12-xml-parser \
+                port:intltool port:perl${perl5.major} port:p${perl5.major}-xml-parser \
                 port:pkgconfig
-configure.env   INTLTOOL_PERL=${prefix}/bin/perl5.12
+configure.env   INTLTOOL_PERL=${prefix}/bin/perl${perl5.major}
 configure.args  --enable-cups
 
 configure.ldflags-append        "-lXft -lfontconfig -lXrender -lXext -lXinerama -lXrandr"
Index: xfce/exo/Portfile
===================================================================
--- xfce/exo/Portfile	(revision 93513)
+++ xfce/exo/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name            exo
 version         0.3.107
@@ -22,7 +23,7 @@
 configure.args  --mandir=${prefix}/share/man --disable-python
 
 depends_build   port:pkgconfig port:intltool
-depends_lib     port:p5.12-uri port:libxfce4util port:gtk2
+depends_lib     port:p${perl5.major}-uri port:libxfce4util port:gtk2
 
 patchfiles      exo-mmintrin.diff
 
Index: xfce/xfwm4/Portfile
===================================================================
--- xfce/xfwm4/Portfile	(revision 93513)
+++ xfce/xfwm4/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name            xfwm4
 version         4.6.2
@@ -19,10 +20,10 @@
                 sha1 34514db4531e95a7dbcd7d73c8d97e5cb9d1bf89 \
                 rmd160 445e499ca84846222120d607b80b5eac79b422d7
 
-configure.env   INTLTOOL_PERL=${prefix}/bin/perl5.12
+configure.env   INTLTOOL_PERL=${prefix}/bin/perl${perl5.major}
 configure.args  --enable-randr --enable-startup-notification \
                 --disable-compositor --disable-xsync
 depends_lib     port:xfconf port:gtk2 port:dbus-glib port:libwnck \
                 port:libglade2 port:libxfcegui4
-depends_build   port:intltool port:perl5.12 port:p5.12-xml-parser \
+depends_build   port:intltool port:perl${perl5.major} port:p${perl5.major}-xml-parser \
                 port:pkgconfig
Index: xfce/xfce4-appfinder/Portfile
===================================================================
--- xfce/xfce4-appfinder/Portfile	(revision 93513)
+++ xfce/xfce4-appfinder/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name            xfce4-appfinder
 version         4.6.2
@@ -19,7 +20,7 @@
                 sha1 2fa2534aa5a6b2fc24942689a0b7bb7cf327feda \
                 rmd160 81dff99b910e3c2c10567341c7189614825ab657
 
-configure.env   INTLTOOL_PERL=${prefix}/bin/perl5.12
-depends_build   port:intltool port:perl5.12 port:p5.12-xml-parser \
+configure.env   INTLTOOL_PERL=${prefix}/bin/perl${perl5.major}
+depends_build   port:intltool port:perl${perl5.major} port:p${perl5.major}-xml-parser \
                 port:pkgconfig
 depends_lib     port:libxfcegui4 port:libxfce4menu port:thunar
Index: xfce/xfce4-session/Portfile
===================================================================
--- xfce/xfce4-session/Portfile	(revision 93513)
+++ xfce/xfce4-session/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name            xfce4-session
 version         4.6.2
@@ -19,9 +20,9 @@
                 sha1 2a5778a1543f97845f118a186e2dbb8a8ea3ff4b \
                 rmd160 3c45028d57aee5950a485d760799d0c74ada735e
 
-configure.env   INTLTOOL_PERL=${prefix}/bin/perl5.12
+configure.env   INTLTOOL_PERL=${prefix}/bin/perl${perl5.major}
 configure.args  --enable-session-screenshots --disable-gnome
 depends_lib     port:libxfce4util port:libxfcegui4 \
                 port:libwnck bin:iceauth:iceauth
-depends_build   port:intltool port:perl5.12 port:p5.12-xml-parser \
+depends_build   port:intltool port:perl${perl5.major} port:p${perl5.major}-xml-parser \
                 port:pkgconfig
Index: xfce/xfdesktop/Portfile
===================================================================
--- xfce/xfdesktop/Portfile	(revision 93513)
+++ xfce/xfdesktop/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name            xfdesktop
 version         4.6.2
@@ -22,7 +23,7 @@
 depends_lib     port:libxml2 \
                 port:Thunar port:libxfcegui4
 
-configure.env   INTLTOOL_PERL=${prefix}/bin/perl5.12
+configure.env   INTLTOOL_PERL=${prefix}/bin/perl${perl5.major}
 depends_build   port:xfce4-panel port:libglade2 \
-                port:intltool port:perl5.12 port:p5.12-xml-parser \
+                port:intltool port:perl${perl5.major} port:p${perl5.major}-xml-parser \
                 port:pkgconfig
Index: xfce/xfce4-settings/Portfile
===================================================================
--- xfce/xfce4-settings/Portfile	(revision 93513)
+++ xfce/xfce4-settings/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name            xfce4-settings
 version         4.6.5
@@ -19,8 +20,8 @@
                 sha1 c036cc2f3100a46b2649e678dff7c0106b219263 \
                 rmd160 a8155346285921f3087795598989df287be8abb4
 
-configure.env   INTLTOOL_PERL=${prefix}/bin/perl5.12
-depends_build   port:intltool port:perl5.12 port:p5.12-xml-parser \
+configure.env   INTLTOOL_PERL=${prefix}/bin/perl${perl5.major}
+depends_build   port:intltool port:perl${perl5.major} port:p${perl5.major}-xml-parser \
                 port:pkgconfig
 depends_lib     port:libxfcegui4 port:exo port:libwnck
 
Index: net/ftpsync/Portfile
===================================================================
--- net/ftpsync/Portfile	(revision 93513)
+++ net/ftpsync/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name                ftpsync
 version             1.3.04
@@ -21,12 +22,12 @@
 
 supported_archs     noarch
 
-depends_run         port:p5.12-net port:p5.12-libwww-perl
+depends_run         port:p${perl5.major}-net port:p${perl5.major}-libwww-perl
 
 use_bzip2           yes
 
 configure {
-    reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.12|1" ${worksrcpath}/ftpsync.pl
+    reinplace "s|/usr/bin/perl|${prefix}/bin/perl${perl5.major}|1" ${worksrcpath}/ftpsync.pl
 }
 
 build {}
Index: net/munin/Portfile
===================================================================
--- net/munin/Portfile	(revision 93513)
+++ net/munin/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup			perl5	1.0
 
 name                munin
 version             1.4.5
@@ -28,9 +29,9 @@
 checksums           md5     4ae84b9a27b686c3819d8d7b51d8cb4c \
                     sha1    bd1e8ad1fe1cfade1de9c28f3ad69bf35ca495ca \
                     rmd160  883aa4baacfa5be1ec6a83737d5d241c40ad6912
-depends_lib         port:perl5.12 port:p5.12-net-server \
-                    path:bin/config_data:p5.12-module-build \
-                    port:p5.12-net-snmp port:p5.12-net-ssleay
+depends_lib         port:perl${perl5.major} port:p${perl5.major}-net-server \
+                    path:bin/config_data:p${perl5.major}-module-build \
+                    port:p${perl5.major}-net-snmp port:p${perl5.major}-net-ssleay
 
 use_configure       no
 use_parallel_build  no
@@ -38,7 +39,7 @@
                     patch-Makefile.config \
                     patch-munin-node.conf.in
 post-patch {
-    reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.12|" \
+    reinplace "s|/usr/bin/perl|${prefix}/bin/perl${perl5.major}|" \
         ${worksrcpath}/master/_bin/munin-update.in \
         ${worksrcpath}/node/extras/munin-node-sched \
         ${worksrcpath}/node/extras/munin-node-simple.in \
@@ -60,7 +61,7 @@
                     LIBDIR=${prefix}/lib/munin \
                     HTMLDIR=${prefix}/www/munin \
                     CGIDIR=${prefix}/www/cgi-bin \
-                    PERL=${prefix}/bin/perl5.12
+                    PERL=${prefix}/bin/perl${perl5.major}
 destroot.args       PREFIX=${destroot}${prefix} \
                     CONFDIR=${destroot}${prefix}/etc/munin \
                     DBDIR=${destroot}${prefix}/var/munin \
@@ -71,7 +72,7 @@
                     LIBDIR=${destroot}${prefix}/lib/munin \
                     HTMLDIR=${destroot}${prefix}/www/munin \
                     CGIDIR=${destroot}${prefix}/www/cgi-bin \
-                    PERL=${prefix}/bin/perl5.12
+                    PERL=${prefix}/bin/perl${perl5.major}
 destroot.keepdirs   ${destroot}${prefix}/var/log/munin \
                     ${destroot}${prefix}/var/run/munin \
                     ${destroot}${prefix}/etc/munin/plugins \
@@ -87,11 +88,11 @@
 
 variant server description {Install Munin server} {
     depends_lib-append	port:rrdtool \
-			port:p5.12-html-template \
-			port:p5.12-time-hires \
-			port:p5.12-digest-md5 \
-			port:p5.12-text-balanced \
-                        port:p5.12-log-log4perl
+			port:p${perl5.major}-html-template \
+			port:p${perl5.major}-time-hires \
+			port:p${perl5.major}-digest-md5 \
+			port:p${perl5.major}-text-balanced \
+                        port:p${perl5.major}-log-log4perl
     destroot.target-append install-master-prime
 }
 
Index: net/torrentsniff/Portfile
===================================================================
--- net/torrentsniff/Portfile	(revision 93513)
+++ net/torrentsniff/Portfile	(working copy)
@@ -18,8 +18,8 @@
 checksums		md5  3884cac276a990a95ea77738195508aa \
 				sha1 ee683f2fbce004ae2f6daf9589b0d65db529fffb
 
-depends_lib-append		port:p5.12-libwww-perl \
-				port:p5.12-digest-sha1
+depends_lib-append		port:p${perl5.major}-libwww-perl \
+				port:p${perl5.major}-digest-sha1
 
 patchfiles		patch_torrentsniff
 
Index: net/snmptt/Portfile
===================================================================
--- net/snmptt/Portfile	(revision 93513)
+++ net/snmptt/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem        1.0
+PortGroup			perl5	1.0
 
 name              snmptt
 version           1.2
@@ -17,8 +18,8 @@
 distfiles	  ${name}_${version}.tgz
 worksrcdir	  ${name}_${version}
 
-depends_lib       port:perl5.12 \
-		  port:p5.12-config-inifiles
+depends_lib       port:perl${perl5.major} \
+		  port:p${perl5.major}-config-inifiles
 
 use_configure     no
 build             {}
@@ -29,7 +30,7 @@
 set scriptdir	${prefix}/share/${name}
 
 post-patch {
-	reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.12|g" \
+	reinplace "s|/usr/bin/perl|${prefix}/bin/perl${perl5.major}|g" \
 		${worksrcpath}/snmptt \
 		${worksrcpath}/snmptt-net-snmp-test \
 		${worksrcpath}/snmpttconvert \
@@ -89,7 +90,7 @@
 -Edit your snmptrapd.conf (you may use the snmpconf utility) and make sure that
  these items are present.
 
-	traphandle  default ${prefix}/bin/perl5.12 ${prefix}/sbin/snmptt
+	traphandle  default ${prefix}/bin/perl${perl5.major} ${prefix}/sbin/snmptt
 
 \n"
 }
Index: net/GTorrentViewer/Portfile
===================================================================
--- net/GTorrentViewer/Portfile	(revision 93513)
+++ net/GTorrentViewer/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name	 	GTorrentViewer
 version	   	0.2b
@@ -22,7 +23,7 @@
 depends_build	port:pkgconfig
 depends_lib 	lib:libgtk.2:gtk2 \
 		port:curl \
-		port:p5.12-xml-parser
+		port:p${perl5.major}-xml-parser
 
 configure.args	--mandir=${prefix}/share/man --with-curl-config=${prefix}/bin \
 		--disable-gtktest
Index: net/rancid/Portfile
===================================================================
--- net/rancid/Portfile	(revision 93513)
+++ net/rancid/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem	1.0
+PortGroup			perl5	1.0
 
 name				rancid
 version				2.3.6
@@ -19,9 +20,9 @@
 master_sites		        ftp://ftp.shrubbery.net/pub/rancid/
 checksums			md5 603dcc7923b0d34c024490c534362a35
 
-depends_lib                     port:perl5.12 \
+depends_lib                     port:perl${perl5.major} \
 				port:openssl \
-				port:p5.12-lockfile-simple
+				port:p${perl5.major}-lockfile-simple
 
 patchfiles			patch-etc-Makefile.in
 
Index: net/argus-monitor/Portfile
===================================================================
--- net/argus-monitor/Portfile	(revision 93513)
+++ net/argus-monitor/Portfile	(working copy)
@@ -1,5 +1,6 @@
 # $Id$
 PortSystem	1.0
+PortGroup			perl5	1.0
 
 name			argus-monitor
 version			3.5
@@ -15,23 +16,23 @@
 distfiles		argus-${version}.tgz
 worksrcdir		argus-${version}
 
-depends_lib		port:perl5.12 \
+depends_lib		port:perl${perl5.major} \
 			port:postfix \
 			port:openssl \
 			port:freetype \
 			port:gd2 \
 			port:fping \
 			port:db44 \
-			port:p5.12-dbi \
-			port:p5.12-berkeleydb \
-			port:p5.12-socket6 \
-			port:p5.12-gd \
-			port:p5.12-time-hires \
-			port:p5.12-net-ssleay \
-			port:p5.12-digest-hmac \
-			port:p5.12-digest-md5 \
-			port:p5.12-digest-sha1 \
-			port:p5.12-crypt-des
+			port:p${perl5.major}-dbi \
+			port:p${perl5.major}-berkeleydb \
+			port:p${perl5.major}-socket6 \
+			port:p${perl5.major}-gd \
+			port:p${perl5.major}-time-hires \
+			port:p${perl5.major}-net-ssleay \
+			port:p${perl5.major}-digest-hmac \
+			port:p${perl5.major}-digest-md5 \
+			port:p${perl5.major}-digest-sha1 \
+			port:p${perl5.major}-crypt-des
 
 patchfiles		patch-Makefile.tplt
 
Index: net/ddclient/Portfile
===================================================================
--- net/ddclient/Portfile	(revision 93513)
+++ net/ddclient/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name                ddclient
 version             3.8.1
@@ -20,12 +21,12 @@
 checksums           rmd160  7b702d28c47e48ed19eedd6b2e50930f394e9631 \
                     sha256  f22ac7b0ec78e310d7b88a1cf636e5c00360b2ed9c087f231b3522ef3e6295f2
 
-depends_lib         port:p5.12-io-socket-ssl
-depends_run         port:perl5.12
+depends_lib         port:p${perl5.major}-io-socket-ssl
+depends_run         port:perl${perl5.major}
 
 configure   {
         reinplace "s|\[\r\]$||" ${worksrcpath}/${name}
-        reinplace "s|^#!.*/perl.*$|#!${prefix}/bin/perl5.12|" ${worksrcpath}/${name}
+        reinplace "s|^#!.*/perl.*$|#!${prefix}/bin/perl${perl5.major}|" ${worksrcpath}/${name}
         reinplace "s|/etc/|${prefix}/etc/|" ${worksrcpath}/${name}
 }
 
Index: net/nedi/Portfile
===================================================================
--- net/nedi/Portfile	(revision 93513)
+++ net/nedi/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem	1.0
+PortGroup			perl5	1.0
 
 name			nedi
 version			1.0.5
@@ -21,16 +22,16 @@
 worksrcdir		${name}
 checksums		md5 6ed980228483addfdc5caf14430d7570
 
-depends_lib		port:perl5.12 \
+depends_lib		port:perl${perl5.major} \
 			path:bin/mysql_config5:mysql5 \
-			port:p5.12-net-snmp \
-			port:p5.12-net-ssh-perl \
-			port:p5.12-net-telnet \
-			port:p5.12-net-telnet-cisco \
-			port:p5.12-libwww-perl \
-			port:p5.12-algorithm-diff \
-			port:p5.12-dbi \
-			port:p5.12-dbd-mysql \
+			port:p${perl5.major}-net-snmp \
+			port:p${perl5.major}-net-ssh-perl \
+			port:p${perl5.major}-net-telnet \
+			port:p${perl5.major}-net-telnet-cisco \
+			port:p${perl5.major}-libwww-perl \
+			port:p${perl5.major}-algorithm-diff \
+			port:p${perl5.major}-dbi \
+			port:p${perl5.major}-dbd-mysql \
 			port:rrdtool \
 			port:fping
 
@@ -59,7 +60,7 @@
 
 post-destroot {
 # Fix general paths
-       eval reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.12|g" \
+       eval reinplace "s|/usr/bin/perl|${prefix}/bin/perl${perl5.major}|g" \
                 [glob ${destroot}${nedidir}/*.pl] \
 		[glob ${destroot}${nedidir}/inc/*.pl] \
                 [glob ${destroot}${nedidir}/html/inc/*.pl] \
Index: net/shelldap/Portfile
===================================================================
--- net/shelldap/Portfile	(revision 93513)
+++ net/shelldap/Portfile	(working copy)
@@ -22,16 +22,16 @@
                     sha1    f06fabca2e3b7c41360cd9c2bbddbc45f8836ca4 \
                     rmd160  2aae3bfc0f8d00dec4cdd9ad9634606b49a185c2
 
-depends_lib-append 	port:p5.12-perl-ldap \
-			port:p5.12-term-shell \
-			port:p5.12-yaml-syck \
-			port:p5.12-algorithm-diff \
-			port:p5.12-digest-hmac \
-			port:p5.12-term-readline-gnu \
-			port:p5.12-term-readkey
+depends_lib-append 	port:p${perl5.major}-perl-ldap \
+			port:p${perl5.major}-term-shell \
+			port:p${perl5.major}-yaml-syck \
+			port:p${perl5.major}-algorithm-diff \
+			port:p${perl5.major}-digest-hmac \
+			port:p${perl5.major}-term-readline-gnu \
+			port:p${perl5.major}-term-readkey
 
 patch {
-	reinplace "s|#!.*perl|#!${prefix}/bin/perl5.12|" ${worksrcpath}/shelldap
+	reinplace "s|#!.*perl|#!${prefix}/bin/perl${perl5.major}|" ${worksrcpath}/shelldap
 }
 
 use_configure		no
Index: net/nagios-plugins/Portfile
===================================================================
--- net/nagios-plugins/Portfile	(revision 93513)
+++ net/nagios-plugins/Portfile	(working copy)
@@ -24,10 +24,10 @@
 destroot.destdir        prefix=${prefix} DESTDIR=${destroot}
 
 depends_build		port:fping \
-			port:p5.12-net-snmp \
-			port:p5.12-digest-sha1 \
-			port:p5.12-digest-hmac \
-			port:p5.12-crypt-des \
+			port:p${perl5.major}-net-snmp \
+			port:p${perl5.major}-digest-sha1 \
+			port:p${perl5.major}-digest-hmac \
+			port:p${perl5.major}-crypt-des \
 			port:openssl
 
 configure.args		--sbindir=${prefix}/share/nagios/cgi-bin \
Index: net/mosh/Portfile
===================================================================
--- net/mosh/Portfile	(revision 93513)
+++ net/mosh/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem              1.0
+PortGroup			perl5	1.0
 
 name                    mosh
 version                 1.2
@@ -22,12 +23,12 @@
 depends_build           port:pkgconfig
 
 depends_lib             port:ncurses \
-                        port:p5.12-io-tty \
+                        port:p${perl5.major}-io-tty \
                         port:protobuf-cpp \
                         port:zlib
 
 post-patch {
-    reinplace "s|#!/usr/bin/env perl|#!${prefix}/bin/perl5.12|" ${worksrcpath}/scripts/mosh
+    reinplace "s|#!/usr/bin/env perl|#!${prefix}/bin/perl${perl5.major}|" ${worksrcpath}/scripts/mosh
 }
 
 livecheck.type          regex
Index: net/vantages/Portfile
===================================================================
--- net/vantages/Portfile	(revision 93513)
+++ net/vantages/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem              1.0
+PortGroup			perl5	1.0
 
 name                    vantages
 version                 0.8.8b
@@ -44,7 +45,7 @@
                         port:libtool \
                         port:libpcap \
                         port:openssl \
-                        port:p5.12-term-readkey \
+                        port:p${perl5.major}-term-readkey \
                         port:sqlite3
 
 use_autoreconf          yes
Index: net/snownews/Portfile
===================================================================
--- net/snownews/Portfile	(revision 93513)
+++ net/snownews/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup			perl5	1.0
 
 name                snownews
 version             1.5.12
@@ -24,11 +25,11 @@
 
 depends_lib         port:libxml2 \
                     port:gettext \
-                    port:p5.12-xml-libxml
+                    port:p${perl5.major}-xml-libxml
 
 post-patch {
     # We want to use perl from MacPorts.
-    reinplace s|/usr/bin/perl|${prefix}/bin/perl5.12| ${worksrcpath}/opml2snow
+    reinplace s|/usr/bin/perl|${prefix}/bin/perl${perl5.major}| ${worksrcpath}/opml2snow
 }
 
 build.args          EXTRA_CFLAGS="-I${prefix}/include" \
Index: net/monarch/Portfile
===================================================================
--- net/monarch/Portfile	(revision 93513)
+++ net/monarch/Portfile	(working copy)
@@ -1,5 +1,6 @@
 # $Id$
 PortSystem      1.0
+PortGroup			perl5	1.0
 
 name                    monarch
 version                 2.5.0
@@ -15,15 +16,15 @@
 patchfiles              patch-nmap_scan-nmap_scan.c
 depends_build		port:nagios
 depends_lib             path:bin/mysql_config5:mysql5 \
-			port:p5.12-libwww-perl \
-			port:p5.12-xml-namespacesupport \
-			port:p5.12-xml-sax \
-			port:p5.12-xml-libxml \
-			port:p5.12-nmap-scanner \
-			port:p5.12-dbi \
-			port:p5.12-dbd-mysql \
-			port:p5.12-cgi-ajax \
-			port:p5.12-class-accessor
+			port:p${perl5.major}-libwww-perl \
+			port:p${perl5.major}-xml-namespacesupport \
+			port:p${perl5.major}-xml-sax \
+			port:p${perl5.major}-xml-libxml \
+			port:p${perl5.major}-nmap-scanner \
+			port:p${perl5.major}-dbi \
+			port:p${perl5.major}-dbd-mysql \
+			port:p${perl5.major}-cgi-ajax \
+			port:p${perl5.major}-class-accessor
 patch.post_args		-F 3
 use_configure		no
 build {}
@@ -43,13 +44,13 @@
 }
 
 post-destroot {
-        eval reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.12|g" \
+        eval reinplace "s|/usr/bin/perl|${prefix}/bin/perl${perl5.major}|g" \
                 [glob ${destroot}${monarchdir}/*.pl]
 
-	eval reinplace "s|/usr/local/groundwork/bin/perl|${prefix}/bin/perl5.12|g" \
+	eval reinplace "s|/usr/local/groundwork/bin/perl|${prefix}/bin/perl${perl5.major}|g" \
 		[glob ${destroot}${monarchdir}/*.cgi]
 
-        eval reinplace "s|/usr/local/groundwork/bin/perl|${prefix}/bin/perl5.12|g" \
+        eval reinplace "s|/usr/local/groundwork/bin/perl|${prefix}/bin/perl${perl5.major}|g" \
                 [glob ${destroot}${monarchdir}/*.p*]  
 
         eval reinplace "s|/usr/local/groundwork/monarch|${monarchdir}|g" \
Index: net/fwknop/Portfile
===================================================================
--- net/fwknop/Portfile	(revision 93513)
+++ net/fwknop/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 name		fwknop
 version		1.9.12
 revision    1
@@ -40,20 +41,20 @@
 
 use_bzip2	yes
 
-depends_lib	port:p5.12-crypt-cbc \
-		port:p5.12-crypt-rijndael \
-		port:p5.12-digest-sha \
-		port:p5.12-net-ipv4addr \
-		port:p5.12-net-ping-external \
-		port:p5.12-term-readkey \
-		port:p5.12-unix-syslog
+depends_lib	port:p${perl5.major}-crypt-cbc \
+		port:p${perl5.major}-crypt-rijndael \
+		port:p${perl5.major}-digest-sha \
+		port:p${perl5.major}-net-ipv4addr \
+		port:p${perl5.major}-net-ping-external \
+		port:p${perl5.major}-term-readkey \
+		port:p${perl5.major}-unix-syslog
 
 use_configure	no
 build		{}
 
 destroot {
-	system "cd ${worksrcpath} && ${prefix}/bin/perl5.12 -w -p -i -e 's:^#!/usr/bin/perl -w$:#!${prefix}/bin/perl5.12 -w:' fwknop"
-	system "cd ${worksrcpath} && ${prefix}/bin/perl5.12 -w -p -i -e 's:^use lib ./usr/lib/fwknop.;::' fwknop"
+	system "cd ${worksrcpath} && ${prefix}/bin/perl${perl5.major} -w -p -i -e 's:^#!/usr/bin/perl -w$:#!${prefix}/bin/perl${perl5.major} -w:' fwknop"
+	system "cd ${worksrcpath} && ${prefix}/bin/perl${perl5.major} -w -p -i -e 's:^use lib ./usr/lib/fwknop.;::' fwknop"
 	xinstall -m 755 ${worksrcpath}/fwknop ${destroot}${prefix}/bin
 	xinstall -m 644 ${worksrcpath}/fwknop.8 ${destroot}${prefix}/share/man/man8
 }
Index: net/sendpage/Portfile
===================================================================
--- net/sendpage/Portfile	(revision 93513)
+++ net/sendpage/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem	1.0
+PortGroup			perl5	1.0
 
 name			sendpage
 version			1.000003
@@ -20,10 +21,10 @@
 master_sites	sourceforge
 checksums		md5 586afe41d6cd82d045fdc34ccf99cab3
 
-depends_lib port:p5.12-net-snpp \
-			port:p5.12-device-serialport \
-			port:p5.12-mailtools \
-			port:p5.12-dbi
+depends_lib port:p${perl5.major}-net-snpp \
+			port:p${perl5.major}-device-serialport \
+			port:p${perl5.major}-mailtools \
+			port:p${perl5.major}-dbi
 
 use_configure		no
 build {}
@@ -68,7 +69,7 @@
 }
 
 destroot {
-		system "cd ${worksrcpath} && ${prefix}/bin/perl5.12 Makefile.PL"
+		system "cd ${worksrcpath} && ${prefix}/bin/perl${perl5.major} Makefile.PL"
 		system "cd ${worksrcpath} && make"
 		system "cd ${worksrcpath} && make install"
 }
Index: net/nfsen/Portfile
===================================================================
--- net/nfsen/Portfile	(revision 93513)
+++ net/nfsen/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem      1.0
+PortGroup			perl5	1.0
 
 name            nfsen
 version         1.3
@@ -17,10 +18,10 @@
 
 checksums       md5 1c4f057bbb3766090b40bda3ab6b81d2
 
-depends_lib     port:perl5.12 \
+depends_lib     port:perl${perl5.major} \
                 port:rrdtool \
-                port:p5.12-mailtools \
-                port:p5.12-sys-syslog \
+                port:p${perl5.major}-mailtools \
+                port:p${perl5.major}-sys-syslog \
                 port:nfdump
 
 patchfiles      patch-install.pl.diff \
@@ -58,7 +59,7 @@
                 ${worksrcpath}/install.pl
         eval reinplace "s|__PREFIX__|${prefix}|g" \
                 [glob ${worksrcpath}/bin/*]
-        eval reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.12|g" \
+        eval reinplace "s|/usr/bin/perl|${prefix}/bin/perl${perl5.major}|g" \
                 [glob ${worksrcpath}/installer-items/*.pm]
 }
 
@@ -79,7 +80,7 @@
 # Set profiles-stat and profiles-data to destroot until install is done
         reinplace "s|\${VARDIR}/profiles|${destroot}${prefix}/var/nfsen/profiles|g" \
                 ${worksrcpath}/etc/nfsen-dist.conf
-        system -W ${worksrcpath} "${prefix}/bin/perl5.12 ./install.pl ./etc/nfsen-dist.conf"
+        system -W ${worksrcpath} "${prefix}/bin/perl${perl5.major} ./install.pl ./etc/nfsen-dist.conf"
 
 # Replace the original .conf file
         file rename -force ${destroot}${prefix}/etc/nfsen-dist.conf.org \
Index: net/smokeping/Portfile
===================================================================
--- net/smokeping/Portfile	(revision 93513)
+++ net/smokeping/Portfile	(working copy)
@@ -27,19 +27,19 @@
 			patch-etc-config.dist \
 			patch-htdocs-smokeping.cgi.dist
 
-depends_lib-append	port:perl5.12 \
+depends_lib-append	port:perl${perl5.major} \
 			port:rrdtool \
-			port:p5.12-libwww-perl \
-			port:p5.12-cgi-speedycgi \
-			port:p5.12-socket6 \
-			port:p5.12-net-snmp \
-			port:p5.12-net-telnet \
-			port:p5.12-net-dns \
-			port:p5.12-net-radius \
-			port:p5.12-perl-ldap \
-			port:p5.12-io-socket-ssl \
-			port:p5.12-pathtools \
-			port:p5.12-snmp_session \
+			port:p${perl5.major}-libwww-perl \
+			port:p${perl5.major}-cgi-speedycgi \
+			port:p${perl5.major}-socket6 \
+			port:p${perl5.major}-net-snmp \
+			port:p${perl5.major}-net-telnet \
+			port:p${perl5.major}-net-dns \
+			port:p${perl5.major}-net-radius \
+			port:p${perl5.major}-perl-ldap \
+			port:p${perl5.major}-io-socket-ssl \
+			port:p${perl5.major}-pathtools \
+			port:p${perl5.major}-snmp_session \
 			port:fping \
 			port:echoping \
 			port:curl
@@ -82,7 +82,7 @@
                 [glob ${worksrcpath}/bin/*.dist] \
                 [glob ${worksrcpath}/htdocs/*.dist]
 
-	eval reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.12|g" \
+	eval reinplace "s|/usr/bin/perl|${prefix}/bin/perl${perl5.major}|g" \
                 [glob ${worksrcpath}/bin/*.dist] \
                 [glob ${worksrcpath}/etc/*.dist] \
                 [glob ${worksrcpath}/htdocs/*.dist]
Index: net/mediaserv/Portfile
===================================================================
--- net/mediaserv/Portfile	(revision 93513)
+++ net/mediaserv/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name            mediaserv
 version         0.05
@@ -32,12 +33,12 @@
                 rmd160 78e824cd8b28effc58543e75aaf63e2cdc958941
 worksrcdir      ${name}
 
-depends_run     port:perl5.12 port:p5.12-libwww-perl port:p5.12-xml-rss \
-                port:p5.12-datetime port:MPlayer port:tablet-encode
+depends_run     port:perl${perl5.major} port:p${perl5.major}-libwww-perl port:p${perl5.major}-xml-rss \
+                port:p${perl5.major}-datetime port:MPlayer port:tablet-encode
 
 patchfiles      patch-mediaserv.diff patch-install_sh.diff
 post-patch {
-    reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.12|g" \
+    reinplace "s|/usr/bin/perl|${prefix}/bin/perl${perl5.major}|g" \
         ${worksrcpath}/mediaserv
     reinplace "s|@@STATIC_DIR@@|${prefix}/share/${name}|g" \
         ${worksrcpath}/install.sh
Index: net/nrg/Portfile
===================================================================
--- net/nrg/Portfile	(revision 93513)
+++ net/nrg/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem	1.0
+PortGroup			perl5	1.0
 
 name				nrg
 version				0.99.27
@@ -20,7 +21,7 @@
 master_sites		        ftp://noc.hep.wisc.edu/src/nrg/ \
 				ftp://noc.hep.wisc.edu/pub/src/nrg/
 checksums			md5 c38e6b27bc99f8f7fd825bc6e1a44f68
-depends_lib			port:rrdtool port:p5.12-time-hires
+depends_lib			port:rrdtool port:p${perl5.major}-time-hires
 patchfiles			patch-nrg-discover-tcp.in.diff
 
 configure.pre_args		--prefix=${prefix}/var/${name}
Index: sysutils/rsnapshot/Portfile
===================================================================
--- sysutils/rsnapshot/Portfile	(revision 93513)
+++ sysutils/rsnapshot/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name                rsnapshot
 version             1.3.1
@@ -22,11 +23,11 @@
                     rmd160  948ee5669c5da0728f607007da4d5fbbcfcdd8c7 \
                     sha256  94b6c77e40628935f42a191bdc28ad93b1f132fde456ee76ee87763f1eddc75e
 
-depends_lib         port:rsync port:p5.12-lchown bin:ssh:openssh
+depends_lib         port:rsync port:p${perl5.major}-lchown bin:ssh:openssh
 
 configure.args      --mandir=${prefix}/share/man \
                     --with-rsync=${prefix}/bin/rsync \
-                    --with-perl=${prefix}/bin/perl5.12
+                    --with-perl=${prefix}/bin/perl${perl5.major}
 
 test.run            yes
 
Index: sysutils/dirvish/Portfile
===================================================================
--- sysutils/dirvish/Portfile	(revision 93513)
+++ sysutils/dirvish/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem      1.0
+PortGroup			perl5	1.0
 
 name            dirvish
 version         1.2.1
@@ -51,4 +52,4 @@
 
 destroot.args   PREFIX=${prefix}
 
-depends_lib     port:p5.12-time-modules port:p5.12-timedate port:p5.12-time-period port:rsync
+depends_lib     port:p${perl5.major}-time-modules port:p${perl5.major}-timedate port:p${perl5.major}-time-period port:rsync
Index: sysutils/xserve-raid-tools/Portfile
===================================================================
--- sysutils/xserve-raid-tools/Portfile	(revision 93513)
+++ sysutils/xserve-raid-tools/Portfile	(working copy)
@@ -1,5 +1,6 @@
 # $Id$
 PortSystem      1.0
+PortGroup			perl5	1.0
 
 name                    xserve-raid-tools
 version                 1.2
@@ -18,7 +19,7 @@
 master_sites            ftp://noc.hep.wisc.edu/pub/src/xserve-raid-tools/
 checksums               md5 fe7d8400a6c85e73cfc5af1f6869a92d
 
-depends_lib		port:p5.12-xml-parser \
+depends_lib		port:p${perl5.major}-xml-parser \
 			port:netcat
 
 variant nagios_plugin {
Index: sysutils/sleuthkit/Portfile
===================================================================
--- sysutils/sleuthkit/Portfile	(revision 93513)
+++ sysutils/sleuthkit/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup			perl5	1.0
 
 name                sleuthkit
 version             3.2.3
@@ -28,9 +29,9 @@
                     sha256  ba5f63d7fd60d978de03777c72b1571004caa8dfe384f09757b6a8efa890ea62
 
 depends_build       port:file \
-                    port:perl5.12
+                    port:perl${perl5.major}
 depends_lib         port:openssl \
-                    port:p5.12-datemanip \
+                    port:p${perl5.major}-datemanip \
                     port:zlib
 
 configure.args      --mandir=${prefix}/share/man
Index: sysutils/backuppc/Portfile
===================================================================
--- sysutils/backuppc/Portfile	(revision 93513)
+++ sysutils/backuppc/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem            1.0
+PortGroup			perl5	1.0
 name                  backuppc
 categories            sysutils
 version                3.1.0
@@ -14,10 +15,10 @@
 
 master_sites          sourceforge
 
-depends_lib            port:perl5.12 \
-                      port:p5.12-compress-raw-zlib \
-                      port:p5.12-archive-zip \
-                      port:p5.12-file-rsyncp \
+depends_lib            port:perl${perl5.major} \
+                      port:p${perl5.major}-compress-raw-zlib \
+                      port:p${perl5.major}-archive-zip \
+                      port:p${perl5.major}-file-rsyncp \
                       port:samba3 \
                       port:gnutar \
                       port:mod_perl2 \
@@ -100,7 +101,7 @@
   xinstall -d -m 770 -g backuppc -o backuppc ${destroot}${prefix}/var/log/BackupPC
 
   # create backup directory
-  system "cd ${worksrcpath} && ${prefix}/bin/perl5.12 configure.pl ${configure.args}"
+  system "cd ${worksrcpath} && ${prefix}/bin/perl${perl5.major} configure.pl ${configure.args}"
   xinstall -d -m 755 ${destroot}${prefix}/share/doc/
   move ${destroot}${prefix}/doc ${destroot}${prefix}/share/doc/BackupPC
 
Index: sysutils/cssh/Portfile
===================================================================
--- sysutils/cssh/Portfile	(revision 93513)
+++ sysutils/cssh/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup			perl5	1.0
 
 name                cssh
 version             3.22
@@ -27,8 +28,8 @@
 
 distname            clusterssh-${version}
 
-depends_lib         port:p5.12-tk \
-                    port:p5.12-x11-protocol
+depends_lib         port:p${perl5.major}-tk \
+                    port:p${perl5.major}-x11-protocol
 
 depends_run         port:xterm
 
Index: sysutils/rpm52/Portfile
===================================================================
--- sysutils/rpm52/Portfile	(revision 93513)
+++ sysutils/rpm52/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name			rpm52
 version			5.2.1
@@ -133,13 +134,13 @@
 	configure.env-append	__PERL=${prefix}/bin/perl5.10
 }
 
-variant perl5_12 description { use perl 5.12 instead of perl 5.8 } {
+variant perl${perl5.major} description { use perl 5.12 instead of perl 5.8 } {
 	depends_build-delete	port:perl5.8
-	depends_build-append	port:perl5.12
+	depends_build-append	port:perl${perl5.major}
 	configure.env-delete	PERL=${prefix}/bin/perl5.8
-	configure.env-append	PERL=${prefix}/bin/perl5.12
+	configure.env-append	PERL=${prefix}/bin/perl${perl5.major}
 	configure.env-delete	__PERL=${prefix}/bin/perl5.8
-	configure.env-append	__PERL=${prefix}/bin/perl5.12
+	configure.env-append	__PERL=${prefix}/bin/perl${perl5.major}
 }
 
 livecheck.type	regex
Index: sysutils/rpm53/Portfile
===================================================================
--- sysutils/rpm53/Portfile	(revision 93513)
+++ sysutils/rpm53/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name			rpm53
 version			5.3.11
@@ -153,13 +154,13 @@
 	configure.env-append	__PERL=${prefix}/bin/perl5.10
 }
 
-variant perl5_12 description { use perl 5.12 instead of perl 5.8 } {
+variant perl${perl5.major} description { use perl 5.12 instead of perl 5.8 } {
 	depends_build-delete	port:perl5.8
-	depends_build-append	port:perl5.12
+	depends_build-append	port:perl${perl5.major}
 	configure.env-delete	PERL=${prefix}/bin/perl5.8
-	configure.env-append	PERL=${prefix}/bin/perl5.12
+	configure.env-append	PERL=${prefix}/bin/perl${perl5.major}
 	configure.env-delete	__PERL=${prefix}/bin/perl5.8
-	configure.env-append	__PERL=${prefix}/bin/perl5.12
+	configure.env-append	__PERL=${prefix}/bin/perl${perl5.major}
 }
 
 livecheck.type	regex
Index: sysutils/rpm54/Portfile
===================================================================
--- sysutils/rpm54/Portfile	(revision 93513)
+++ sysutils/rpm54/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name			rpm54
 version			5.4.9
@@ -134,13 +135,13 @@
 	configure.env-append	__PYTHON=${prefix}/bin/python2.7
 }
 
-variant perl5_12 description { use perl 5.12 instead of perl 5.10 } {
+variant perl${perl5.major} description { use perl 5.12 instead of perl 5.10 } {
 	depends_build-delete	port:perl5.10
-	depends_build-append	port:perl5.12
+	depends_build-append	port:perl${perl5.major}
 	configure.env-delete	PERL=${prefix}/bin/perl5.10
-	configure.env-append	PERL=${prefix}/bin/perl5.12
+	configure.env-append	PERL=${prefix}/bin/perl${perl5.major}
 	configure.env-delete	__PERL=${prefix}/bin/perl5.10
-	configure.env-append	__PERL=${prefix}/bin/perl5.12
+	configure.env-append	__PERL=${prefix}/bin/perl${perl5.major}
 }
 
 livecheck.type	regex
Index: sysutils/openbrowser/Portfile
===================================================================
--- sysutils/openbrowser/Portfile	(revision 93513)
+++ sysutils/openbrowser/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem              1.0
+PortGroup			perl5	1.0
 
 name                    openbrowser
 version                 1.0.1
@@ -23,7 +24,7 @@
 
 distfiles
 
-depends_run             port:p5.12-mac-propertylist
+depends_run             port:p${perl5.major}-mac-propertylist
 
 universal_variant       no
 
@@ -34,7 +35,7 @@
 }
 
 build {
-    reinplace "s|/usr/bin/env perl|${prefix}/bin/perl5.12|g" ${worksrcpath}/${name}
+    reinplace "s|/usr/bin/env perl|${prefix}/bin/perl${perl5.major}|g" ${worksrcpath}/${name}
 }
 
 destroot {
Index: tex/LaTeXML/Portfile
===================================================================
--- tex/LaTeXML/Portfile	(revision 93513)
+++ tex/LaTeXML/Portfile	(working copy)
@@ -4,6 +4,7 @@
 # (draft)
 #======================================================================
 PortSystem 1.0
+PortGroup			perl5	1.0
 name LaTeXML
 version 0.7.0
 revision 1
@@ -26,10 +27,10 @@
 # openssl rmd160 LaTeXML-0.7.0.tar.gz
 #============================================================
 # Dependencies
-depends_lib port:p5.12-parse-recdescent \
-  	    port:p5.12-xml-libxml \
-  	    port:p5.12-xml-libxslt \
-  	    port:p5.12-perlmagick \
+depends_lib port:p${perl5.major}-parse-recdescent \
+  	    port:p${perl5.major}-xml-libxml \
+  	    port:p${perl5.major}-xml-libxslt \
+  	    port:p${perl5.major}-perlmagick \
 	    bin:texhash:texlive
 # That last seems to be the way to depend on TeX
 # being installed, without necessarily requiring
@@ -39,7 +40,7 @@
 #============================================================
 # Configuration
 # Override configure to do it the perl way.
-configure.cmd ${prefix}/bin/perl5.12 Makefile.PL
+configure.cmd ${prefix}/bin/perl${perl5.major} Makefile.PL
 
 # Note that installation does
 #   make install DESTDIR=${destroot}
Index: tex/biblatex-biber/Portfile
===================================================================
--- tex/biblatex-biber/Portfile	(revision 93513)
+++ tex/biblatex-biber/Portfile	(working copy)
@@ -10,7 +10,7 @@
 # before updating this port.
 name            biblatex-biber
 epoch           1
-if {[variant_isset perl5_12]} { perl5.default_branch 5.12 }
+if {[variant_isset perl${perl5.major}]} { perl5.default_branch 5.12 }
 if {[variant_isset perl5_14]} { perl5.default_branch 5.14 }
 perl5.setup     Biber 0.9.3
 revision        1
@@ -32,10 +32,10 @@
 supported_archs noarch
 homepage        http://biblatex-biber.sourceforge.net/
 
-variant perl5_12 description "use perl version 5.12" conflicts perl5_14 {}
-variant perl5_14 description "use perl version 5.14" conflicts perl5_12 {}
+variant perl${perl5.major} description "use perl version 5.12" conflicts perl5_14 {}
+variant perl5_14 description "use perl version 5.14" conflicts perl${perl5.major} {}
 if {![variant_isset perl5_14]} {
-    default_variants +perl5_12
+    default_variants +perl${perl5.major}
 }
 
 master_sites    sourceforge:project/${name}/${name}/${version}
Index: gnome/gnucash/Portfile
===================================================================
--- gnome/gnucash/Portfile	(revision 93513)
+++ gnome/gnucash/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem        1.0
+PortGroup			perl5	1.0
 
 name              gnucash
 version           2.4.10
@@ -40,7 +41,7 @@
 post-patch {
     # gnc-fq-dump needs to be patched to use MacPorts perl.
     # (autoconf takes care of the other perl scripts.)
-    reinplace "s|^#!/usr/bin/perl|#!${prefix}/bin/perl5.12|" ${worksrcpath}/src/quotes/gnc-fq-dump
+    reinplace "s|^#!/usr/bin/perl|#!${prefix}/bin/perl${perl5.major}|" ${worksrcpath}/src/quotes/gnc-fq-dump
 }
 
 depends_build     port:pkgconfig \
@@ -54,7 +55,7 @@
                   port:webkit-gtk \
                   port:goffice \
                   port:aqbanking5-gtk \
-                  port:p5.12-finance-quote
+                  port:p${perl5.major}-finance-quote
 
 depends_run       port:evince
 
Index: gnome/anjuta/Portfile
===================================================================
--- gnome/anjuta/Portfile	(revision 93513)
+++ gnome/anjuta/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem      1.0
+PortGroup			perl5	1.0
 PortGroup       muniversal 1.0
 
 name            anjuta
@@ -25,7 +26,7 @@
                 port:intltool \
                 port:gnome-doc-utils \
                 port:gtk-doc \
-                port:p5.12-locale-gettext
+                port:p${perl5.major}-locale-gettext
 
 depends_lib     port:autogen \
                 port:gconf \
@@ -37,10 +38,10 @@
 depends_run     port:rarian
 
 post-patch {
-        reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.12|" ${worksrcpath}/scripts/builder2schema.pl
+        reinplace "s|/usr/bin/perl|${prefix}/bin/perl${perl5.major}|" ${worksrcpath}/scripts/builder2schema.pl
 }
 
-configure.perl  ${prefix}/bin/perl5.12
+configure.perl  ${prefix}/bin/perl${perl5.major}
 configure.args  --enable-static \
                 --disable-scrollkeeper \
                 --disable-schemas-install \
Index: gnome/system-tools-backends/Portfile
===================================================================
--- gnome/system-tools-backends/Portfile	(revision 93513)
+++ gnome/system-tools-backends/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem      1.0
+PortGroup			perl5	1.0
 
 name            system-tools-backends
 version         2.10.2
@@ -32,7 +33,7 @@
 
 depends_lib     port:dbus-glib \
                 port:policykit \
-                port:p5.12-net-dbus
+                port:p${perl5.major}-net-dbus
 
 livecheck.type  regex
 livecheck.url   http://ftp.gnome.org/pub/gnome/sources/${name}/${branch}/
Index: gnome/icon-naming-utils/Portfile
===================================================================
--- gnome/icon-naming-utils/Portfile	(revision 93513)
+++ gnome/icon-naming-utils/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem        1.0
+PortGroup			perl5	1.0
 
 name              icon-naming-utils
 version           0.8.90
@@ -24,8 +25,8 @@
                   sha1    a195e635fd663f0697a2a047f0c9134876900cf1 \
                   rmd160  1c68587f83e8bad54dfdedbfb76c1ec7f2696dcb
 
-depends_lib       port:perl5.12 port:p5.12-xml-simple
-configure.perl    ${prefix}/bin/perl5.12
+depends_lib       port:perl${perl5.major} port:p${perl5.major}-xml-simple
+configure.perl    ${prefix}/bin/perl${perl5.major}
 
 universal_variant no
 
Index: gnome/planner/Portfile
===================================================================
--- gnome/planner/Portfile	(revision 93513)
+++ gnome/planner/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem      1.0
+PortGroup			perl5	1.0
 
 name            planner
 version         0.14.4
@@ -36,7 +37,7 @@
                 port:libgnomeprintui \
                 port:rarian \
                 port:libxslt \
-                port:p5.12-xml-parser \
+                port:p${perl5.major}-xml-parser \
                 port:evolution-data-server
 
 configure.args  --disable-python \
Index: gnome/gnome-doc-utils/Portfile
===================================================================
--- gnome/gnome-doc-utils/Portfile	(revision 93513)
+++ gnome/gnome-doc-utils/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem  1.0
+PortGroup			perl5	1.0
 
 name           gnome-doc-utils
 version        0.20.6
@@ -43,7 +44,7 @@
                port:iso-codes
 
 # The perl executable should be the one explicitly required by intltool
-configure.env-append  INTLTOOL_PERL=${prefix}/bin/perl5.12
+configure.env-append  INTLTOOL_PERL=${prefix}/bin/perl${perl5.major}
 configure.args        --disable-scrollkeeper
 
 variant python25 conflicts python26 python27 description {Use python 2.5} {
Index: gnome/gnucash-devel/Portfile
===================================================================
--- gnome/gnucash-devel/Portfile	(revision 93513)
+++ gnome/gnucash-devel/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem        1.0
+PortGroup			perl5	1.0
 
 name              gnucash-devel
 set my_name       gnucash
@@ -45,7 +46,7 @@
 post-patch {
     # gnc-fq-dump needs to be patched to use MacPorts perl.
     # (autoconf takes care of the other perl scripts.)
-    reinplace "s|^#!/usr/bin/perl|#!${prefix}/bin/perl5.12|" ${worksrcpath}/src/quotes/gnc-fq-dump
+    reinplace "s|^#!/usr/bin/perl|#!${prefix}/bin/perl${perl5.major}|" ${worksrcpath}/src/quotes/gnc-fq-dump
 }
 
 depends_build     port:pkgconfig \
@@ -59,7 +60,7 @@
                   port:webkit-gtk \
                   port:goffice \
                   port:aqbanking5-gtk \
-                  port:p5.12-finance-quote
+                  port:p${perl5.major}-finance-quote
 
 depends_run       port:evince
 
Index: textproc/docbook2X/Portfile
===================================================================
--- textproc/docbook2X/Portfile	(revision 93513)
+++ textproc/docbook2X/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup			perl5	1.0
 
 name                docbook2X
 version             0.8.8
@@ -15,11 +16,11 @@
 master_sites        sourceforge:docbook2x
 checksums           md5 b9b76a6af198c4f44574cfd17a322f01
 
-depends_lib         port:perl5.12 \
-                    port:p5.12-xml-namespacesupport \
-                    port:p5.12-xml-sax \
-                    port:p5.12-xml-parser \
-                    port:p5.12-xml-sax-expat \
+depends_lib         port:perl${perl5.major} \
+                    port:p${perl5.major}-xml-namespacesupport \
+                    port:p${perl5.major}-xml-sax \
+                    port:p${perl5.major}-xml-parser \
+                    port:p${perl5.major}-xml-sax-expat \
                     port:libiconv \
                     port:libxml2
 
Index: textproc/intltool/Portfile
===================================================================
--- textproc/intltool/Portfile	(revision 93513)
+++ textproc/intltool/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem      1.0
+PortGroup			perl5	1.0
 
 name            intltool
 version         0.50.2
@@ -31,13 +32,13 @@
 
 depends_build   port:gnome-common
 depends_lib     port:expat \
-                port:perl5.12 \
-                port:p5.12-xml-parser \
-                port:p5.12-getopt-long \
-                port:p5.12-pathtools \
-                port:p5.12-scalar-list-utils
+                port:perl${perl5.major} \
+                port:p${perl5.major}-xml-parser \
+                port:p${perl5.major}-getopt-long \
+                port:p${perl5.major}-pathtools \
+                port:p${perl5.major}-scalar-list-utils
 
-configure.perl  ${prefix}/bin/perl5.12
+configure.perl  ${prefix}/bin/perl${perl5.major}
 
 test.run        yes
 test.target     check
Index: textproc/help2man/Portfile
===================================================================
--- textproc/help2man/Portfile	(revision 93513)
+++ textproc/help2man/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name			help2man
 version			1.40.5
@@ -21,10 +22,10 @@
 checksums           rmd160  3515028e9b7c993546810b7d3bf00736f5dfcdf0 \
                     sha256  13599a89080628617f31ca1e7eee38d0b11b2c088708c14eba35b99d67b23cb4
 
-depends_lib		port:perl5.12 port:p5.12-locale-gettext \
+depends_lib		port:perl${perl5.major} port:p${perl5.major}-locale-gettext \
 				port:gettext port:libiconv
 
-configure.perl	${prefix}/bin/perl5.12
+configure.perl	${prefix}/bin/perl${perl5.major}
 
 configure.args  --enable-nls
 
Index: textproc/stardict/Portfile
===================================================================
--- textproc/stardict/Portfile	(revision 93513)
+++ textproc/stardict/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem 1.0
+PortGroup			perl5	1.0
 
 name		stardict
 version		3.0.2
@@ -27,7 +28,7 @@
 		port:gnome-doc-utils
 depends_lib	port:gtk2 \
 		port:popt \
-		port:p5.12-xml-parser
+		port:p${perl5.major}-xml-parser
 
 patchfiles	patch-glib-2.32.diff
 
Index: x11/auto-multiple-choice/Portfile
===================================================================
--- x11/auto-multiple-choice/Portfile	(revision 93513)
+++ x11/auto-multiple-choice/Portfile	(working copy)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup			perl5	1.0
 
 name                auto-multiple-choice
 version             1.1.0
@@ -24,20 +25,20 @@
                     rmd160  581269d573bae36a6c105118ffbe43471041d11a
 
 depends_lib         port:opencv
-depends_run         port:p5.12-gtk2 \
-                    port:p5.12-xml-simple \
-                    port:p5.12-xml-writer \
-                    port:p5.12-archive-zip \
-                    port:p5.12-locale-gettext \
-                    port:p5.12-digest-md5 \
-                    port:p5.12-module-load-conditional \
+depends_run         port:p${perl5.major}-gtk2 \
+                    port:p${perl5.major}-xml-simple \
+                    port:p${perl5.major}-xml-writer \
+                    port:p${perl5.major}-archive-zip \
+                    port:p${perl5.major}-locale-gettext \
+                    port:p${perl5.major}-digest-md5 \
+                    port:p${perl5.major}-module-load-conditional \
                     port:GraphicsMagick \
-                    port:p5.12-openoffice-oodoc \
-                    port:p5.12-net-cups \
-                    port:p5.12-file-mimeinfo \
-                    port:p5.12-dbd-sqlite \
-                    port:p5.12-text-csv \
-                    port:p5.12-file-basedir \
+                    port:p${perl5.major}-openoffice-oodoc \
+                    port:p${perl5.major}-net-cups \
+                    port:p${perl5.major}-file-mimeinfo \
+                    port:p${perl5.major}-dbd-sqlite \
+                    port:p${perl5.major}-text-csv \
+                    port:p${perl5.major}-file-basedir \
                     port:sqlite3 \
                     port:poppler \
                     port:netpbm \
Index: x11/homebank/Portfile
===================================================================
--- x11/homebank/Portfile	(revision 93513)
+++ x11/homebank/Portfile	(working copy)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup			perl5	1.0
 
 name                homebank
 version             4.4
@@ -28,7 +29,7 @@
 depends_lib         port:gtk2 \
                     port:libofx \
                     port:librsvg \
-                    port:p5.12-xml-parser
+                    port:p${perl5.major}-xml-parser
 
 post-patch {
     file attributes ${worksrcpath}/install-sh -permissions +x
