Skip to content

Commit

Permalink
nomaintainer ports: remove old base compat code
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmroot
jmroot committed Oct 6, 2019
1 parent e957432 commit 88ea584
Show file tree
Hide file tree
Showing 118 changed files with 5 additions and 839 deletions.
10 changes: 0 additions & 10 deletions archivers/deco-archive/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,6 @@ master_sites ${homepage}download/
checksums rmd160 09482ab28c92e09161160f5240d0c967435074cd \
sha256 128253a1b232ac10993d7a20b6cb31dfc1f4ad9d9015b0483a33fb6ea558844d

pre-fetch {
if {[info command macports_version] ne "macports_version" || [vercmp [macports_version] "2.3.3"] <= 0} {
ui_error "Due to a bug in MacPorts, this port only works in MacPorts\
versions later then 2.3.3, once they are released. See\
#47283 (https://trac.macports.org/ticket/47283) for more\
information."
error "incompatible macports version"
}
}

use_configure no
build {}

Expand Down
9 changes: 0 additions & 9 deletions archivers/zstd/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,12 @@ variant universal {}

build.target allmost

if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env-append CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
CXX=${configure.cxx} \
"CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
PREFIX=${prefix}
} else {
build.env-append CC="${configure.cc}" \
CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
CXX="${configure.cxx}" \
CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
PREFIX="${prefix}"
}

test.run yes
test.env-append {*}${build.env}
Expand Down
5 changes: 0 additions & 5 deletions audio/mp3_check/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,8 @@ configure.cflags-append -std=gnu89

use_configure no
variant universal {}
if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]"
} else {
build.env CC="${configure.cc}" \
CFLAGS="${configure.cflags} [get_canonical_archflags cc]"
}

destroot {
xinstall -m 755 ${worksrcpath}/mp3_check \
Expand Down
6 changes: 0 additions & 6 deletions benchmarks/forkbomb/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,8 @@ patchfiles patch-Makefile.diff
use_configure no

variant universal {}
if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env-append CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
} else {
build.env-append CC=${configure.cc} \
CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
}

destroot.args-append PREFIX=${prefix}
4 changes: 0 additions & 4 deletions benchmarks/nbench-byte/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,7 @@ post-install {
}

if {${build_arch} ne ""} {
if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env-append CFLAGS=${configure.cc_archflags}
} else {
build.env-append CFLAGS="${configure.cc_archflags}"
}
}

livecheck.type regex
Expand Down
16 changes: 0 additions & 16 deletions databases/leveldb/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ if {[string match *clang* ${configure.cxx}]} {
configure.ldflags-append -stdlib=${configure.cxx_stdlib}
}

