diff --git a/aqua/JHymn/Portfile b/aqua/JHymn/Portfile index d56057ae3f84..4fa4e6edd630 100644 --- a/aqua/JHymn/Portfile +++ b/aqua/JHymn/Portfile @@ -21,7 +21,7 @@ distname [regsub -all {[\.-]} ${distname} _]_source use_zip yes checksums md5 d0a0ef88e504cab658692f21ae1fb8a4 worksrcdir ${name} -configure {} +use_configure no depends_build bin:faad:faad2 \ bin:lame:lame pre-build { xinstall "[binaryInPath faad]" "[binaryInPath lame]" \ diff --git a/aqua/binclocken/Portfile b/aqua/binclocken/Portfile index ed706c7cb54a..5e411776ab11 100644 --- a/aqua/binclocken/Portfile +++ b/aqua/binclocken/Portfile @@ -22,7 +22,7 @@ distname BinClockenSource use_zip yes checksums md5 a8d06a4de474e502dd85f04dbe441611 -configure {} +use_configure no build.type pbx build.target diff --git a/aqua/istumbler/Portfile b/aqua/istumbler/Portfile index c76b06171cdb..60fc131076a2 100644 --- a/aqua/istumbler/Portfile +++ b/aqua/istumbler/Portfile @@ -43,7 +43,7 @@ variant use_binary conflicts use_source { distname ${name}-${version} checksums md5 23eb2b3621c2bbc0ce3884faa5117f31 patch {} - configure {} + use_configure no build {} destroot { file mkdir ${destroot}/Applications/MacPorts diff --git a/aqua/launch/Portfile b/aqua/launch/Portfile index 09fdca354d29..2ff9866e966c 100644 --- a/aqua/launch/Portfile +++ b/aqua/launch/Portfile @@ -17,7 +17,7 @@ platforms darwin master_sites ${homepage} checksums md5 0c9f963701cdbe3272e2634cc3693b0d -configure {} +use_configure no build.type pbx build.args -buildstyle Deployment diff --git a/aqua/mkconsole/Portfile b/aqua/mkconsole/Portfile index d83819c02d29..9a1aabc34154 100644 --- a/aqua/mkconsole/Portfile +++ b/aqua/mkconsole/Portfile @@ -29,7 +29,7 @@ checksums md5 1fb642b625d3009573d8de1f5d60a6a5 worksrcdir MkConsole -configure {} +use_configure no build.type pbx build.target -project MkConsole.xcode diff --git a/aqua/openvanilla/Portfile b/aqua/openvanilla/Portfile index 67f51962a257..f0a57756fdff 100644 --- a/aqua/openvanilla/Portfile +++ b/aqua/openvanilla/Portfile @@ -21,5 +21,5 @@ master_sites sourceforge distname OpenVanilla-OSX-Source-${version} build.args CFLAGS+=-F../../Loaders/OSX/ checksums md5 e8619d6c96a140c78dd22bbd71764a59 -configure {} +use_configure no destroot.destdir DSTROOT=${destroot} diff --git a/aqua/pgAdmin3/Portfile b/aqua/pgAdmin3/Portfile index 8ecb6cc1ed6e..aea19abededa 100644 --- a/aqua/pgAdmin3/Portfile +++ b/aqua/pgAdmin3/Portfile @@ -19,7 +19,7 @@ homepage http://www.pgadmin.org/ master_sites http://developer.pgadmin.org/ftp/release/v${version}/src/ \ http://www.postgresql.org/ftp/pgadmin3/release/v${version}/src/ -distname pgadmin3-${portversion} +distname pgadmin3-${version} checksums ${distname}${extract.suffix} sha1 e39ef29c18aad01fd68847a1d9e6b03c882d9fa9 diff --git a/aqua/qt3-mac/Portfile b/aqua/qt3-mac/Portfile index f828b82bd5f9..4e4f80d09cea 100644 --- a/aqua/qt3-mac/Portfile +++ b/aqua/qt3-mac/Portfile @@ -46,7 +46,7 @@ variant ipv6 { configure.cmd "echo yes | ./configure" configure.env QMAKESPEC='' QTDIR='' DYLD_LIBRARY_PATH='' configure.args -v -prefix '${prefix}' \ - -docdir '${prefix}/share/doc/${portname}/html' \ + -docdir '${prefix}/share/doc/${name}/html' \ -datadir '${prefix}/share/qt3' \ -headerdir '${prefix}/include/qt3' \ -plugindir '${prefix}/lib/qt3-plugins' \ diff --git a/archivers/9e/Portfile b/archivers/9e/Portfile index cad8b790ce1f..5820ebd50da2 100644 --- a/archivers/9e/Portfile +++ b/archivers/9e/Portfile @@ -18,7 +18,7 @@ checksums md5 ffb6c9963c6bb61ddfc456fd29f96073 patchfiles patch-9e.c -configure {} +use_configure no build.args CFLAGS= LIBS= diff --git a/archivers/pbzip2/Portfile b/archivers/pbzip2/Portfile index d1c48dd7baca..4df693bd5cab 100644 --- a/archivers/pbzip2/Portfile +++ b/archivers/pbzip2/Portfile @@ -22,6 +22,6 @@ post-patch { depends_lib port:bzip2 -configure {} +use_configure no destroot.destdir PREFIX=${destroot}${prefix} diff --git a/archivers/unzip/Portfile b/archivers/unzip/Portfile index c990d9a21cf8..a3368914adde 100644 --- a/archivers/unzip/Portfile +++ b/archivers/unzip/Portfile @@ -17,7 +17,7 @@ homepage http://www.info-zip.org/pub/infozip/UnZip.html description Decompression compatible with pkunzip distname ${name}552 worksrcdir ${name}-${version} -configure {} +use_configure no build.target build.args -f unix/Makefile macosx MANDIR=${destroot}${prefix}/share/man/man1 destroot.args -f unix/Makefile install BINDIR=${destroot}${prefix}/bin \ diff --git a/audio/alac_decoder/Portfile b/audio/alac_decoder/Portfile index 8e4e6a0ce05a..fd856a86bd00 100644 --- a/audio/alac_decoder/Portfile +++ b/audio/alac_decoder/Portfile @@ -22,7 +22,7 @@ checksums md5 f554fc11ee41a30bc5baf15a0fd07256 worksrcdir ${name} -configure {} +use_configure no build.target diff --git a/audio/bladeenc/Portfile b/audio/bladeenc/Portfile index 306a21ea5237..636b76c0a058 100644 --- a/audio/bladeenc/Portfile +++ b/audio/bladeenc/Portfile @@ -10,8 +10,8 @@ long_description Blade's MP3 Encoder (BladeEnc) is a freeware MP3 encoder. It is homepage http://bladeenc.mp3.no/ platforms darwin freebsd master_sites http://bladeenc.mp3.no/source/ http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/ -distname ${portname}-${portversion}-src-stable +distname ${name}-${version}-src-stable checksums md5 9b9f6eafe1637a48a67f0a0f8f6e71ad -worksrcdir ${portname}-${portversion} +worksrcdir ${name}-${version} extract.post_args | pax -s@bladeenc-0.94.2/other_makefiles/BladeEnc..@@p -r patchfiles patch-system.h diff --git a/audio/daapd/Portfile b/audio/daapd/Portfile index d9ae3f88161d..aa1bd01c9795 100644 --- a/audio/daapd/Portfile +++ b/audio/daapd/Portfile @@ -36,4 +36,4 @@ destroot { xinstall -m 644 ${worksrcpath}/daapd.8 ${destroot}/${prefix}/share/man/man8/ } -configure {} +use_configure no diff --git a/audio/flac2mp3/Portfile b/audio/flac2mp3/Portfile index 51852fbb2dea..96129436a62d 100644 --- a/audio/flac2mp3/Portfile +++ b/audio/flac2mp3/Portfile @@ -15,7 +15,7 @@ checksums sha1 7818bb421dec92071f19958b9f5d668e91730e31 extract.suffix .pl extract {} -configure {} +use_configure no build {} destroot { xinstall ${distpath}/${name}${extract.suffix} ${destroot}${prefix}/bin diff --git a/audio/mp3_check/Portfile b/audio/mp3_check/Portfile index 51d74059fe2e..77d49f414fe5 100644 --- a/audio/mp3_check/Portfile +++ b/audio/mp3_check/Portfile @@ -21,7 +21,7 @@ patch { reinplace "s| -Werror||" ${worksrcpath}/Makefile } -configure {} +use_configure no destroot { xinstall -m 555 ${worksrcpath}/mp3_check \ diff --git a/audio/poc/Portfile b/audio/poc/Portfile index c29ddc4a6612..d356ec3d3ac6 100644 --- a/audio/poc/Portfile +++ b/audio/poc/Portfile @@ -35,7 +35,7 @@ post-patch { ${worksrcpath}/Makefile } -configure {} +use_configure no build.target servers clients diff --git a/audio/shntool/Portfile b/audio/shntool/Portfile index ca1db49013b7..7e61c68cd535 100644 --- a/audio/shntool/Portfile +++ b/audio/shntool/Portfile @@ -24,6 +24,6 @@ post-patch { reinplace "s|$\(bindir)/shn|${destroot}${prefix}/bin/shn|g" \ reinplace "s|$\(bindir)/shn|${destroot}${prefix}/bin/shn|g" \ "${worksrcpath}/src/Makefile.am" } -post-destroot { system "install -m 755 -d ${destroot}${prefix}/share/doc/${portname}" +post-destroot { system "install -m 755 -d ${destroot}${prefix}/share/doc/${name}" system "install -m 644 ${worksrcpath}/doc/* \ - ${destroot}${prefix}/share/doc/${portname}/" } + ${destroot}${prefix}/share/doc/${name}/" } diff --git a/benchmarks/forkbomb/Portfile b/benchmarks/forkbomb/Portfile index 16e01d3ef979..d63fef82971f 100644 --- a/benchmarks/forkbomb/Portfile +++ b/benchmarks/forkbomb/Portfile @@ -25,6 +25,6 @@ patch { reinplace s|/man|/share/man| ${worksrcpath}/Makefile } -configure {} +use_configure no destroot.destdir DESTDIR=${destroot} PREFIX=${prefix} diff --git a/benchmarks/pipebench/Portfile b/benchmarks/pipebench/Portfile index ccf31f51f40b..90f66ac79c76 100644 --- a/benchmarks/pipebench/Portfile +++ b/benchmarks/pipebench/Portfile @@ -20,6 +20,6 @@ patch { reinplace s|man/man1|share/man/man1| ${worksrcpath}/Makefile } -configure {} +use_configure no destroot.destdir diff --git a/comms/scud/Portfile b/comms/scud/Portfile index 76bf84c634b4..d5689a89874a 100644 --- a/comms/scud/Portfile +++ b/comms/scud/Portfile @@ -15,7 +15,7 @@ platforms darwin freebsd master_sites ${homepage}/downloads/ checksums md5 c49f6f8b65ff5a2dbd4316d67da08398 patchfiles patch-Makefile -configure {} +use_configure no build.type bsd build.args PREFIX=${prefix} destroot.destdir PREFIX=${destroot}${prefix} diff --git a/cross/i386-mingw32-runtime/Portfile b/cross/i386-mingw32-runtime/Portfile index c9c934ff4a5e..c440ec56fedf 100644 --- a/cross/i386-mingw32-runtime/Portfile +++ b/cross/i386-mingw32-runtime/Portfile @@ -26,7 +26,7 @@ pre-extract { } # Nothing to configure -configure {} +use_configure no # Nothing to build build {} diff --git a/cross/i386-mingw32-w32api/Portfile b/cross/i386-mingw32-w32api/Portfile index 64c79c4d31b5..fbe4eb5f73f6 100644 --- a/cross/i386-mingw32-w32api/Portfile +++ b/cross/i386-mingw32-w32api/Portfile @@ -27,7 +27,7 @@ pre-extract { } # Nothing to configure -configure {} +use_configure no # Nothing to build build {} diff --git a/databases/db3/Portfile b/databases/db3/Portfile index 7c8fa1d34875..80bf0ac5d3d1 100644 --- a/databases/db3/Portfile +++ b/databases/db3/Portfile @@ -8,7 +8,7 @@ description The Berkeley DB package, revision 3 homepage http://www.sleepycat.com/update/ platforms darwin freebsd master_sites http://download.oracle.com/berkeley-db/ -distname db-${portversion} +distname db-${version} checksums md5 b6ae24fa55713f17a9ac3219d987722c patchfiles patch-db.h patch-db185_ext.in patch-db185_uext.in \ patch-db185.c patch-db185_int.in patch-mutex.h \ diff --git a/databases/db4/Portfile b/databases/db4/Portfile index 8c378c77aa64..4b852bb15ba0 100644 --- a/databases/db4/Portfile +++ b/databases/db4/Portfile @@ -9,7 +9,7 @@ description The Berkely DB package, revision 4 homepage http://www.sleepycat.com/update/ platforms darwin freebsd sunos master_sites http://downloads.sleepycat.com/ freebsd -distname db-${portversion} +distname db-${version} dist_subdir db4/${version} checksums sha1 49c31bb12144e3a8fb8b7f64e7bf989b72f2981a worksrcdir ${distname}/build_unix diff --git a/databases/db41/Portfile b/databases/db41/Portfile index 0466a7df679e..e7031c063caf 100644 --- a/databases/db41/Portfile +++ b/databases/db41/Portfile @@ -25,7 +25,7 @@ patch_sites http://www.oracle.com/technology/products/berkeley-db/db/update/${v patchfiles patch.${version}.1 \ patch.${version}.2 \ patch.${version}.3 -distname db-${portversion} +distname db-${version} patch.dir ${workpath}/${distname} dist_subdir db4 checksums ${distname}${extract.suffix} sha1 1c595d43c062cd340f430cb051c7d6a106ad5191 \ diff --git a/databases/db42/Portfile b/databases/db42/Portfile index a48f3b4da8bb..4b4fd2678c43 100644 --- a/databases/db42/Portfile +++ b/databases/db42/Portfile @@ -20,7 +20,7 @@ long_description \ homepage http://www.sleepycat.com/update/ master_sites http://downloads.sleepycat.com/ -distname db-${portversion} +distname db-${version} dist_subdir db4 checksums sha1 a7eae0ce16dd12d030c2843e14a84a37881ec4b1 diff --git a/databases/db43/Portfile b/databases/db43/Portfile index 4856e68c10a4..c66779ee67f1 100644 --- a/databases/db43/Portfile +++ b/databases/db43/Portfile @@ -23,7 +23,7 @@ homepage http://www.sleepycat.com/update/ master_sites http://downloads.sleepycat.com/ patch_sites http://www.oracle.com/technology/products/berkeley-db/db/update/${version}/ patchfiles patch.${version}.1 -distname db-${portversion} +distname db-${version} patch.dir ${workpath}/${distname} dist_subdir db4 checksums ${distname}${extract.suffix} \ diff --git a/databases/db44/Portfile b/databases/db44/Portfile index a495657226e5..887775957f8f 100644 --- a/databases/db44/Portfile +++ b/databases/db44/Portfile @@ -26,7 +26,7 @@ patchfiles patch.${version}.1 \ patch.${version}.2 \ patch.${version}.3 \ patch.${version}.4 -distname db-${portversion} +distname db-${version} patch.dir ${workpath}/${distname} dist_subdir db4 checksums ${distname}${extract.suffix} \ diff --git a/databases/db45/Portfile b/databases/db45/Portfile index 0f00d36c3a9b..d4c28b419173 100644 --- a/databases/db45/Portfile +++ b/databases/db45/Portfile @@ -26,7 +26,7 @@ master_sites http://download-west.oracle.com/berkeley-db/ \ patch_sites http://www.oracle.com/technology/products/berkeley-db/db/update/${version}/ patchfiles patch.${version}.1 \ patch.${version}.2 -distname db-${portversion} +distname db-${version} patch.dir ${workpath}/${distname} dist_subdir db4 checksums ${distname}${extract.suffix} \ diff --git a/databases/gdbm/Portfile b/databases/gdbm/Portfile index 682b43b59b40..eae543fd226e 100644 --- a/databases/gdbm/Portfile +++ b/databases/gdbm/Portfile @@ -17,7 +17,7 @@ long_description \ homepage http://www.gnu.org/software/gdbm/gdbm.html platforms darwin freebsd master_sites gnu -distname ${portname}-${portversion} +distname ${name}-${version} checksums md5 1d1b1d5c0245b1c00aff92da751e9aa1 patchfiles patch-Makefile.in configure.args --mandir=\\\${prefix}/share/man --infodir=\\\${prefix}/share/info diff --git a/databases/postgresql/Portfile b/databases/postgresql/Portfile index bb5d14ee597d..5a5f14f272dc 100644 --- a/databases/postgresql/Portfile +++ b/databases/postgresql/Portfile @@ -15,7 +15,7 @@ long_description PostgreSQL is Object-Relational Database Management System. \ homepage http://www.postgresql.org/ platforms darwin -set subdir source/v${portversion} +set subdir source/v${version} master_sites postgresql:source/v${version} checksums sha1 fd4e1db4fa3bf1a22d0596337cb1456389ca03e0 diff --git a/devel/caml-findlib/Portfile b/devel/caml-findlib/Portfile index 4b1d89113a10..e97acf41d8d3 100644 --- a/devel/caml-findlib/Portfile +++ b/devel/caml-findlib/Portfile @@ -46,7 +46,7 @@ post-destroot { # make a turd file so the directory doesn't get pruned when installing # I suppose I don't actually know if it prunes before or after this phase # but better to be safe than sorry - close [open ${destroot}${ocamlfind_destdir}/.turd_${portname} w] + close [open ${destroot}${ocamlfind_destdir}/.turd_${name} w] } post-activate { @@ -66,7 +66,7 @@ post-activate { } if {!$has_line} { ui_msg "## Adding line `${ocamlfind_destdir}' to file ${ldconfpath}" - ui_msg "## Be sure to remove this line if you uninstall ${portname}" + ui_msg "## Be sure to remove this line if you uninstall ${name}" puts $ldconf $ocamlfind_destdir } close $ldconf diff --git a/devel/caml-menhir/Portfile b/devel/caml-menhir/Portfile index b403d6c9b316..78e0f4cc068d 100644 --- a/devel/caml-menhir/Portfile +++ b/devel/caml-menhir/Portfile @@ -17,6 +17,6 @@ checksums md5 773b4fc5ef62775b5a98e175e8f102e0 \ depends_lib port:caml-findlib \ port:ocaml -configure {} +use_configure no destroot.env PREFIX=${destroot}${prefix} diff --git a/devel/caml-pcre/Portfile b/devel/caml-pcre/Portfile index f7dd3d01105a..9efa0e1330a3 100644 --- a/devel/caml-pcre/Portfile +++ b/devel/caml-pcre/Portfile @@ -24,7 +24,7 @@ depends_lib bin:caml4p:ocaml bin:ocamlfind:caml-findlib lib:pcre:pcre patchfiles patch-OCamlMakefile patch-Makefile.conf -configure {} +configure no proc ocamlfind_destdir {} { # only bother calculating this darn thing once diff --git a/devel/cogito/Portfile b/devel/cogito/Portfile index 6a128c80ab11..7b860e73a5d7 100644 --- a/devel/cogito/Portfile +++ b/devel/cogito/Portfile @@ -14,7 +14,7 @@ long_description The git core, developed by Linus Torvalds, provides \ homepage http://kernel.org/pub/software/scm/cogito/ master_sites http://kernel.org/pub/software/scm/cogito/ use_bzip2 yes -configure {} +use_configure no depends_lib port:coreutils \ port:zlib \ port:git-core diff --git a/devel/fbopenssl/Portfile b/devel/fbopenssl/Portfile index a42b0d5c9c7b..0273db13f51d 100644 --- a/devel/fbopenssl/Portfile +++ b/devel/fbopenssl/Portfile @@ -24,7 +24,7 @@ post-patch { reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/Makefile } -configure {} +use_configure no build.args CFG=release OPENSSLDIR=${prefix} diff --git a/devel/fnv/Portfile b/devel/fnv/Portfile index 6039f3715e36..c5483e5166f7 100644 --- a/devel/fnv/Portfile +++ b/devel/fnv/Portfile @@ -25,7 +25,7 @@ post-patch { reinplace s|/bin/true|true| ${worksrcpath}/Makefile } -configure {} +use_configure no build.args RANLIB=ranlib diff --git a/devel/glib1/Portfile b/devel/glib1/Portfile index e0acbd3eeca5..4be394b90a7f 100644 --- a/devel/glib1/Portfile +++ b/devel/glib1/Portfile @@ -17,13 +17,13 @@ long_description General-purpose library from the GTK+ team, includes \ master_sites ftp://ftp.gtk.org/pub/gtk/v1.2/ \ opendarwin::lt -set filename glib-${portversion}${extract.suffix} +set filename glib-${version}${extract.suffix} distfiles ${filename} ltconfig13:lt ltmain13:lt checksums ${filename} md5 6fe30dad87c77b91b632def29dd69ef9 \ ltconfig13 md5 ea53f42a550c9f9e653758a8ed91574e \ ltmain13 md5 e094ae92724c4015dbab97de151c2525 extract.only ${filename} -worksrcdir glib-${portversion} +worksrcdir glib-${version} depends_lib port:gettext depends_build port:pkgconfig diff --git a/devel/glib2/Portfile b/devel/glib2/Portfile index 6921c0afd914..0011339b4caf 100644 --- a/devel/glib2/Portfile +++ b/devel/glib2/Portfile @@ -16,7 +16,7 @@ long_description Glib is a library which includes support routines for \ master_sites ftp://ftp.gtk.org/pub/glib/2.12 \ gnome:sources/glib/2.12 -distname glib-${portversion} +distname glib-${version} checksums md5 077a9917b673a9a0bc63f351786dde24 \ sha1 02d344295ddaeafeec6bc6824b71e12bbf1b0394 \ diff --git a/devel/gnet2/Portfile b/devel/gnet2/Portfile index 02eed3b2a264..9871da97f1b5 100644 --- a/devel/gnet2/Portfile +++ b/devel/gnet2/Portfile @@ -15,7 +15,7 @@ long_description GNet is a simple network library written in C. It is \ master_sites http://www.gnetlibrary.org/src/ -distname gnet-${portversion} +distname gnet-${version} checksums sha1 01c41bd492c6fd33d31800d0c5146a09315f7f6d depends_lib port:glib2 port:gettext port:libiconv diff --git a/devel/gpatch/Portfile b/devel/gpatch/Portfile index 5ea5b6f7f060..434f5d933d48 100644 --- a/devel/gpatch/Portfile +++ b/devel/gpatch/Portfile @@ -22,7 +22,7 @@ master_sites http://www.funet.fi/pub/gnu/alpha/gnu/patch/ \ ftp://ftp.funet.fi/pub/gnu/alpha/gnu/patch/ platforms darwin sunos -distname patch-${portversion} +distname patch-${version} checksums md5 dacfb618082f8d3a2194601193cf8716 configure.args --program-prefix=g --infodir=\\\${prefix}/share/info \ diff --git a/devel/libcipher/Portfile b/devel/libcipher/Portfile index fc9e0eb9b6a9..4b82a3ab99f2 100644 --- a/devel/libcipher/Portfile +++ b/devel/libcipher/Portfile @@ -12,7 +12,7 @@ use_bzip2 yes master_sites opendarwin checksums md5 e322740002fc69c1e4e390ba461835d2 build.type bsd -worksrcdir ${portname} +worksrcdir ${name} use_configure no patchfiles patch-Makefile build.env LDADD=-install_name\\ ${prefix}/lib/libcipher.1.dylib diff --git a/devel/libcompat/Portfile b/devel/libcompat/Portfile index 6fdc7c95a88f..5f9b2636c4e4 100644 --- a/devel/libcompat/Portfile +++ b/devel/libcompat/Portfile @@ -12,7 +12,7 @@ use_bzip2 yes master_sites opendarwin checksums md5 4e0ddeec2be3a2c8caf24a3ed51b8501 build.type bsd -worksrcdir ${portname} +worksrcdir ${name} use_configure no patchfiles patch-Makefile build.env LDADD=-install_name\\ ${prefix}/lib/libcompat.1.dylib diff --git a/devel/libpdel/Portfile b/devel/libpdel/Portfile index a4acf0aeb844..541de7f5e637 100644 --- a/devel/libpdel/Portfile +++ b/devel/libpdel/Portfile @@ -60,4 +60,4 @@ post-patch { build.type gnu -configure {} +use_configure no diff --git a/devel/libproplist/Portfile b/devel/libproplist/Portfile index a114b4a2b5e2..4b3db614a072 100644 --- a/devel/libproplist/Portfile +++ b/devel/libproplist/Portfile @@ -15,7 +15,7 @@ long_description The purpose of libPropList is to closely mimick the \ master_sites ftp://ftp.windowmaker.org/pub/libs/ \ opendarwin::lt -distname libPropList-${portversion} +distname libPropList-${version} set filename ${distname}${extract.suffix} distfiles ${filename} ltconfig13:lt ltmain13:lt diff --git a/devel/macstl/Portfile b/devel/macstl/Portfile index a99050a035f5..5d19c19f819c 100644 --- a/devel/macstl/Portfile +++ b/devel/macstl/Portfile @@ -17,7 +17,7 @@ checksums md5 454ccf7015b7d606ecefccf76ded5f10 worksrcdir ${name} -configure {} +use_configure no build.type pbx build.dir ${worksrcpath}/mac diff --git a/devel/omake/Portfile b/devel/omake/Portfile index 1794df98ac5b..5274acaed695 100644 --- a/devel/omake/Portfile +++ b/devel/omake/Portfile @@ -18,7 +18,7 @@ checksums md5 47bf04eef08b25f7ba0b039463344cdf \ depends_lib port:ocaml -configure {} +use_configure no build.env PREFIX=${prefix} destroot.env INSTALL_ROOT=${destroot} diff --git a/devel/otest/Portfile b/devel/otest/Portfile index bd6ebc6739b9..1aa714be8dbb 100644 --- a/devel/otest/Portfile +++ b/devel/otest/Portfile @@ -20,7 +20,7 @@ extract.post_args | gnutar -x worksrcdir OCUnitSourceDistribution/OCUnit/otest -configure {} +use_configure no build.env INSTALL_PATH=${prefix}/bin build.type pbx diff --git a/devel/perforce/Portfile b/devel/perforce/Portfile index 02a3ce9de70a..85c5e3f67bd8 100644 --- a/devel/perforce/Portfile +++ b/devel/perforce/Portfile @@ -9,10 +9,10 @@ description Fast source code management system long_description Perforce is a commercial revision control system that can be used gratis for developing free software. (see the WWW page for details). homepage http://www.perforce.com/ platforms darwin freebsd -master_sites ftp://www.perforce.com/pub/perforce/r${portversion}/bin.darwin80ppc/ \ +master_sites ftp://www.perforce.com/pub/perforce/r${version}/bin.darwin80ppc/ \ http://www.perforce.com/perforce/doc.052/man/ -dist_subdir ${portname} -worksrcdir ${portname} +dist_subdir ${name} +worksrcdir ${name} distfiles p4 p4.1 p4d p4d.1 checksums p4 md5 c93999fe1fe3f87ea1dfec1aad3e883d \ p4.1 md5 e5cada2f402e1e016be7999fdc49035d \ diff --git a/devel/sentestingkit/Portfile b/devel/sentestingkit/Portfile index 9baf4658fa42..7d98eab523cd 100644 --- a/devel/sentestingkit/Portfile +++ b/devel/sentestingkit/Portfile @@ -19,7 +19,7 @@ extract.post_args | gnutar -x worksrcdir OCUnitSourceDistribution/OCUnit/SenTestingKit -configure {} +use_configure no build.type pbx build.target diff --git a/devel/shikenjo/Portfile b/devel/shikenjo/Portfile index 92432ff85289..41b6e311b229 100644 --- a/devel/shikenjo/Portfile +++ b/devel/shikenjo/Portfile @@ -19,7 +19,7 @@ extract.post_args | gnutar -x worksrcdir OCUnitSourceDistribution/OCUnit/Shikenjo -configure {} +use_configure no build.type pbx build.target diff --git a/devel/slib-guile/Portfile b/devel/slib-guile/Portfile index 73434c5f9f1c..6f222ee4f21d 100644 --- a/devel/slib-guile/Portfile +++ b/devel/slib-guile/Portfile @@ -12,7 +12,7 @@ long_description ${description} depends_lib lib:slib:slib lib:guile:guile distfiles -configure {} +use_configure no build {} destroot { system "mkdir -p ${workpath}/destroot/${prefix}/share/guile" diff --git a/editors/TECO/Portfile b/editors/TECO/Portfile index 855bd6d9fafd..e2b99b4cb7d7 100644 --- a/editors/TECO/Portfile +++ b/editors/TECO/Portfile @@ -17,7 +17,7 @@ platforms darwin master_sites sunsite:apps/editors/tty checksums md5 b996a43a133f0d636ef3331da2374e6e patchfiles patch-te_subs.c -configure {} +use_configure no worksrcdir . build.target diff --git a/editors/abiword/Portfile b/editors/abiword/Portfile index a4ceaecec8d0..93b7a767093a 100644 --- a/editors/abiword/Portfile +++ b/editors/abiword/Portfile @@ -56,7 +56,7 @@ variant use_binary conflicts use_source { system "hdiutil attach ${workpath}/${distname}.dmg -private -nobrowse -mountpoint /tmp/${name}-${version}" } patch {} - configure {} + use_configure no build {} destroot { file mkdir ${destroot}/Applications/MacPorts diff --git a/editors/aee/Portfile b/editors/aee/Portfile index 7321f204e54e..7fa73b8f4bda 100644 --- a/editors/aee/Portfile +++ b/editors/aee/Portfile @@ -21,7 +21,7 @@ platforms darwin master_sites ${homepage}sources/ checksums md5 b8963aa11f3ac9cca06404cec2f87c64 -configure {} +use_configure no build.target main diff --git a/editors/ee/Portfile b/editors/ee/Portfile index dbeac108bef6..46e90e1ab5c1 100644 --- a/editors/ee/Portfile +++ b/editors/ee/Portfile @@ -20,7 +20,7 @@ checksums md5 3e628f98ed44907808c03e94901f2c6b worksrcdir easyedit -configure {} +use_configure no destroot { xinstall -m 555 ${worksrcpath}/ee ${destroot}${prefix}/bin diff --git a/editors/ne/Portfile b/editors/ne/Portfile index 94cf359a0662..447b73dcede9 100644 --- a/editors/ne/Portfile +++ b/editors/ne/Portfile @@ -20,7 +20,7 @@ patch { reinplace "s|/usr|${prefix}|" ${worksrcpath}/src/makefile } -configure {} +use_configure no build.dir ${worksrcpath}/src build.target diff --git a/editors/nedit/Portfile b/editors/nedit/Portfile index 68dc906b5239..409dd4e08d58 100644 --- a/editors/nedit/Portfile +++ b/editors/nedit/Portfile @@ -28,7 +28,7 @@ depends_lib lib:libXm.4:openmotif worksrcdir ${name}-${version} -configure {} +use_configure no build.args MOTIFLINK="-L${prefix}/lib -lXm.4" LDFLAGS=-L${prefix}/lib \ CFLAGS="-I${prefix}/include -DBUILD_UNTESTED_NEDIT" diff --git a/games/54321/Portfile b/games/54321/Portfile index 05f4500e56de..19ed4a4c460a 100644 --- a/games/54321/Portfile +++ b/games/54321/Portfile @@ -22,7 +22,7 @@ checksums md5 20b2ad52ef45742c1a65911b225b6ddc worksrcdir ${name} patchfiles patch-variables.GNU -configure {} +use_configure no build.type gnu build.target all size diff --git a/games/amphetamine/Portfile b/games/amphetamine/Portfile index 09f111eddea3..5441b1f8593a 100644 --- a/games/amphetamine/Portfile +++ b/games/amphetamine/Portfile @@ -28,7 +28,7 @@ post-patch { ${worksrcpath}/src/System.hpp } -configure {} +use_configure no destroot { xinstall -m 555 ${worksrcpath}/amph ${destroot}${prefix}/bin diff --git a/games/larn/Portfile b/games/larn/Portfile index d5b604944815..bc667862d99e 100644 --- a/games/larn/Portfile +++ b/games/larn/Portfile @@ -16,7 +16,7 @@ distname ${name}-${version}-RELEASE checksums md5 cea96f48caa057793f6bcaf3394ca388 build.type bsd build.args LDADD+=-L${prefix}/lib\\ -lcompat\\ -lcurses -worksrcdir ${portname} +worksrcdir ${name} patchfiles patch-diag.c \ patch-display.c \ patch-global.c \ diff --git a/games/qthello/Portfile b/games/qthello/Portfile index 2aa1987a7f8e..b0ca3ef62dd1 100644 --- a/games/qthello/Portfile +++ b/games/qthello/Portfile @@ -28,7 +28,7 @@ post-patch { reinplace s|gfx|${prefix}/share/${name}/gfx|g ${worksrcpath}/boardwidget.cpp } -configure {} +use_configure no build.target all QTDIR=${prefix} diff --git a/games/vms-empire/Portfile b/games/vms-empire/Portfile index 7ebd9baaa531..57e559eaef69 100644 --- a/games/vms-empire/Portfile +++ b/games/vms-empire/Portfile @@ -19,7 +19,7 @@ checksums md5 d458082c1052e63c1700fa5b54d4ef6f patchfiles patch-game.c -configure {} +use_configure no destroot { xinstall -m 555 ${worksrcpath}/${name} \ diff --git a/games/wordplay/Portfile b/games/wordplay/Portfile index de14c3a366ea..bb28c2fb2920 100644 --- a/games/wordplay/Portfile +++ b/games/wordplay/Portfile @@ -23,7 +23,7 @@ extract.dir ${worksrcpath} patchfiles patch-wordplay.c -configure {} +configure no build.target diff --git a/games/wtf/Portfile b/games/wtf/Portfile index e1190336ce68..5e3e98d9c9c2 100644 --- a/games/wtf/Portfile +++ b/games/wtf/Portfile @@ -15,7 +15,7 @@ checksums md5 93ca90bef86d2f58da14ed0db87cbf78 \ rmd160 75ab3930721558b9660df65694def06415f19fdf -configure {} +use_configure no build { cd ${worksrcpath} diff --git a/games/wump/Portfile b/games/wump/Portfile index dcc567e5445e..b5dc20aaea70 100644 --- a/games/wump/Portfile +++ b/games/wump/Portfile @@ -12,7 +12,7 @@ use_bzip2 yes master_sites opendarwin checksums md5 415c4b47458ac66f760b0a930a63c955 build.type bsd -worksrcdir ${portname} +worksrcdir ${name} configure { reinplace "s|MAN|MAN6|" ${worksrcpath}/Makefile reinplace "s|/usr/share|${prefix}/share|" \ diff --git a/gnome/planner/Portfile b/gnome/planner/Portfile index 231a99593ddc..5dfe8ecd7217 100644 --- a/gnome/planner/Portfile +++ b/gnome/planner/Portfile @@ -18,7 +18,7 @@ homepage http://planner.imendio.org/ platforms darwin master_sites gnome:sources/planner/0.14/ checksums md5 2cb0d0c2c34832611dbb489d498e6158 -distname planner-${portversion} +distname planner-${version} use_bzip2 yes depends_build port:pkgconfig \ diff --git a/graphics/bitstream-vera/Portfile b/graphics/bitstream-vera/Portfile index dd9919d3f36e..e30468cb4a5f 100644 --- a/graphics/bitstream-vera/Portfile +++ b/graphics/bitstream-vera/Portfile @@ -23,7 +23,7 @@ checksums md5 52559ed969e74f5fca83e527163156df patchfiles patch-local.conf -configure {} +use_configure no build { reinplace "s|%FONTSDIR%|${prefix}/share/fonts|" \ ${worksrcpath}/local.conf diff --git a/graphics/gimp/Portfile b/graphics/gimp/Portfile index 1d3df3b5f770..cdb61dfcfaac 100644 --- a/graphics/gimp/Portfile +++ b/graphics/gimp/Portfile @@ -13,7 +13,7 @@ long_description The GNU Image Manipulation Program (GIMP) is a powerful \ manipulation, painting, processing, and rendering tools. platforms darwin use_bzip2 yes -master_sites ftp://ftp.gtk.org/pub/gimp/v1.2/v${portversion}/ +master_sites ftp://ftp.gtk.org/pub/gimp/v1.2/v${version}/ checksums md5 b83b55d80e6728268d56620ea4d3051a depends_lib port:gtk1 port:gettext port:jpeg port:libpng port:tiff diff --git a/graphics/libgeotiff/Portfile b/graphics/libgeotiff/Portfile index dbd63b52e0f0..61829e347757 100644 --- a/graphics/libgeotiff/Portfile +++ b/graphics/libgeotiff/Portfile @@ -12,7 +12,7 @@ long_description This software provides support for the Tag Image File \ homepage http://www.remotesensing.org/geotiff/ platforms darwin master_sites ftp://ftp.remotesensing.org/pub/geotiff/libgeotiff/ -distname ${portname}-${portversion} +distname ${name}-${version} checksums md5 cd02f28915f964e4aa914e0e1b39ab4b patchfiles patch-incode @@ -30,9 +30,9 @@ destroot.env DESTDIR=${destroot} post-build { cd ${worksrcpath} system "cc -dynamiclib -all_load \ - -install_name ${prefix}/lib/libgeotiff.${portversion}.dylib \ - -compatibility_version ${portversion} \ - -o libgeotiff.${portversion}.dylib libgeotiff.a -L${prefix}/lib \ + -install_name ${prefix}/lib/libgeotiff.${version}.dylib \ + -compatibility_version ${version} \ + -o libgeotiff.${version}.dylib libgeotiff.a -L${prefix}/lib \ -lproj -ltiff -ljpeg -lz" } pre-destroot "file mkdir ${destroot}/${prefix}" @@ -41,8 +41,8 @@ post-destroot { system "rm ${destroot}/${prefix}/lib/libgeotiff.a" cd ${worksrcpath} system "install -m 755 -d ${destroot}/${prefix}/lib" system "install -m 644 -c \ - libgeotiff.${portversion}.dylib ${destroot}${prefix}/lib" - system "ln -sf libgeotiff.${portversion}.dylib \ + libgeotiff.${version}.dylib ${destroot}${prefix}/lib" + system "ln -sf libgeotiff.${version}.dylib \ ${destroot}/${prefix}/lib/libgeotiff.${libver}.dylib" - system "ln -sf libgeotiff.${portversion}.dylib \ + system "ln -sf libgeotiff.${version}.dylib \ ${destroot}/${prefix}/lib/libgeotiff.dylib" } diff --git a/graphics/plotutils/Portfile b/graphics/plotutils/Portfile index ab39e8aa639d..0245b5168a24 100644 --- a/graphics/plotutils/Portfile +++ b/graphics/plotutils/Portfile @@ -17,7 +17,7 @@ platforms darwin homepage http://www.gnu.org/software/plotutils/ master_sites gnu opendarwin::lt -checksums ${name}-${portversion}${extract.suffix} \ +checksums ${name}-${version}${extract.suffix} \ md5 8da2cc2ed5a837cad0753c7843ef18ee depends_lib lib:libpng:libpng lib:libz:zlib diff --git a/graphics/shapelib/Portfile b/graphics/shapelib/Portfile index ddd5165fdd14..ffc856abdcf3 100644 --- a/graphics/shapelib/Portfile +++ b/graphics/shapelib/Portfile @@ -11,19 +11,19 @@ long_description This software provides support for the ESRI ShapeFiles. homepage http://gdal.velocet.ca/projects/shapelib/index.html platforms darwin master_sites ftp://gdal.velocet.ca/pub/outgoing/ -distname ${portname}-${portversion} +distname ${name}-${version} checksums md5 4d96bd926167193d27bf14d56e2d484e -configure {} +configure no build.target all shptree.o destroot.destdir post-build { cd ${worksrcpath} system "cc -dynamiclib -all_load \ - -install_name ${prefix}/lib/libshp.${portversion}.dylib \ - -compatibility_version ${portversion} \ - -o libshp.${portversion}.dylib shpopen.o shptree.o \ + -install_name ${prefix}/lib/libshp.${version}.dylib \ + -compatibility_version ${version} \ + -o libshp.${version}.dylib shpopen.o shptree.o \ dbfopen.o" } pre-destroot {} @@ -40,8 +40,8 @@ post-destroot { cd ${worksrcpath} system "install -m 644 -c \ shapefil.h ${destroot}${prefix}/include" system "install -m 644 -c \ - libshp.${portversion}.dylib ${destroot}${prefix}/lib" - system "ln -sf libshp.${portversion}.dylib \ + libshp.${version}.dylib ${destroot}${prefix}/lib" + system "ln -sf libshp.${version}.dylib \ ${destroot}/${prefix}/lib/libshp.${libver}.dylib" - system "ln -sf libshp.${portversion}.dylib \ + system "ln -sf libshp.${version}.dylib \ ${destroot}/${prefix}/lib/libshp.dylib" } diff --git a/graphics/tgif/Portfile b/graphics/tgif/Portfile index 8838c221df8f..01fdcfa958c6 100644 --- a/graphics/tgif/Portfile +++ b/graphics/tgif/Portfile @@ -10,7 +10,7 @@ maintainers mdales@mac.com homepage http://bourbon.usc.edu:8001/tgif/ platforms darwin master_sites ftp://bourbon.usc.edu/pub/tgif/ -distname tgif-QPL-${portversion} +distname tgif-QPL-${version} checksums md5 83b1cd01b1570fbf71ea5994af87f42e use_xmkmf yes patchfiles patch-Tgif.tmpl patch-Imakefile diff --git a/graphics/xv/Portfile b/graphics/xv/Portfile index 9a2ae1110f45..bdcb28e39a0f 100644 --- a/graphics/xv/Portfile +++ b/graphics/xv/Portfile @@ -38,4 +38,4 @@ patch { sed -e 's#@DEST@#${destroot}${prefix}#g' -e 's#@INST@#${prefix}#g' '${portpath}/${filesdir}/xv-darwin.patch' | patch -p1" } -configure {} +use_configure no diff --git a/irc/insub/Portfile b/irc/insub/Portfile index bf14665ac291..1fb692a2359e 100644 --- a/irc/insub/Portfile +++ b/irc/insub/Portfile @@ -15,7 +15,7 @@ master_sites ${homepage} use_bzip2 yes checksums md5 0e5adddaf68e3ac4ef0bae166d254ffc -configure {} +use_configure no build {} destroot { diff --git a/irc/irssistats/Portfile b/irc/irssistats/Portfile index a3d7de566823..a1459a0eefe0 100644 --- a/irc/irssistats/Portfile +++ b/irc/irssistats/Portfile @@ -24,7 +24,7 @@ patch { ${worksrcpath}/irssistats.sgml } -configure {} +use_configure no build.target diff --git a/irc/netwalker-ircc/Portfile b/irc/netwalker-ircc/Portfile index b7d61fb7bb21..e02ec6b20811 100644 --- a/irc/netwalker-ircc/Portfile +++ b/irc/netwalker-ircc/Portfile @@ -16,6 +16,6 @@ master_sites ${homepage}netwalker-src/ extract.suffix .tgz checksums md5 1f5a7cc0fb54142c6306651105aedd68 -configure {} +use_configure no destroot.destdir DESTDIR=${destroot}${prefix} diff --git a/irc/thirdeye/Portfile b/irc/thirdeye/Portfile index 7e2d491fea0c..75a0845c36e4 100644 --- a/irc/thirdeye/Portfile +++ b/irc/thirdeye/Portfile @@ -13,7 +13,7 @@ long_description Third Eye is a script for the EPIC IRC client (epic4-2000 or la platforms darwin master_sites http://te.E1F.net/arc/ -distname te${portversion} +distname te${version} use_bzip2 yes checksums md5 7a074605a868a9d46870a1861474852a configure {} diff --git a/irc/tkirc/Portfile b/irc/tkirc/Portfile index f8573af462f8..fc7bfb4e77b1 100644 --- a/irc/tkirc/Portfile +++ b/irc/tkirc/Portfile @@ -12,7 +12,7 @@ platforms darwin master_sites ftp://ftp.netsplit.de/pub/tcltk/ checksums md5 b6b16369e2d1cd6a0941d93577d6831e depends_run bin:ircII:ircii bin:wish8.4:tk -distname ${portname}${portversion} +distname ${name}${version} worksrcdir tkirc2 configure {} diff --git a/irc/xchat2/Portfile b/irc/xchat2/Portfile index fbae5e623d1f..5ae6b97e15d2 100644 --- a/irc/xchat2/Portfile +++ b/irc/xchat2/Portfile @@ -14,7 +14,7 @@ long_description XChat2 is a graphical IRC client based on GTK2 that has \ master_sites http://xchat.org/files/source/2.6/ -distname xchat-${portversion} +distname xchat-${version} checksums md5 940fd8560a4e4e5d905e53207c6cbb87 \ sha1 7be12710c7461c8108524b763af83de89ae900f4 \ rmd160 add965c1092c11f565110f127f402c900bedcec0 diff --git a/lang/XOTcl/Portfile b/lang/XOTcl/Portfile index 2257223f0e11..2502fb145520 100644 --- a/lang/XOTcl/Portfile +++ b/lang/XOTcl/Portfile @@ -13,7 +13,7 @@ homepage http://media.wu-wien.ac.at master_sites ${homepage}/download/ checksums md5 d8f97042594ffa076813907155c74a2a destroot.destdir DESTDIR=${destroot} -worksrcdir ${portname}-${portversion}/unix +worksrcdir ${name}-${version}/unix depends_lib lib:libtk8.4:tk # Use a reasonable default diff --git a/lang/bf2c/Portfile b/lang/bf2c/Portfile index 3f831f9f4809..e743c2a8e3a0 100644 --- a/lang/bf2c/Portfile +++ b/lang/bf2c/Portfile @@ -16,7 +16,7 @@ platforms darwin master_sites sourceforge checksums md5 72cabfb53dfab3f83de7ea901dfbb411 -configure {} +use_configure no destroot { xinstall -m 555 ${worksrcpath}/bf2c ${destroot}${prefix}/bin diff --git a/lang/cupl/Portfile b/lang/cupl/Portfile index e82231900760..bff3310a65f0 100644 --- a/lang/cupl/Portfile +++ b/lang/cupl/Portfile @@ -17,7 +17,7 @@ checksums md5 5032ec8df7f90bcb8d491e3898a582e9 patchfiles patch-cupl.y patch-execute.c patch-monitor.c -configure {} +use_configure no build.target diff --git a/lang/ficl/Portfile b/lang/ficl/Portfile index 96c6953a4dac..d08c576b4ee8 100644 --- a/lang/ficl/Portfile +++ b/lang/ficl/Portfile @@ -13,7 +13,7 @@ long_description Ficl is a programming language interpreter designed to be embed homepage http://ficl.sourceforge.net/ master_sites sourceforge checksums md5 7f9ca6093730554f5f66beaa46a652d4 -distname ${portname}${portversion} +distname ${name}${version} worksrcdir . configure {} build { system "cd ${worksrcpath} && make -f Makefile.ansi" } diff --git a/lang/ftidy/Portfile b/lang/ftidy/Portfile index 0a92abd6c3d2..a3c758716275 100644 --- a/lang/ftidy/Portfile +++ b/lang/ftidy/Portfile @@ -43,7 +43,7 @@ build.target tidy.for -o ftidy set worksrcdir c -configure {} +use_configure no destroot { cd ${worksrcpath} diff --git a/lang/itcl/Portfile b/lang/itcl/Portfile index 0c84c273c09f..981175f0ec2e 100644 --- a/lang/itcl/Portfile +++ b/lang/itcl/Portfile @@ -10,14 +10,14 @@ description \[incr Tcl\] A.K.A. \"itcl\". Object oriented extension to Tcl. platforms darwin master_sites sourceforge:incrtcl:itcl \ http://www.opendarwin.org/~markd/:tclpheaders -distname ${portname}${portversion} +distname ${name}${version} distfiles ${distname}.tar.gz:itcl \ tcl8.4.12-privateheaders-full.tar.gz:tclpheaders -checksums ${portname}${portversion}.tar.gz md5 d958b3d1c52fa5336b5aacc1251b5ce3 \ +checksums ${name}${version}.tar.gz md5 d958b3d1c52fa5336b5aacc1251b5ce3 \ tcl8.4.12-privateheaders-full.tar.gz md5 ec9b85fad111b51b746fe45a2dc1e8fb depends_build port:tcl port:tk build.args CPPFLAGS=-I${prefix}/include -worksrcdir ${portname}${portversion} +worksrcdir ${name}${version} set tclconfig ${prefix}/lib configure.args --with-tcl=${tclconfig} --with-tk=${prefix}/lib diff --git a/lang/moscow_ml/Portfile b/lang/moscow_ml/Portfile index 04d2c2273240..1fb2e73cbf25 100644 --- a/lang/moscow_ml/Portfile +++ b/lang/moscow_ml/Portfile @@ -28,7 +28,7 @@ post-patch { ${worksrcpath}/src/Makefile.inc } -configure {} +use_configure no build.dir ${worksrcpath}/src build.target world diff --git a/lang/pike/Portfile b/lang/pike/Portfile index 42ed26a2b342..0691ce0c5a0c 100644 --- a/lang/pike/Portfile +++ b/lang/pike/Portfile @@ -19,7 +19,7 @@ master_sites ${homepage}pub/pike/all/${version}/ distname Pike-v${version} checksums md5 4e39c43a00c6566a9638ef48499bbc82 -configure {} +use_configure no build.args CONFIGUREARGS="--prefix=${prefix}" build.target diff --git a/lang/scala/Portfile b/lang/scala/Portfile index 496759872ab1..210f2f4ce1bd 100644 --- a/lang/scala/Portfile +++ b/lang/scala/Portfile @@ -19,7 +19,7 @@ master_sites ${homepage}downloads/distrib/files/ use_bzip2 yes checksums md5 4020b9d5dbc1ddee3eb0a756fe557be4 -configure {} +use_configure no build {} destroot { diff --git a/lang/tcl/Portfile b/lang/tcl/Portfile index e67daefc9cc9..d6a522c2e06a 100644 --- a/lang/tcl/Portfile +++ b/lang/tcl/Portfile @@ -10,8 +10,8 @@ description Tool Command Language platforms darwin freebsd master_sites sourceforge dist_subdir tcltk -distname ${portname}${portversion}-src -worksrcdir ${portname}${portversion}/unix +distname ${name}${version}-src +worksrcdir ${name}${version}/unix checksums md5 51c6bf74d3ffdb0bd866ecdac6ff6460 \ sha1 d7af7e0c7ed563e2344dda04bbe49961589244dd \ rmd160 392a4f4617ee77cfdae10b24e9ccbe84afed0a40 diff --git a/mail/mutt-devel/Portfile b/mail/mutt-devel/Portfile index 68b46373eacc..894ce0f2976e 100644 --- a/mail/mutt-devel/Portfile +++ b/mail/mutt-devel/Portfile @@ -18,7 +18,7 @@ long_description Mutt -- "The Mongrel of Mail User Agents" (part Elm, part \ Delivery Status Notification (DSN) support, and PGP/MIME. master_sites ftp://ftp.mutt.org/mutt/devel/ -distname mutt-${portversion} +distname mutt-${version} checksums md5 6d33b4f0074e39772021d947c49b30c6 \ sha1 7be098c13302fab8a954095d17a9a64e1e1519c1 \ rmd160 ed4eeaf75d37757ed5b370e9763b6f8524df5ca7 diff --git a/mail/mutt/Portfile b/mail/mutt/Portfile index bc1d065db4c9..fc0cb8c674d5 100644 --- a/mail/mutt/Portfile +++ b/mail/mutt/Portfile @@ -17,13 +17,13 @@ long_description Mutt -- "The Mongrel of Mail User Agents" (part Elm, part \ for encoded headers), customizable key bindings, POP3, \ Delivery Status Notification (DSN) support, and PGP/MIME. -master_sites ftp://ftp.mutt.org/${portname}/ +master_sites ftp://ftp.mutt.org/${name}/ distname ${distname}i checksums ${distfiles} md5 51a08429c5bd5c34af3f4268b8cbcda3 patch.args -p1 -worksrcdir ${portname}-${portversion} +worksrcdir ${name}-${version} configure.args --disable-warnings \ --mandir='\${prefix}/share/man' \ diff --git a/mail/nail/Portfile b/mail/nail/Portfile index 1dcb23c075de..a8c408abe912 100644 --- a/mail/nail/Portfile +++ b/mail/nail/Portfile @@ -28,4 +28,4 @@ post-patch { reinplace "s|__DESTROOT__|${destroot}|" "${worksrcpath}/Makefile" } -configure {} +use_configure no diff --git a/mail/pine/Portfile b/mail/pine/Portfile index 6852ca09b0ce..ff989984cb1c 100644 --- a/mail/pine/Portfile +++ b/mail/pine/Portfile @@ -16,7 +16,7 @@ long_description Pine is a tool for reading, sending, and managing \ master_sites ftp://ftp.cac.washington.edu/pine/ \ ftp://ftp.cac.washington.edu/pine/old/ checksums md5 75af127948cc0c701d424d22d621f792 -distname ${portname}${portversion} +distname ${name}${version} extract.suffix .tar.Z use_configure no @@ -27,7 +27,7 @@ build.target osx variant ssl_plain { build.args SSLTYPE=unix } destroot { xinstall -m 755 -d \ - ${destroot}${prefix}/share/doc/${portname} + ${destroot}${prefix}/share/doc/${name} xinstall -m 755 -W ${worksrcpath}/bin pine pico pilot rpdump \ rpload ${destroot}${prefix}/bin xinstall -m 644 -W ${worksrcpath}/doc pico.1 pilot.1 pine.1 \ @@ -36,6 +36,6 @@ destroot { xinstall -m 755 -d \ background.html cmd-line.html config-notes.html \ config.html index.html installation.html \ introduction.html low-level.html porting.html \ - ${destroot}${prefix}/share/doc/${portname} + ${destroot}${prefix}/share/doc/${name} system "${destroot}${prefix}/bin/pine -conf > ${destroot}${prefix}/etc/pine.conf" } diff --git a/mail/qpopper/Portfile b/mail/qpopper/Portfile index 32b83db30ac7..9ba7c2aaaea3 100644 --- a/mail/qpopper/Portfile +++ b/mail/qpopper/Portfile @@ -18,7 +18,7 @@ master_sites http://core.ring.gr.jp/archives/net/mail/qpopper/ \ checksums md5 de2cd15f95cfd00d0d080fd16287acad \ rmd160 b48a68cd9e282bfb3d78c6b53f3dee7c97bdf77d \ sha1 5629aa86d92fe10565021980882dffb733ce73d9 -worksrcdir ${portname}${portversion} +worksrcdir ${name}${version} patchfiles patch-Makefile.in patch-popper-Makefile.in configure.args --mandir=${prefix}/share/man \ --without-pam diff --git a/mail/spambnc/Portfile b/mail/spambnc/Portfile index 6b0bb893e858..6d58996b4820 100644 --- a/mail/spambnc/Portfile +++ b/mail/spambnc/Portfile @@ -22,11 +22,11 @@ platforms darwin master_sites ${homepage} ftp://ftp.spambouncer.org/ distname sb checksums md5 e6b2c0be71ac2fc3a0dfa76909f85491 -dist_subdir ${portname}/${version} +dist_subdir ${name}/${version} depends_run bin:procmail:procmail -worksrcdir ${portname} +worksrcdir ${name} patchfiles patch-procmail.rc @@ -35,15 +35,15 @@ pre-extract { } extract.dir ${worksrcpath} -configure {} +use_configure no build {} destroot { - system "cp -pr ${workpath}/${portname} \ - ${destroot}${prefix}/share/${portname} " - reinplace "s=%%SBDIR%%=${prefix}/share/${portname}=" \ - ${destroot}${prefix}/share/${portname}/procmail.rc - xinstall -m 755 -d ${destroot}${prefix}/share/doc/${portname} + system "cp -pr ${workpath}/${name} \ + ${destroot}${prefix}/share/${name} " + reinplace "s=%%SBDIR%%=${prefix}/share/${name}=" \ + ${destroot}${prefix}/share/${name}/procmail.rc + xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name} xinstall -m 644 -c ${filespath}/index.shtml \ - ${destroot}${prefix}/share/doc/${portname}/documentation.html + ${destroot}${prefix}/share/doc/${name}/documentation.html } diff --git a/mail/ssmtp/Portfile b/mail/ssmtp/Portfile index f0cf1e217b13..063ce1f09a0d 100644 --- a/mail/ssmtp/Portfile +++ b/mail/ssmtp/Portfile @@ -13,10 +13,10 @@ long_description This is sSMTP, a program that replaces sendmail on workstations program accepts mail and sends it to the mailhub, optionally replacing the \ domain in the From: line with a different one. platforms darwin freebsd -master_sites http://ftp.debian.org/debian/pool/main/s/${portname}/ \ - ftp://ftp.icm.edu.pl/pub/Linux/debian/pool/main/s/${portname}/ +master_sites http://ftp.debian.org/debian/pool/main/s/${name}/ \ + ftp://ftp.icm.edu.pl/pub/Linux/debian/pool/main/s/${name}/ checksums md5 88fff70f14a001e09b713aa6326162cf -worksrcdir ${portname}-2.60 +worksrcdir ${name}-2.60 patchfiles patch-ssmtp.c patch-generate_config patch-Makefile.in build.type gnu diff --git a/math/SuiteSparse/Portfile b/math/SuiteSparse/Portfile index 72418c72fbe9..4755dbd919f8 100644 --- a/math/SuiteSparse/Portfile +++ b/math/SuiteSparse/Portfile @@ -14,7 +14,7 @@ long_description \ homepage http://www.cise.ufl.edu/research/sparse/SuiteSparse/ master_sites http://www.cise.ufl.edu/research/sparse/SuiteSparse/ distname SuiteSparse-$version -worksrcdir ${portname} +worksrcdir ${name} depends_build port:metis diff --git a/math/calc/Portfile b/math/calc/Portfile index 3adc50591ec5..f88ca6af5c8c 100644 --- a/math/calc/Portfile +++ b/math/calc/Portfile @@ -28,7 +28,7 @@ post-patch { reinplace "s|___DESTROOT___|${destroot}|" ${worksrcpath}/Makefile } -configure {} +use_configure no test.run yes test.target check diff --git a/math/fftw-3-single/Portfile b/math/fftw-3-single/Portfile index e078b92b065b..afc096d08983 100644 --- a/math/fftw-3-single/Portfile +++ b/math/fftw-3-single/Portfile @@ -30,7 +30,7 @@ master_sites ${homepage} \ ftp://ftp.fftw.org/pub/fftw/ \ ftp://ftp.kusastro.kyoto-u.ac.jp/pub/src/GNU/fftw/ -distname fftw-${portversion} +distname fftw-${version} checksums md5 08f2e21c9fd02f4be2bd53a62592afa4 diff --git a/math/fftw-3/Portfile b/math/fftw-3/Portfile index 1c703429697a..3a1cea8c4ab2 100644 --- a/math/fftw-3/Portfile +++ b/math/fftw-3/Portfile @@ -7,7 +7,7 @@ categories math platforms darwin maintainers takeshi@mac.com homepage http://www.fftw.org/ -distname fftw-${portversion} +distname fftw-${version} master_sites \ ${homepage} \ diff --git a/math/ploticus/Portfile b/math/ploticus/Portfile index 6c0fbfdb7c92..51e3fd9e5f35 100644 --- a/math/ploticus/Portfile +++ b/math/ploticus/Portfile @@ -30,7 +30,7 @@ post-patch { reinplace s|__PREFIX__|${prefix}| ${worksrcpath}/src/Makefile } -configure {} +use_configure no build.dir ${worksrcpath}/src build.target diff --git a/net/ASFRecorder/Portfile b/net/ASFRecorder/Portfile index c5f8829eebbd..d9c3664ab600 100644 --- a/net/ASFRecorder/Portfile +++ b/net/ASFRecorder/Portfile @@ -12,7 +12,7 @@ master_sites sourceforge:ASFRecorder distname ASFRecorder use_zip yes checksums md5 c0cd281b9f72479945058735d8eff8a2 -configure {} +use_configure no build {cd ${workpath}/${name}/source; system "cc -o ${name} asfrecorder.c"} destroot { xinstall -m 755 ${workpath}/${name}/source/ASFRecorder \ diff --git a/net/bind9/Portfile b/net/bind9/Portfile index bc7f955a0eb8..63d37cec2344 100644 --- a/net/bind9/Portfile +++ b/net/bind9/Portfile @@ -21,7 +21,7 @@ long_description The BIND DNS Server is used on the vast majority of name \ homepage http://www.isc.org distname bind-${version} -master_sites isc:${portname}/${version} +master_sites isc:${name}/${version} checksums md5 e85347f03f0d841b596422d5252a0869 depends_lib port:openssl diff --git a/net/blackbag/Portfile b/net/blackbag/Portfile index 932cf00be67f..25dfb326655e 100644 --- a/net/blackbag/Portfile +++ b/net/blackbag/Portfile @@ -22,7 +22,7 @@ checksums md5 9603a1c387b1cb0fc7e1a200002b578f \ depends_lib port:libevent port:libpcap port:openssl port:zlib -configure {} +use_configure no build.env LFLAGS="-L${prefix}/lib" \ IFLAGS="-I${prefix}/include" diff --git a/net/bnbt/Portfile b/net/bnbt/Portfile index 6ff7d02b41e4..232d2782c463 100644 --- a/net/bnbt/Portfile +++ b/net/bnbt/Portfile @@ -23,7 +23,7 @@ distname ${name}${dversion}-sf use_zip yes checksums md5 2935ffe0f51090a79d5bd76566af3b2b -configure {} +use_configure no worksrcdir ${name} diff --git a/net/bsflite/Portfile b/net/bsflite/Portfile index 754a4a2f0226..5e765ef0346c 100644 --- a/net/bsflite/Portfile +++ b/net/bsflite/Portfile @@ -24,7 +24,7 @@ patchfiles patch-Makefile \ patch-imcomm__snac.c \ patch-log.c -configure {} +use_configure no destroot { xinstall -m 0555 ${worksrcpath}/bsflite ${destroot}${prefix}/bin diff --git a/net/cvsup/Portfile b/net/cvsup/Portfile index e2223c001833..9298ea7a34a2 100644 --- a/net/cvsup/Portfile +++ b/net/cvsup/Portfile @@ -13,14 +13,14 @@ depends_lib bin:cm3:cm3 set cvsup-srcs "/pub/FreeBSD/development/CVSup/sources/" homepage http://www.cvsup.org/ master_sites freebsd -distname cvsup-snap-${portversion} +distname cvsup-snap-${version} checksums sha1 976439eb09c9e929d3bb2837b5e4db14719393b2 # Mark destroot.target as .PHONY because HFS+ case insensitivity # screws us over yet again. patchfiles patch-Makefile -configure {} +use_configure no post-patch "reinplace s|/usr/local/lib|${prefix}/lib|g \ ${worksrcpath}/suplib/src/m3makefile" diff --git a/net/ddclient/Portfile b/net/ddclient/Portfile index 2136356a4c0c..e5c162f945c4 100644 --- a/net/ddclient/Portfile +++ b/net/ddclient/Portfile @@ -14,9 +14,9 @@ checksums md5 67976f65c2aad267664267bed940ce18 depends_run bin:perl:perl5.8 configure { - reinplace "s|\[\r\]$||" ${worksrcpath}/${portname} - reinplace "s|^#!.*/perl.*$|#!${prefix}/bin/perl|" ${worksrcpath}/${portname} - reinplace "s|/etc/|${prefix}/etc/|" ${worksrcpath}/${portname} + reinplace "s|\[\r\]$||" ${worksrcpath}/${name} + reinplace "s|^#!.*/perl.*$|#!${prefix}/bin/perl|" ${worksrcpath}/${name} + reinplace "s|/etc/|${prefix}/etc/|" ${worksrcpath}/${name} } build {} @@ -32,15 +32,15 @@ destroot { reinplace "s|/var/run|${prefix}/var/run|" \ ${destroot}${prefix}/etc/ddclient/ddclient.conf.sample - xinstall -m 555 ${worksrcpath}/${portname} ${destroot}${prefix}/sbin - xinstall -d ${destroot}${prefix}/share/doc/${portname} + xinstall -m 555 ${worksrcpath}/${name} ${destroot}${prefix}/sbin + xinstall -d ${destroot}${prefix}/share/doc/${name} eval file copy [glob ${worksrcpath}/sample-*] \ - ${destroot}${prefix}/share/doc/${portname} + ${destroot}${prefix}/share/doc/${name} eval file copy [glob ${worksrcpath}/COPY*] \ - ${destroot}${prefix}/share/doc/${portname} + ${destroot}${prefix}/share/doc/${name} eval file copy [glob ${worksrcpath}/README*] \ - ${destroot}${prefix}/share/doc/${portname} + ${destroot}${prefix}/share/doc/${name} destroot.keepdirs ${destroot}${prefix}/var/run } diff --git a/net/dnetc/Portfile b/net/dnetc/Portfile index 0c5e3518667e..391b6ae16dac 100644 --- a/net/dnetc/Portfile +++ b/net/dnetc/Portfile @@ -29,7 +29,7 @@ worksrcdir dnetc495-macosx-ppc startupitem.start "${prefix}/share/${name}/dnetc.init start" startupitem.stop "${prefix}/share/${name}/dnetc.init stop" -configure {} +use_configure no build {} destroot { xinstall -m 755 -d ${destroot}${prefix}/bin diff --git a/net/dnstop/Portfile b/net/dnstop/Portfile index 5d2ef9b45718..ea27c2e68d3c 100644 --- a/net/dnstop/Portfile +++ b/net/dnstop/Portfile @@ -13,7 +13,7 @@ checksums md5 226935c1e05fe9f5e6931142bcf81087 depends_lib lib:libpcap:libpcap patchfiles patch_dnstop.c -configure {} +use_configure no build.target destroot { system "install ${worksrcpath}/${name} ${destroot}${prefix}/bin/" system "install ${worksrcpath}/${name}.8 ${destroot}${prefix}/share/man/man8/" diff --git a/net/fetch/Portfile b/net/fetch/Portfile index d679e18c3a7b..02101a01c9ee 100644 --- a/net/fetch/Portfile +++ b/net/fetch/Portfile @@ -11,7 +11,7 @@ platforms darwin use_bzip2 yes master_sites opendarwin checksums md5 08c3a2b57be775c1d630f5a9097451d1 -worksrcdir ${portname} +worksrcdir ${name} use_configure no depends_lib lib:libfetch.3:libfetch build.type bsd diff --git a/net/ipsvd/Portfile b/net/ipsvd/Portfile index 9a6b15a4f92b..7cac3d56490f 100644 --- a/net/ipsvd/Portfile +++ b/net/ipsvd/Portfile @@ -16,7 +16,7 @@ platforms darwin master_sites ${homepage} checksums md5 076121e7b2011aad6f94e7025c37a4c7 -configure {} +use_configure no worksrcdir net/${name}-${version} diff --git a/net/libfetch/Portfile b/net/libfetch/Portfile index cbbbdd09f593..74abdd19a4ec 100644 --- a/net/libfetch/Portfile +++ b/net/libfetch/Portfile @@ -13,7 +13,7 @@ master_sites opendarwin checksums md5 81e390ad3bf8309f65c923a0c034e841 patchfiles patch-Makefile patch-http.c build.type bsd -worksrcdir ${portname} +worksrcdir ${name} use_configure no set libver 3 build.env LDADD=-install_name\\ ${prefix}/lib/libfetch.${libver}.dylib diff --git a/net/mdnsd/Portfile b/net/mdnsd/Portfile index ed7e83761630..dd53008840c0 100644 --- a/net/mdnsd/Portfile +++ b/net/mdnsd/Portfile @@ -18,7 +18,7 @@ homepage http://dotlocal.org/mdnsd/ platforms darwin master_sites http://dotlocal.org/mdnsd/ checksums md5 3692107785567b0eff6cec979506da3b -configure {} +configure no destroot { file mkdir ${destroot}${prefix}/bin system "install -m 755 ${worksrcpath}/mhttp ${destroot}${prefix}/bin" diff --git a/net/mimms/Portfile b/net/mimms/Portfile index ca41d408b0a6..2015d908d9c0 100644 --- a/net/mimms/Portfile +++ b/net/mimms/Portfile @@ -15,19 +15,19 @@ long_description \ replayed offline at your leisure, using any compatible media \ player of your choice. homepage http://savannah.nongnu.org/projects/mimms/ -master_sites http://download.savannah.gnu.org/releases/${portname}/ +master_sites http://download.savannah.gnu.org/releases/${name}/ checksums md5 b44c22edf8d0f07b3e09d693a7e95d0c \ sha1 6753fc3cd22ca6da78bc9d2d75560ff5aa276f26 depends_build bin:txt2man:txt2man depends_lib port:popt patchfiles patch-Makefile.diff -configure {} +use_configure no build.env CXXFLAGS="-I${prefix}/include" \ LDFLAGS="-L${prefix}/lib" destroot { xinstall -m 755 -d ${destroot}${prefix}/bin \ ${destroot}${prefix}/share/man/man1 - xinstall -m 755 ${worksrcpath}/${portname} \ - ${destroot}${prefix}/bin/${portname} - xinstall -m 644 ${worksrcpath}/${portname}.1 \ - ${destroot}${prefix}/share/man/man1/${portname}.1 } + xinstall -m 755 ${worksrcpath}/${name} \ + ${destroot}${prefix}/bin/${name} + xinstall -m 644 ${worksrcpath}/${name}.1 \ + ${destroot}${prefix}/share/man/man1/${name}.1 } diff --git a/net/ncftp/Portfile b/net/ncftp/Portfile index 2b6d0e7f5a8b..718bfc11e06c 100644 --- a/net/ncftp/Portfile +++ b/net/ncftp/Portfile @@ -25,7 +25,7 @@ depends_lib port:ncurses configure.env CPPFLAGS="-I${prefix}/include" LDFLAGS="-L${prefix}/lib" -worksrcdir ${portname}-${version} +worksrcdir ${name}-${version} destroot.destdir mandir=${destroot}${prefix}/share/man \ prefix=${destroot}${prefix} diff --git a/net/netcat/Portfile b/net/netcat/Portfile index 68d2c3b55f6f..985f9fba1f0c 100644 --- a/net/netcat/Portfile +++ b/net/netcat/Portfile @@ -20,7 +20,7 @@ master_sites ftp://coast.cs.purdue.edu/pub/tools/unix/netutils/netcat/ \ http://public.www.planetmirror.com/pub/lprng/TOOLS/ ## ## build the version string to match how netcat is distributed -regsub -all "\\." ${portversion} "" num +regsub -all "\\." ${version} "" num ## and appropriately name the distfile distfiles nc${num}.tgz diff --git a/net/ptunnel/Portfile b/net/ptunnel/Portfile index 7bbb70d1d7bf..f19f8f1f9651 100644 --- a/net/ptunnel/Portfile +++ b/net/ptunnel/Portfile @@ -19,7 +19,7 @@ checksums md5 2556e51ab975371ed8cad0aa87899aad worksrcdir PingTunnel -configure {} +use_configure no destroot.destdir prefix=${destroot}${prefix} \ bindir="\\\$(prefix)/sbin" diff --git a/net/tcp_wrappers/Portfile b/net/tcp_wrappers/Portfile index b70d526051ec..6d84ad35d9cf 100644 --- a/net/tcp_wrappers/Portfile +++ b/net/tcp_wrappers/Portfile @@ -20,7 +20,7 @@ master_sites ${homepage} platforms sunos checksums md5 e6fa25f71226d090f34de3f6b122fb5a -distname ${name}_${portversion} +distname ${name}_${version} worksrcdir ${distname} diff --git a/net/whois/Portfile b/net/whois/Portfile index 92bcb9e458d5..aa4ab01f1469 100644 --- a/net/whois/Portfile +++ b/net/whois/Portfile @@ -13,15 +13,15 @@ long_description \ whois is an improved whois client that follow the \ delegations from the Verisign whois server. -master_sites http://ftp.debian.org/debian/pool/main/w/${portname} +master_sites http://ftp.debian.org/debian/pool/main/w/${name} checksums md5 81cea7350890d2a4dc974f661be31c7d \ sha1 e30854ce446b309229da8c88b55f35bb1c974e80 \ rmd160 731daccb9fb2c7836967cd124982b0bb61a3b838 -distname ${portname}_${portversion} +distname ${name}_${version} -worksrcdir ${portname}-${portversion} +worksrcdir ${name}-${version} depends_lib port:gettext use_configure no diff --git a/news/pan2/Portfile b/news/pan2/Portfile index a69fdd54f453..081a9be2bf0b 100644 --- a/news/pan2/Portfile +++ b/news/pan2/Portfile @@ -16,7 +16,7 @@ master_sites http://pan.rebelbase.com/download/releases/${version}/SOURCE/ \ http://pan.rebelbase.com/download/obsolete/${version}/SOURCE/ -distname pan-${portversion} +distname pan-${version} checksums md5 ed3188e7059bb6d6c209ee5d46ac1852 use_bzip2 yes diff --git a/python/py-pmw/Portfile b/python/py-pmw/Portfile index 443949432c06..4373de781bf4 100644 --- a/python/py-pmw/Portfile +++ b/python/py-pmw/Portfile @@ -18,7 +18,7 @@ worksrcdir depends_lib port:python24 port:py-tkinter -configure {} +use_configure no build {} destroot { diff --git a/python/py-scipy04/Portfile b/python/py-scipy04/Portfile index b1201e181e0f..9cb61668e83a 100644 --- a/python/py-scipy04/Portfile +++ b/python/py-scipy04/Portfile @@ -21,7 +21,7 @@ fetch { ui_msg "" } checksum {} -configure {} +use_configure no build {} destroot {} install { diff --git a/python/py-tlslite/Portfile b/python/py-tlslite/Portfile index e2bcb0f81d52..34ec4de3270c 100644 --- a/python/py-tlslite/Portfile +++ b/python/py-tlslite/Portfile @@ -20,7 +20,7 @@ platforms darwin homepage http://trevp.net/tlslite/ master_sites ${homepage} -distname tlslite-${portversion} +distname tlslite-${version} checksums md5 2d5f7efafa5d04598b21f1889e981207 post-destroot { diff --git a/science/ncbi_tools/Portfile b/science/ncbi_tools/Portfile index d81c53129942..e868766875a3 100644 --- a/science/ncbi_tools/Portfile +++ b/science/ncbi_tools/Portfile @@ -12,7 +12,7 @@ master_sites ftp://ftp.ncbi.nlm.nih.gov/toolbox/ncbi_tools/ distfiles ncbi.tar.gz checksums md5 1c00462385fbf382c99ff65f34c0d09a worksrcdir -configure {} +use_configure no build.cmd './ncbi/make/makedis.csh' build.target set binaries "Psequin asn2ff asn2gb asn2idx asn2xml asndhuff asntool bl2bag.cgi bl2seq blast blast.REAL blast_cs.REAL blastall blastcl3 blastclust blastpgp cdscan checksub copymat ddv debruijn demo_regexp demo_regexp_grep dosimple entrcmd entrez2 errhdr fa2htgs fastacmd findspl formatdb formatrpsdb getfeat getmesh getpub getseq gil2bin idfetch impala indexpub makemat makeset megablast ncbisort nph-viewgif.cgi psiblast.REAL psiblast_cs.REAL rpsblast seedtop seqtest tbl2asn test_regexp testcore testobj testval udv vecscreen wblast2.REAL wblast2_cs.REAL" diff --git a/security/metasploit2/Portfile b/security/metasploit2/Portfile index 68242feba82d..0f2875514847 100644 --- a/security/metasploit2/Portfile +++ b/security/metasploit2/Portfile @@ -30,7 +30,7 @@ depends_lib port:perl5.8 \ port:p5-term-readline-gnu \ port:p5-net-ssleay -configure {} +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" diff --git a/security/otrproxy/Portfile b/security/otrproxy/Portfile index d3a45de1ed80..8dba509183e3 100644 --- a/security/otrproxy/Portfile +++ b/security/otrproxy/Portfile @@ -21,7 +21,7 @@ checksums md5 423c3e1ccad452fdce0dab39fea700d0 depends_build port:libotr -configure {} +use_configure no build.args LIBOTRINCDIR=${prefix}/include \ LIBOTRLIBDIR=${prefix}/lib diff --git a/security/tinyca/Portfile b/security/tinyca/Portfile index 43a79bc0c9a8..1ad352ced096 100644 --- a/security/tinyca/Portfile +++ b/security/tinyca/Portfile @@ -19,7 +19,7 @@ depends_lib bin:XXX:openssl bin:XXX:zip \ patchfiles patch-tinyca -configure {} +use_configure no build.dir ${worksrcpath}/po build.target "" diff --git a/security/tinyca2/Portfile b/security/tinyca2/Portfile index 355dbb3e3aae..f8cd5d01fe22 100644 --- a/security/tinyca2/Portfile +++ b/security/tinyca2/Portfile @@ -19,7 +19,7 @@ depends_lib port:openssl port:zip \ patchfiles patch-tinyca2 -configure {} +use_configure no build.dir ${worksrcpath}/po build.target "" diff --git a/sysutils/apt/Portfile b/sysutils/apt/Portfile index 6e99c4782dbb..4c36a7e2d58b 100644 --- a/sysutils/apt/Portfile +++ b/sysutils/apt/Portfile @@ -17,8 +17,8 @@ homepage http://www.debian.org/ master_sites http://ftp.debian.org/debian/pool/main/a/apt/ checksums md5 36f0b6012806569d27be98c80a6d57ff -distname ${portname}_${portversion} -worksrcdir ${portname}-${portversion} +distname ${name}_${version} +worksrcdir ${name}-${version} depends_lib path:${prefix}/bin/dpkg:dpkg \ bin:bash:bash diff --git a/sysutils/bdes/Portfile b/sysutils/bdes/Portfile index e7a571654b3e..8124c937ffe1 100644 --- a/sysutils/bdes/Portfile +++ b/sysutils/bdes/Portfile @@ -14,7 +14,7 @@ checksums md5 7b83cf1258bd73784ce70629dcad17c5 depends_lib lib:libcipher.1:libcipher build.type bsd build.args LDADD+=-L${prefix}/lib\\ -lcipher -worksrcdir ${portname} +worksrcdir ${name} patchfiles patch-Makefile configure { reinplace "s|MAN|MAN1|" ${worksrcpath}/Makefile } diff --git a/sysutils/dpkg/Portfile b/sysutils/dpkg/Portfile index ee31ae6c3b51..9a1428d88aed 100644 --- a/sysutils/dpkg/Portfile +++ b/sysutils/dpkg/Portfile @@ -18,8 +18,8 @@ depends_lib port:gettext \ bin:perl:perl5.8 -distname ${portname}_${portversion} -worksrcdir ${portname}-${portversion} +distname ${name}_${version} +worksrcdir ${name}-${version} patchfiles patch-config.h.in \ patch-configure \ diff --git a/sysutils/gnuregex/Portfile b/sysutils/gnuregex/Portfile index 5bd3d618107f..16d50304f701 100644 --- a/sysutils/gnuregex/Portfile +++ b/sysutils/gnuregex/Portfile @@ -13,7 +13,7 @@ long_description $description master_sites gnu:regex -distname regex-${portversion} +distname regex-${version} checksums md5 6c25ca10e71adeede101e7646e796ebd build.args subdirs=test diff --git a/sysutils/keychain/Portfile b/sysutils/keychain/Portfile index 54fb2c57f916..baa0ce5bdcb5 100644 --- a/sysutils/keychain/Portfile +++ b/sysutils/keychain/Portfile @@ -20,7 +20,7 @@ livecheck.check md5 livecheck.url ${homepage} livecheck.md5 07a3ad8a4a7457f581c6fd134ca7d522 -configure {} +use_configure no build {} destroot { diff --git a/sysutils/lsof/Portfile b/sysutils/lsof/Portfile index 992b94c81f0d..8126674df001 100644 --- a/sysutils/lsof/Portfile +++ b/sysutils/lsof/Portfile @@ -12,7 +12,7 @@ long_description \ UNIX system. use_bzip2 yes -distname ${name}_${portversion} +distname ${name}_${version} master_sites ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ \ ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/ \ diff --git a/sysutils/tmpreaper/Portfile b/sysutils/tmpreaper/Portfile index 84bce3187639..075d28735f69 100644 --- a/sysutils/tmpreaper/Portfile +++ b/sysutils/tmpreaper/Portfile @@ -14,8 +14,8 @@ homepage http://www.debian.org/ master_sites http://ftp.debian.org/debian/pool/main/t/tmpreaper/ checksums md5 4188c71b4fbb73af1d2f3046ddfec86f -distname ${portname}_${portversion} -worksrcdir ${portname}-${portversion} +distname ${name}_${version} +worksrcdir ${name}-${version} build.type gnu diff --git a/tex/tex-tipa/Portfile b/tex/tex-tipa/Portfile index 42a7c3a41bb1..3e46294926b5 100644 --- a/tex/tex-tipa/Portfile +++ b/tex/tex-tipa/Portfile @@ -24,7 +24,7 @@ checksums tipa.zip \ depends_lib bin:mktexlsr:teTeX patchfiles patch-tipa-1.3-Makefile -configure {} +use_configure no build {} destroot { system "cd ${worksrcpath}/tipa-${version}/ && make install DESTROOT=${destroot} PREFIX=${prefix}" diff --git a/textproc/aspell-dict-bg/Portfile b/textproc/aspell-dict-bg/Portfile index 01b5ae0c7c92..6449e13b62dd 100644 --- a/textproc/aspell-dict-bg/Portfile +++ b/textproc/aspell-dict-bg/Portfile @@ -12,7 +12,7 @@ long_description {description} master_sites gnu:aspell/dict/bg -distname aspell5-bg-${portversion} +distname aspell5-bg-${version} checksums md5 f1d9f1587cc382f10f1c7ac0a2600833 use_bzip2 yes diff --git a/textproc/aspell-dict-de/Portfile b/textproc/aspell-dict-de/Portfile index 2faf767fd6ff..3e880cc5bc78 100644 --- a/textproc/aspell-dict-de/Portfile +++ b/textproc/aspell-dict-de/Portfile @@ -12,7 +12,7 @@ long_description Aspell with German dictionary. master_sites gnu:aspell/dict/de -distname aspell6-de-alt-${portversion}-1 +distname aspell6-de-alt-${version}-1 checksums md5 13245374b03088608d729fd15c58cd7a use_bzip2 yes diff --git a/textproc/aspell-dict-dk/Portfile b/textproc/aspell-dict-dk/Portfile index 5eb71bc6dc35..7f4b6449bf2f 100644 --- a/textproc/aspell-dict-dk/Portfile +++ b/textproc/aspell-dict-dk/Portfile @@ -13,7 +13,7 @@ long_description Aspell with Danish dictionary. master_sites gnu:aspell/dict/da -distname aspell-da-${portversion}-2 +distname aspell-da-${version}-2 checksums md5 c023f246ef448128e6a3b93388ed57e7 use_bzip2 yes diff --git a/textproc/aspell-dict-en/Portfile b/textproc/aspell-dict-en/Portfile index ce8008537a59..cefa3a070f21 100644 --- a/textproc/aspell-dict-en/Portfile +++ b/textproc/aspell-dict-en/Portfile @@ -13,7 +13,7 @@ long_description Aspell with English dictionary. master_sites gnu:aspell/dict/en -distname aspell6-en-${portversion}-0 +distname aspell6-en-${version}-0 checksums md5 16449e0a266e1ecc526b2f3cd39d4bc2 use_bzip2 yes diff --git a/textproc/aspell-dict-es/Portfile b/textproc/aspell-dict-es/Portfile index 51adcd011453..d821d370fe00 100644 --- a/textproc/aspell-dict-es/Portfile +++ b/textproc/aspell-dict-es/Portfile @@ -13,7 +13,7 @@ long_description Aspell with Spanish dictionary. master_sites gnu:aspell/dict/es -distname aspell-es-${portversion}-2 +distname aspell-es-${version}-2 checksums md5 4a8583e9ef9f4aed03f5a7fe09d40060 use_bzip2 yes diff --git a/textproc/aspell-dict-fr/Portfile b/textproc/aspell-dict-fr/Portfile index 424e568bb400..e17436f48540 100644 --- a/textproc/aspell-dict-fr/Portfile +++ b/textproc/aspell-dict-fr/Portfile @@ -13,7 +13,7 @@ long_description Aspell with French dictionary. master_sites gnu:aspell/dict/fr -distname aspell-fr-${portversion}-3 +distname aspell-fr-${version}-3 checksums md5 53a2d05c4e8f7fabd3cefe24db977be7 use_bzip2 yes diff --git a/textproc/aspell-dict-it/Portfile b/textproc/aspell-dict-it/Portfile index 84f02eb22524..efe6caf7eeb6 100644 --- a/textproc/aspell-dict-it/Portfile +++ b/textproc/aspell-dict-it/Portfile @@ -13,7 +13,7 @@ long_description Aspell with Italian dictionary. master_sites gnu:aspell/dict/it -distname aspell-it-${portversion}-0 +distname aspell-it-${version}-0 checksums md5 ab3cce02bf8bfdf4116f9f7e602cf4b7 use_bzip2 yes diff --git a/textproc/aspell-dict-nl/Portfile b/textproc/aspell-dict-nl/Portfile index 25a6baf3ba9f..bfdbcb7c78e5 100644 --- a/textproc/aspell-dict-nl/Portfile +++ b/textproc/aspell-dict-nl/Portfile @@ -13,7 +13,7 @@ long_description Aspell with Dutch dictionary. master_sites gnu:aspell/dict/nl -distname aspell-nl-${portversion}-2 +distname aspell-nl-${version}-2 checksums md5 c3ef9fd7dc4c47d816eee9ef5149c76a use_bzip2 yes diff --git a/textproc/aspell-dict-ru/Portfile b/textproc/aspell-dict-ru/Portfile index fee743ace6c4..8591a400684c 100644 --- a/textproc/aspell-dict-ru/Portfile +++ b/textproc/aspell-dict-ru/Portfile @@ -13,7 +13,7 @@ long_description Aspell with Russian dictionary. master_sites gnu:aspell/dict/ru -distname aspell6-ru-${portversion}-1 +distname aspell6-ru-${version}-1 checksums md5 c4c98eaa5e77ad3adccbc5c96cb57cb3 use_bzip2 yes diff --git a/textproc/aspell-dict-sv/Portfile b/textproc/aspell-dict-sv/Portfile index a5038c4e4ea3..053edeeb1acc 100644 --- a/textproc/aspell-dict-sv/Portfile +++ b/textproc/aspell-dict-sv/Portfile @@ -13,7 +13,7 @@ long_description Aspell with Swedish dictionary. master_sites gnu:aspell/dict/sv -distname aspell-sv-${portversion}-0 +distname aspell-sv-${version}-0 checksums md5 d180c781f8986ea0f65b6b18f02a494e use_bzip2 yes diff --git a/textproc/chmdump/Portfile b/textproc/chmdump/Portfile index d0d8315bdb1f..b2a029dff368 100644 --- a/textproc/chmdump/Portfile +++ b/textproc/chmdump/Portfile @@ -29,5 +29,5 @@ platform darwin powerpc { } destroot { - xinstall -m 555 ${worksrcpath}/${portname} ${destroot}/${prefix}/bin + xinstall -m 555 ${worksrcpath}/${name} ${destroot}/${prefix}/bin } diff --git a/textproc/dict/Portfile b/textproc/dict/Portfile index ecd102114c6a..efc75e3ff7a5 100644 --- a/textproc/dict/Portfile +++ b/textproc/dict/Portfile @@ -16,7 +16,7 @@ homepage http://www.dict.org/ platforms darwin freebsd master_sites ftp://ftp.dict.org/pub/dict/ -distname ${portname}d-${portversion} +distname ${name}d-${version} checksums md5 baa8f18dd0373e7053658be99d40d5db depends_lib lib:ltdl.3:libtool diff --git a/textproc/figlet/Portfile b/textproc/figlet/Portfile index 1e474eeb5f88..b724dcf37160 100644 --- a/textproc/figlet/Portfile +++ b/textproc/figlet/Portfile @@ -13,7 +13,7 @@ homepage http://www.figlet.org/ platforms darwin freebsd master_sites ftp://ftp.figlet.org/pub/figlet/program/unix/ -distname "${portname}[string map {"." ""} ${version}]" +distname "${name}[string map {"." ""} ${version}]" checksums md5 9fcf4f1651b8e6d3f56f1ef665285b2e patchfiles patch-Makefile patch-figlet.6 diff --git a/textproc/gsed/Portfile b/textproc/gsed/Portfile index 5f9f8460d76e..45da04314827 100644 --- a/textproc/gsed/Portfile +++ b/textproc/gsed/Portfile @@ -3,7 +3,7 @@ PortSystem 1.0 name gsed version 4.1.5 -distname sed-${portversion} +distname sed-${version} categories textproc maintainers marius@physics.aamu.edu platforms darwin diff --git a/textproc/libtabe/Portfile b/textproc/libtabe/Portfile index 521d4a91599f..fa5945e93e50 100644 --- a/textproc/libtabe/Portfile +++ b/textproc/libtabe/Portfile @@ -14,7 +14,7 @@ homepage http://xcin.linux.org.tw/libtabe/ platforms darwin freebsd master_sites http://nl.lunar-linux.org/lunar/sources/sources/ checksums md5 924814d598b1f02ecf596bf598363b1b -worksrcdir ${portname} +worksrcdir ${name} depends_lib lib:libdb-3:db3 patch { reinplace "s|allow_undefined_flag='-undefined suppress'|allow_undefined_flag='-flat_namespace -undefined suppress'|g" ${worksrcpath}/configure} configure.args --with-db-inc=${prefix}/include/db3 \ diff --git a/textproc/man2html/Portfile b/textproc/man2html/Portfile index 359870e4dae0..c893e86429dd 100644 --- a/textproc/man2html/Portfile +++ b/textproc/man2html/Portfile @@ -17,7 +17,7 @@ master_sites http://www.oac.uci.edu/indiv/ehood/tar/ \ ftp://ftp.gpad.ac.ru/pub/FreeBSD/distfiles/ \ http://soupnazi.org/OSX/dports/distfiles/ -distname ${portname}${portversion} +distname ${name}${version} checksums md5 1c0d28c83225d0ebc845f2386c8f8384 patchfiles patch-man.cgi diff --git a/textproc/meld/Portfile b/textproc/meld/Portfile index b43d47f219dd..8d5b79bb45d0 100644 --- a/textproc/meld/Portfile +++ b/textproc/meld/Portfile @@ -24,7 +24,7 @@ depends_lib port:intltool \ patchfiles patch-translations \ patch-scrollkeeper -configure {} +use_configure no post-patch { reinplace s|/usr/local|${prefix}|g ${worksrcpath}/INSTALL diff --git a/textproc/mmencode/Portfile b/textproc/mmencode/Portfile index ddf3d37d943e..745528a57b08 100644 --- a/textproc/mmencode/Portfile +++ b/textproc/mmencode/Portfile @@ -25,7 +25,7 @@ master_sites ftp://thumper.bellcore.com/pub/nsb/ \ checksums md5 fd5617ea87e20d7f2fa839e1d1fede60 -distname mm${portversion} +distname mm${version} extract.suffix .tar.Z worksrcdir ${distname}/src/metamail diff --git a/textproc/opensp/Portfile b/textproc/opensp/Portfile index 61acdf7691b4..7443064ddc34 100644 --- a/textproc/opensp/Portfile +++ b/textproc/opensp/Portfile @@ -15,7 +15,7 @@ long_description OpenSP is a collection of SGML/XML tools that has \ files. master_sites sourceforge:openjade -distname OpenSP-${portversion} +distname OpenSP-${version} checksums md5 670b223c5d12cee40c9137be86b6c39b \ sha1 b4e903e980f8a8b3887396a24e067bef126e97d5 diff --git a/textproc/rfcdiff/Portfile b/textproc/rfcdiff/Portfile index 63ab4733308f..93ad00b46cd5 100644 --- a/textproc/rfcdiff/Portfile +++ b/textproc/rfcdiff/Portfile @@ -17,7 +17,7 @@ extract.suffix checksums md5 bee50ff43087a48c2c3658f0380c1421 extract.only -configure {} +use_configure no build {} destroot { diff --git a/textproc/rtfreader/Portfile b/textproc/rtfreader/Portfile index dd5e40ad8cd4..6d1cae8a78f8 100644 --- a/textproc/rtfreader/Portfile +++ b/textproc/rtfreader/Portfile @@ -29,5 +29,5 @@ configure {} build.target rtfreader destroot { system "install -o root -m 755 -d ${destroot}${prefix}/bin" - system "install -o root -m 755 ${worksrcpath}/${portname} \ + system "install -o root -m 755 ${worksrcpath}/${name} \ ${destroot}${prefix}/bin" } diff --git a/textproc/tnef2txt/Portfile b/textproc/tnef2txt/Portfile index 5d4e1ce7efe8..681a0dd45f49 100644 --- a/textproc/tnef2txt/Portfile +++ b/textproc/tnef2txt/Portfile @@ -24,6 +24,6 @@ configure {} build.target tnef2txt destroot { system "install -m 755 -d ${destroot}${prefix}/bin" - system "install -m 755 ${worksrcpath}/${portname} ${destroot}${prefix}/bin" - system "install -m 755 -d ${destroot}${prefix}/share/doc/${portname}" - system "install -m 644 apptnef.* ${destroot}${prefix}/share/doc/${portname}" } + system "install -m 755 ${worksrcpath}/${name} ${destroot}${prefix}/bin" + system "install -m 755 -d ${destroot}${prefix}/share/doc/${name}" + system "install -m 644 apptnef.* ${destroot}${prefix}/share/doc/${name}" } diff --git a/textproc/tth/Portfile b/textproc/tth/Portfile index 37844107010d..97e57b2c986f 100644 --- a/textproc/tth/Portfile +++ b/textproc/tth/Portfile @@ -20,14 +20,14 @@ dist_subdir ${name}/${version} master_sites http://hutchinson.belmont.ma.us/tth/tth-noncom/ checksums md5 3bb7081fc37a2db7b4c2e5753234b513 -distname ${portname}_C +distname ${name}_C extract.suffix .tgz use_configure no build { cd ${workpath}/${distname}; - system "cc -o ${portname} ${portname}.c" + system "cc -o ${name} ${name}.c" } destroot { diff --git a/textproc/txt2html/Portfile b/textproc/txt2html/Portfile index ff6ad628b515..5d0cc034836a 100644 --- a/textproc/txt2html/Portfile +++ b/textproc/txt2html/Portfile @@ -22,20 +22,20 @@ extract.suffix .tgz checksums md5 ba007af9d0681b3f493c84869b147071 configure {} -post-configure { reinplace "s|/usr/share/misc|${prefix}/share/${portname}|g" \ - ${worksrcpath}/${portname}.pl } +post-configure { reinplace "s|/usr/share/misc|${prefix}/share/${name}|g" \ + ${worksrcpath}/${name}.pl } build {} destroot { system "install -m 755 -d ${destroot}${prefix}/bin" - system "install -m 755 ${worksrcpath}/${portname}.pl \ - ${destroot}${prefix}/bin/${portname}" + system "install -m 755 ${worksrcpath}/${name}.pl \ + ${destroot}${prefix}/bin/${name}" system "install -m 755 -d \ - ${destroot}${prefix}/share/${portname}" - system "install -m 644 ${worksrcpath}/${portname}.dict \ - ${destroot}${prefix}/share/${portname}" + ${destroot}${prefix}/share/${name}" + system "install -m 644 ${worksrcpath}/${name}.dict \ + ${destroot}${prefix}/share/${name}" system "install -m 755 -d \ - ${destroot}${prefix}/share/doc/${portname}" + ${destroot}${prefix}/share/doc/${name}" system "install -m 644 ${worksrcpath}/* \ - ${destroot}${prefix}/share/doc/${portname}" - system "rm ${destroot}${prefix}/share/doc/${portname}/${portname}.*" } + ${destroot}${prefix}/share/doc/${name}" + system "rm ${destroot}${prefix}/share/doc/${name}/${name}.*" } diff --git a/textproc/txt2man/Portfile b/textproc/txt2man/Portfile index 3107aff50a3e..7c1661df10d0 100644 --- a/textproc/txt2man/Portfile +++ b/textproc/txt2man/Portfile @@ -19,12 +19,12 @@ master_sites http://mvertes.free.fr/download/ checksums md5 2ee6d7cc38c42b98f4d8c1eb815bd888 \ sha1 aa3989546b31c05ad09d14b895bf5a1777beefe9 -configure {} +use_configure no build {} destroot { xinstall -m 755 -d ${destroot}${prefix}/bin \ ${destroot}${prefix}/share/man/man1 - xinstall -m 755 ${worksrcpath}/${portname} \ - ${destroot}${prefix}/bin/${portname} - xinstall -m 644 ${worksrcpath}/${portname}.1 \ - ${destroot}${prefix}/share/man/man1/${portname}.1 } + xinstall -m 755 ${worksrcpath}/${name} \ + ${destroot}${prefix}/bin/${name} + xinstall -m 644 ${worksrcpath}/${name}.1 \ + ${destroot}${prefix}/share/man/man1/${name}.1 } diff --git a/www/abyss/Portfile b/www/abyss/Portfile index 7e9bbefc9179..556029c85e7d 100644 --- a/www/abyss/Portfile +++ b/www/abyss/Portfile @@ -16,11 +16,11 @@ platforms darwin master_sites sourceforge:abyss checksums md5 ca2dc7618e17dae8eea23c02dd3bbf9d patchfiles patch-src-data.c patch-src-server.c patch-conf-abyss.conf patch-src-conn.c -worksrcdir ${name} + worksrcdir ${name} post-patch { reinplace "s|__PREFIX|${prefix}|g" ${worksrcpath}/conf/abyss.conf } -configure {} +use_configure no build { system "cd ${worksrcpath}/src/ && make" } depends_run path:/Library/StartupItems/DarwinPortsStartup:DarwinPortsStartup @@ -43,4 +43,4 @@ destroot { "${portpath}/files/abyss.sh" "${destroot}${prefix}/etc/rc.d" reinplace "s|__PREFIX|${prefix}|g" \ "${destroot}${prefix}/etc/rc.d/abyss.sh" -} \ No newline at end of file +} diff --git a/www/autobench/Portfile b/www/autobench/Portfile index d32f4c666e49..2710e2775c6d 100644 --- a/www/autobench/Portfile +++ b/www/autobench/Portfile @@ -26,6 +26,6 @@ depends_run bin:httperf:httperf patch { reinplace "s|/man|/share/man|" ${worksrcpath}/Makefile } -configure {} +use_configure no build.args PREFIX=${prefix} destroot.destdir PREFIX=${destroot}${prefix} diff --git a/www/jetty/Portfile b/www/jetty/Portfile index 149795ae4c3e..793e805148d8 100644 --- a/www/jetty/Portfile +++ b/www/jetty/Portfile @@ -29,7 +29,7 @@ use_zip yes set javadest "${prefix}/share/java/${name}-${version}" -configure {} +use_configure no build {} diff --git a/www/libwww/Portfile b/www/libwww/Portfile index 6bf137fe36e2..d593bed46806 100644 --- a/www/libwww/Portfile +++ b/www/libwww/Portfile @@ -18,7 +18,7 @@ clients, robots, etc. master_sites http://www.w3.org/Library/Distribution/ \ opendarwin::lt -distname w3c-${portname}-${portversion} +distname w3c-${distname} extract.suffix .tgz distfiles-append ltconfig13:lt ltmain13:lt extract.only ${distname}${extract.suffix} diff --git a/www/lws/Portfile b/www/lws/Portfile index b8b13a42d806..b673162db0cd 100644 --- a/www/lws/Portfile +++ b/www/lws/Portfile @@ -33,4 +33,4 @@ post-patch { reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/GNUmakefile } -configure {} +use_configure no diff --git a/www/mathopd/Portfile b/www/mathopd/Portfile index f9bb23d28fb9..c8cd0826b13f 100644 --- a/www/mathopd/Portfile +++ b/www/mathopd/Portfile @@ -21,7 +21,7 @@ patch { reinplace "s|LIBS = -lcrypt||" ${worksrcpath}/Makefile } -configure {} +use_configure no destroot.destdir PREFIX=${destroot}${prefix} post-destroot { diff --git a/www/shttpd/Portfile b/www/shttpd/Portfile index c3f135036467..83374c5e77eb 100644 --- a/www/shttpd/Portfile +++ b/www/shttpd/Portfile @@ -25,7 +25,7 @@ platforms darwin master_sites sourceforge checksums sha1 596ce7b0aa480b3450b6574ac128e9f6513fb128 -configure {} +use_configure no build.cmd gcc build.target diff --git a/www/webfs/Portfile b/www/webfs/Portfile index 444ae88d2fd3..58ad66132eb4 100644 --- a/www/webfs/Portfile +++ b/www/webfs/Portfile @@ -19,6 +19,6 @@ checksums md5 6dc125fe160479404147e7bbfc781dbc patchfiles patch-ls.c -configure {} +use_configure no destroot.destdir-append prefix=${prefix} diff --git a/x11/TkPasMan/Portfile b/x11/TkPasMan/Portfile index d8eb38d39d15..0f9ec08785c1 100644 --- a/x11/TkPasMan/Portfile +++ b/x11/TkPasMan/Portfile @@ -19,7 +19,7 @@ master_sites http://www.xs4all.nl/~wbsoft/linux/projects/ checksums md5 6e039dfedb2de63cc2c5761041ec55ab depends_lib bin:wish:tk -configure {} +use_configure no build.target destroot.args BINDIR=${destroot}${prefix}/bin post-destroot { diff --git a/x11/abclock/Portfile b/x11/abclock/Portfile index 50291cdda242..b994ff137619 100644 --- a/x11/abclock/Portfile +++ b/x11/abclock/Portfile @@ -19,7 +19,7 @@ checksums md5 a0175114294c63e13a061535823db1bf patch { reinplace "s|#include ||" ${worksrcpath}/abclock.c } -configure {} +use_configure no build.target all destroot { xinstall -m 555 ${worksrcpath}/abclock ${destroot}${prefix}/bin diff --git a/x11/efont-unicode/Portfile b/x11/efont-unicode/Portfile index 12ef30d71b6d..8aaf29848050 100644 --- a/x11/efont-unicode/Portfile +++ b/x11/efont-unicode/Portfile @@ -21,7 +21,7 @@ set bdf_src {b10 b10_i b10_b b10_bi b12 b12_i b12_b b12_bi \ f12 f12_i f12_b f12_bi f16 f16_i f16_b f16_bi \ f24 f24_i f24_b f24_bi} -configure {} +use_configure no build { cd ${worksrcpath} foreach BDF ${bdf_src} { diff --git a/x11/freefont-ttf/Portfile b/x11/freefont-ttf/Portfile index 901de2bb32c2..4ff29de8ab57 100644 --- a/x11/freefont-ttf/Portfile +++ b/x11/freefont-ttf/Portfile @@ -21,7 +21,7 @@ post-extract { system "bzip2 -dc ${filespath}/${f}.bz2 > ${worksrcpath}/${f}" } } -configure {} +use_configure no build {} destroot { set fontdir ${destroot}${prefix}/share/fonts/${name} diff --git a/x11/gtk-engines/Portfile b/x11/gtk-engines/Portfile index fe4c1e0bbb44..d1e902bed33d 100644 --- a/x11/gtk-engines/Portfile +++ b/x11/gtk-engines/Portfile @@ -13,7 +13,7 @@ long_description gtk-engines is a theme engine for GTK+. It provides \ the ability to change the way widgets, buttons, etc. \ look when using GTK+ applications. -distname ${portname}-${portversion} +distname ${name}-${version} distfiles-append ltconfig13:lt ltmain13:lt extract.only ${distname}${extract.suffix} diff --git a/x11/gtk-engines2/Portfile b/x11/gtk-engines2/Portfile index 465ceb9f371c..ede8bbd8b218 100644 --- a/x11/gtk-engines2/Portfile +++ b/x11/gtk-engines2/Portfile @@ -15,7 +15,7 @@ long_description gtk-engines2 is a theme engine for GTK+ 2. It provides \ master_sites gnome:sources/gtk-engines/2.10 -distname gtk-engines-${portversion} +distname gtk-engines-${version} checksums md5 245d0939025f8f9856c2309071cf075e \ sha1 0e705216a15aadd898e77307f326812a7375b460 \ rmd160 4a65ed87984cce4e8379e0c29126f081650d01e2 diff --git a/x11/gtk-theme-switch/Portfile b/x11/gtk-theme-switch/Portfile index 1dde46a445a2..2d12234d716f 100644 --- a/x11/gtk-theme-switch/Portfile +++ b/x11/gtk-theme-switch/Portfile @@ -21,7 +21,7 @@ depends_lib lib:gtk-engines2:gtk-engines2 build.target switch2 -configure {} +use_configure no destroot { xinstall -m 755 ${worksrcpath}/switch2 ${destroot}${prefix}/bin diff --git a/x11/gtk1/Portfile b/x11/gtk1/Portfile index d962e589d185..3e6a289766a7 100644 --- a/x11/gtk1/Portfile +++ b/x11/gtk1/Portfile @@ -17,8 +17,8 @@ long_description This is GTK+ version 1.2.10. GTK+, which stands for \ master_sites ftp://ftp.gtk.org/pub/gtk/v1.2/ \ opendarwin::lt -distname gtk+-${portversion} -set filename gtk+-${portversion}${extract.suffix} +distname gtk+-${version} +set filename gtk+-${version}${extract.suffix} distfiles ${filename} ltconfig13:lt ltmain13:lt checksums gtk+-1.2.10.tar.gz md5 4d5cb2fc7fb7830e4af9747a36bfce20 \ ltconfig13 md5 ea53f42a550c9f9e653758a8ed91574e \ diff --git a/x11/gtk2/Portfile b/x11/gtk2/Portfile index 7e1c08d3a943..e439b328b0c7 100644 --- a/x11/gtk2/Portfile +++ b/x11/gtk2/Portfile @@ -18,7 +18,7 @@ master_sites gnome:sources/gtk+/2.10 \ ftp://ftp.gtk.org/pub/gtk/v2.10 \ http://ftp.gtk.org/pub/gtk/v2.10 -distname gtk+-${portversion} +distname gtk+-${version} checksums md5 3b32eab43bf5195d981867d25ba55d66 \ sha1 3c68f3fa13ab72f6b190cbe958813d29955042e2 \ diff --git a/x11/gtk26/Portfile b/x11/gtk26/Portfile index a9371284255b..4db4c9163a7f 100644 --- a/x11/gtk26/Portfile +++ b/x11/gtk26/Portfile @@ -15,7 +15,7 @@ long_description This is GTK+ version 2.6.8. GTK+, which stands for Gimp \ master_sites gnome:sources/gtk+/2.6 -distname gtk+-${portversion} +distname gtk+-${version} checksums md5 535fa4b62d219445b99953f679b5cf8e use_bzip2 yes diff --git a/x11/gtk28/Portfile b/x11/gtk28/Portfile index a0ec55abccfa..62a805656ef8 100644 --- a/x11/gtk28/Portfile +++ b/x11/gtk28/Portfile @@ -16,7 +16,7 @@ long_description This is GTK+ version 2.x. GTK+, which stands for Gimp \ master_sites ftp://ftp.gtk.org/pub/gtk/v2.8 \ gnome:sources/gtk+/2.8 -distname gtk+-${portversion} +distname gtk+-${version} checksums md5 74e7ca98194f1fadfe906e66d763d05d \ sha1 8ea2449ff139b8bc457f8b5bcdcad93b02cfba9e \ rmd160 d20254de9e5b37b19f432758fbd78fff4c6baf1e diff --git a/x11/gtkspell2/Portfile b/x11/gtkspell2/Portfile index c94f69848e74..578f98ead2de 100644 --- a/x11/gtkspell2/Portfile +++ b/x11/gtkspell2/Portfile @@ -12,7 +12,7 @@ long_description GtkSpell provides word-processor-style highlighting \ menu of suggested replacements. homepage http://gtkspell.sourceforge.net master_sites $homepage/download -distname gtkspell-${portversion} +distname gtkspell-${version} checksums md5 494869f67146a12a3f17a958f51aeb05 depends_lib lib:libaspell:aspell \ lib:gtk.2:gtk2 diff --git a/x11/itk/Portfile b/x11/itk/Portfile index 068244903390..98e13b0b6a5d 100644 --- a/x11/itk/Portfile +++ b/x11/itk/Portfile @@ -10,14 +10,14 @@ description \[incr Tk\] A.K.A. \"itk\". Object oriented extension to Tk. platforms darwin master_sites sourceforge:incrtcl:itk \ http://www.opendarwin.org/~markd/:tclpheaders -distname ${portname}${portversion} +distname ${name}${version} distfiles ${distname}.tar.gz:itk \ tcl8.4.12-privateheaders-full.tar.gz:tclpheaders -checksums ${portname}${portversion}.tar.gz md5 a97c17f3cfa5e377f43073c653c501b5 \ +checksums ${name}${version}.tar.gz md5 a97c17f3cfa5e377f43073c653c501b5 \ tcl8.4.12-privateheaders-full.tar.gz md5 ec9b85fad111b51b746fe45a2dc1e8fb depends_build port:tk port:itcl build.args CPPFLAGS=-I${prefix}/include -worksrcdir ${portname}${portversion} +worksrcdir ${name}${version} set tclconfig ${prefix}/lib configure.args --with-tcl=${tclconfig} \ diff --git a/x11/iwidgets/Portfile b/x11/iwidgets/Portfile index f0c5d0388359..de146cd1687a 100644 --- a/x11/iwidgets/Portfile +++ b/x11/iwidgets/Portfile @@ -9,11 +9,11 @@ maintainers nomaintainer@macports.org description \[incr Widgets\] A.K.A. \"iwidgets\". Widget collection for incrTcl/incrTk platforms darwin master_sites sourceforge:incrtcl -distname ${portname}${portversion} -checksums ${portname}${portversion}.tar.gz md5 0e9c140e81ea6015b56130127c7deb03 +distname ${name}${version} +checksums ${name}${version}.tar.gz md5 0e9c140e81ea6015b56130127c7deb03 depends_build port:tk port:itcl build.args CPPFLAGS=-I${prefix}/include -worksrcdir ${portname}${portversion} +worksrcdir ${name}${version} patchfiles patch-configure \ patch-Makefile.in diff --git a/x11/kochi-substitute/Portfile b/x11/kochi-substitute/Portfile index 7055e6ae9e62..3f7d35ed9b37 100644 --- a/x11/kochi-substitute/Portfile +++ b/x11/kochi-substitute/Portfile @@ -16,7 +16,7 @@ master_sites http://osdn.dl.sourceforge.jp/efont/5411/ \ use_bzip2 yes checksums md5 c4b14e287cf2b1688c649e2274e128b3 depends_lib bin:mkfontdir:XFree86 bin:mkfontscale:XFree86 -configure {} +use_configure no build {} destroot { diff --git a/x11/mikachanfont/Portfile b/x11/mikachanfont/Portfile index c93a7f4bd923..e6a4d2dac75d 100644 --- a/x11/mikachanfont/Portfile +++ b/x11/mikachanfont/Portfile @@ -22,7 +22,7 @@ master_sites http://osdn.dl.sourceforge.jp/mikachan/5513/ \ use_bzip2 yes checksums md5 8ac2b94336e76fa80996d0be70c557de depends_lib bin:mkfontdir:XFree86 bin:mkfontscale:XFree86 -configure {} +use_configure no build {} destroot { set fontsdir ${destroot}/${prefix}/share/fonts/${name} diff --git a/x11/monafont/Portfile b/x11/monafont/Portfile index a5c72b7b80cd..1566643041de 100644 --- a/x11/monafont/Portfile +++ b/x11/monafont/Portfile @@ -16,7 +16,7 @@ master_sites sourceforge use_bzip2 yes checksums md5 2b914878b19b1550757cea5d8a771612 depends_lib lib:libX11.6:XFree86 -configure {} +use_configure no build.target {} destroot.destdir X11FONTDIR=${destroot}${prefix}/share/fonts/monafont pre-destroot { diff --git a/x11/qt3/Portfile b/x11/qt3/Portfile index b4426093644b..4e432abfd6c3 100644 --- a/x11/qt3/Portfile +++ b/x11/qt3/Portfile @@ -14,7 +14,7 @@ platforms darwin master_sites ftp://ftp.trolltech.com/qt/source/:qt3 \ http://ftp.silug.org/mirrors/ftp.trolltech.com/qt/source/:qt3 \ http://ranger.befunk.com/fink/:fink -distname qt-x11-free-${portversion} +distname qt-x11-free-${version} distfiles ${distname}.tar.bz2:qt3 \ qt-upstream-patches-0003.tar.bz2:fink use_bzip2 yes diff --git a/x11/sazanami-font/Portfile b/x11/sazanami-font/Portfile index d7b6f7102462..020bfaf72fcc 100644 --- a/x11/sazanami-font/Portfile +++ b/x11/sazanami-font/Portfile @@ -16,7 +16,7 @@ distname sazanami-${version} use_bzip2 yes checksums md5 ceef10579a75c92483171f3bd7f77df2 depends_lib bin:mkfontdir:XFree86 bin:mkfontscale:XFree86 -configure {} +use_configure no build {} destroot { set fontsdir ${destroot}${prefix}/share/fonts/sazanami diff --git a/x11/urw-fonts/Portfile b/x11/urw-fonts/Portfile index 96313842bab1..3d250e539830 100644 --- a/x11/urw-fonts/Portfile +++ b/x11/urw-fonts/Portfile @@ -25,7 +25,7 @@ extract.dir ${worksrcpath} pre-extract { file mkdir ${worksrcpath} } -configure {} +use_configure no build {} destroot { set fontsdir ${destroot}${prefix}/share/fonts/${name} diff --git a/x11/xmove/Portfile b/x11/xmove/Portfile index 6023cf6fb929..6fcfb4289b39 100644 --- a/x11/xmove/Portfile +++ b/x11/xmove/Portfile @@ -20,7 +20,7 @@ checksums md5 d70107f7835b755bd4f57b47a8ac7b38 #if this is set, put manpages in man and not share/man #prefix ${x11prefix} -distname ${portname}.${version} +distname ${name}.${version} patchfiles patch-XMOVELib.c patch-externs.h patch-main.c patch-move_window.c \ patch-print11.c patch-put_image.c patch-server.c patch-xmovectrl.h diff --git a/x11/xspringies/Portfile b/x11/xspringies/Portfile index 4c711d11ae24..eccd42110ef3 100644 --- a/x11/xspringies/Portfile +++ b/x11/xspringies/Portfile @@ -16,4 +16,4 @@ checksums md5 0958e74178cdf5c49fa05c640ce16011 prefix ${x11prefix} use_xmkmf yes patchfiles patch-Imakefile -distfiles ${portname}.${portversion}.tar.Z +distfiles ${name}.${version}.tar.Z