if {[vercmp [macports_version] 2.5.99] >= 0} {
if { [variant_isset universal] } {
foreach arch ${configure.universal_archs} {
lappend merger_build_env(${arch}) \
Expand All @@ -62,21 +61,6 @@ if { [variant_isset universal] } {
"CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
}
} else {
if { [variant_isset universal] } {
foreach arch ${configure.universal_archs} {
lappend merger_build_env(${arch}) \
CFLAGS="${configure.cflags} -arch ${arch}" \
CXXFLAGS="${configure.cxxflags} -arch ${arch}" \
LDFLAGS="${configure.ldflags} -arch ${arch}"
}
} else {
build.env-append \
CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
}
}

build.env-append \
INSTALL_PATH=${prefix}/lib \
Expand Down
11 changes: 0 additions & 11 deletions databases/tokyocabinet-java/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ set javahome /System/Library/Frameworks/JavaVM.framework
patch.args -p1
patchfiles patch-Makefile.in.diff

if {[vercmp [macports_version] 2.5.99] >= 0} {
## configure ##
configure.env MYJAVAHOME=${javahome} \
"CFLAGS=-I${prefix}/include -I${javahome}/Headers" \
Expand All @@ -34,16 +33,6 @@ configure.env MYJAVAHOME=${javahome} \
## build ##
build.env "CFLAGS=-I${prefix}/include -I${javahome}/Headers" \
LDFLAGS=-L${prefix}/lib
} else {
## configure ##
configure.env MYJAVAHOME=${javahome} \
CFLAGS="-I${prefix}/include -I${javahome}/Headers" \
LDFLAGS=-L${prefix}/lib INCLUDEDIR=${javahome}/Headers

## build ##
build.env CFLAGS="-I${prefix}/include -I${javahome}/Headers" \
LDFLAGS=-L${prefix}/lib
}

post-destroot {
set jarfile tokyocabinet.jar
Expand Down
9 changes: 1 addition & 8 deletions devel/PIDA/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,11 @@ depends_lib port:py${python.version}-bpython \
port:py${python.version}-py \
port:libmagic \
port:dbus-python${python.version}
if {[vercmp [macports_version] 2.5.99] >= 0} {

build.env PKG_CONFIG_PATH=${python.prefix}/lib/pkgconfig \
PATH=${python.prefix}/bin:$env(PATH)

destroot.env PKG_CONFIG_PATH=${python.prefix}/lib/pkgconfig \
PATH=${python.prefix}/bin:$env(PATH)
} else {
build.env PKG_CONFIG_PATH="${python.prefix}/lib/pkgconfig" \
PATH="${python.prefix}/bin:$env(PATH)"

destroot.env PKG_CONFIG_PATH="${python.prefix}/lib/pkgconfig" \
PATH="${python.prefix}/bin:$env(PATH)"
}

livecheck.type none
6 changes: 0 additions & 6 deletions devel/bsdiff/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,9 @@ patchfiles patch-bspatch.c.diff \
use_configure no

variant universal {}
if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env-append CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
} else {
build.env-append CC="${configure.cc}" \
CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
}

destroot.destdir PREFIX=${destroot}${prefix}

Expand Down
8 changes: 0 additions & 8 deletions devel/csu/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,14 @@ checksums rmd160 5196472e25fbe87566646d3cfba55f8c20c6d482 \

use_configure no
default_variants +universal
if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env-append "CC=${configure.cc} -Wl,-new_linker"
} else {
build.env-append CC='${configure.cc} -Wl,-new_linker'
}
destroot.env-append DSTROOT=${destroot}${prefix}/Developer/SDKs/Darwin${os.major}.sdk

variant universal {
if {${os.major} == 9} {
configure.universal_archs ppc ppc64 i386 x86_64
}
if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env-append RC_ARCHS=${configure.universal_archs}
} else {
build.env-append RC_ARCHS='${configure.universal_archs}'
}
}

platform darwin 9 {
Expand Down
8 changes: 0 additions & 8 deletions devel/cvsps/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,10 @@ depends_lib port:zlib
patchfiles cvsps_2.1-4.diff Makefile.diff

use_configure no
if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env CC=${configure.cc} \
CPPFLAGS=${configure.cppflags} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
prefix=${prefix}
} else {
build.env CC=${configure.cc} \
CPPFLAGS="${configure.cppflags}" \
CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
prefix=${prefix}
}

destroot.env prefix=${prefix}
5 changes: 0 additions & 5 deletions devel/darwinbuild-legacy/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,8 @@ revision 656
build.post_args-append \
PREFIX=${prefix}
if {[info exists build_arch]} {
if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env-append \
"RC_CFLAGS=-arch ${build_arch}"
} else {
build.env-append \
RC_CFLAGS="-arch ${build_arch}"
}
}
destroot.post_args-append \
PREFIX=${prefix}
Expand Down
15 changes: 0 additions & 15 deletions devel/dub/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ patchfiles-append patch-dub.d.diff
post-patch {
reinplace "s|__MACPORTS_PREFIX__|${prefix}|g" source/dub/dub.d
}
if {[vercmp [macports_version] 2.5.99] >= 0} {
if { ![variant_isset universal] } {
if { ${build_arch} eq "x86_64" || ${build_arch} eq "ppc64" } {
build.env-append "DMD=${prefix}/bin/dmd -m64"
Expand All @@ -58,19 +57,5 @@ if { ![variant_isset universal] } {
lappend merger_build_env(ppc64) "DMD=${prefix}/bin/dmd -m64"
lappend merger_build_env(ppc) "DMD=${prefix}/bin/dmd -m32"
}
} else {
if { ![variant_isset universal] } {
if { ${build_arch} eq "x86_64" || ${build_arch} eq "ppc64" } {
build.env-append DMD="${prefix}/bin/dmd -m64"
} else {
build.env-append DMD="${prefix}/bin/dmd -m32"
}
} else {
lappend merger_build_env(x86_64) DMD='${prefix}/bin/dmd -m64'
lappend merger_build_env(i386) DMD='${prefix}/bin/dmd -m32'
lappend merger_build_env(ppc64) DMD='${prefix}/bin/dmd -m64'
lappend merger_build_env(ppc) DMD='${prefix}/bin/dmd -m32'
}
}

github.livecheck.regex {([^"rba]+)}
6 changes: 1 addition & 5 deletions devel/libast/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,4 @@ patchfiles patch-configure.ac.diff

use_autoreconf yes
autoreconf.args -fvi
if {[vercmp [macports_version] 2.5.99] >= 0} {
autoreconf.env "ACLOCAL=aclocal -I ${prefix}/share/aclocal -I ."
} else {
autoreconf.env ACLOCAL="aclocal -I ${prefix}/share/aclocal -I ."
}
autoreconf.env "ACLOCAL=aclocal -I ${prefix}/share/aclocal -I ."
7 changes: 0 additions & 7 deletions devel/libghash/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,10 @@ patchfiles patch-Makefile

use_configure no

if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env PREFIX=${prefix} \
CC=${configure.cc} \
"CFLAGS=${configure.cflags} ${configure.cc_archflags}" \
LDFLAGS=${configure.ld_archflags}
} else {
build.env PREFIX="${prefix}" \
CC="${configure.cc}" \
CFLAGS="${configure.cflags} ${configure.cc_archflags}" \
LDFLAGS="${configure.ld_archflags}"
}

destroot.env PREFIX=${prefix}

Expand Down
6 changes: 0 additions & 6 deletions devel/libmaxminddb/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,9 @@ github.tarball_from releases
depends_build port:automake port:autoconf port:libtool

# For the t/libtap subdirectory.
if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env-append CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
} else {
build.env-append CC="${configure.cc}" \
CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
}

test.run yes
test.target check
Expand Down
8 changes: 0 additions & 8 deletions devel/lua-luasec/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,11 @@ set lua_path ${prefix}/share/lua/${lua_version}
set lua_cpath ${prefix}/lib/lua/${lua_version}

build.target macosx
if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env "CC=${configure.cc} [get_canonical_archflags]" \
INC_PATH=-I${prefix}/include \
LIB_PATH=-L${prefix}/lib \
LUAPATH=${lua_path} \
LUACPATH=${lua_cpath}
} else {
build.env CC="${configure.cc} [get_canonical_archflags]" \
INC_PATH=-I${prefix}/include \
LIB_PATH=-L${prefix}/lib \
LUAPATH=${lua_path} \
LUACPATH=${lua_cpath}
}

destroot.env LUAPATH=${lua_path} \
LUACPATH=${lua_cpath}
5 changes: 0 additions & 5 deletions devel/lua-md5/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,8 @@ build.args CC=${configure.cc} \

# configure script is not from autotools, it only searches for lua binary prefix
# it is needed to manually set flags env variable in build phase
if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env-append "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld] -llua -lm"
} else {
build.env-append CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld] -llua -lm"
}

post-build {
# fdemo example is broken, it's using libcrypt
Expand Down
5 changes: 0 additions & 5 deletions devel/lua-rings/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,8 @@ post-patch {
variant universal {}

# it is needed to manually set flags env variable as well
if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env-append "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld] -llua -lm"
} else {
build.env-append CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld] -llua -lm"
}

post-destroot {
xinstall -d ${destroot}${prefix}/share/doc/${name}
Expand Down
5 changes: 0 additions & 5 deletions devel/nuweb/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,8 @@ checksums rmd160 0c32ae064d742ff32bde14ab4a6a269c52772b84 \
use_configure no

build.target nuweb
if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env-append CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc] -std=gnu89 -Wno-return-type"
} else {
build.env-append CC=${configure.cc} \
CFLAGS='${configure.cflags} [get_canonical_archflags cc] -std=gnu89 -Wno-return-type'
}

destroot {
xinstall -m 0755 ${build.dir}/nuweb ${destroot}${prefix}/bin
Expand Down
9 changes: 0 additions & 9 deletions devel/qqwing/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,11 @@ post-patch {

use_configure no
variant universal {}
if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
CPPFLAGS=${configure.cppflags} \
CXX=${configure.cxx} \
"CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
} else {
build.env CC="${configure.cc}" \
CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
CPPFLAGS="${configure.cppflags}" \
CXX="${configure.cxx}" \
CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
}

build.target tgz
Loading

0 comments on commit 88ea584

Please sign in to comment.