diff options
58 files changed, 81 insertions, 110 deletions
diff --git a/audio/asterisk-espeak/Makefile b/audio/asterisk-espeak/Makefile index e2601e07097e..fadd5c7c5fd3 100644 --- a/audio/asterisk-espeak/Makefile +++ b/audio/asterisk-espeak/Makefile @@ -15,11 +15,10 @@ LIB_DEPENDS= libespeak.so:audio/espeak \ USE_GITHUB= yes GH_ACCOUNT= zaf -GH_PROJECT= Asterisk-Espeak +GH_PROJECT= Asterisk-eSpeak USES= compiler gmake localbase INSTALL_TARGET= install samples -WRKSRC= ${WRKDIR}/Asterisk-eSpeak-${PORTVERSION} OPTIONS_SINGLE= ASTVER OPTIONS_SINGLE_ASTVER= ASTERISK11 ASTERISK13 diff --git a/audio/asterisk-espeak/distinfo b/audio/asterisk-espeak/distinfo index 9bc0620fd35c..3990e3e6bb3c 100644 --- a/audio/asterisk-espeak/distinfo +++ b/audio/asterisk-espeak/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1474384491 -SHA256 (zaf-Asterisk-Espeak-v3.0_GH0.tar.gz) = 47c7629853ad54a2f3b50a5407db356ab7806f5fa40f9811a129208d6eeec398 -SIZE (zaf-Asterisk-Espeak-v3.0_GH0.tar.gz) = 13758 +TIMESTAMP = 1483464333 +SHA256 (zaf-Asterisk-eSpeak-v3.0_GH0.tar.gz) = 47c7629853ad54a2f3b50a5407db356ab7806f5fa40f9811a129208d6eeec398 +SIZE (zaf-Asterisk-eSpeak-v3.0_GH0.tar.gz) = 13758 diff --git a/audio/puddletag/Makefile b/audio/puddletag/Makefile index 5ff847e0184d..2e617b1cc495 100644 --- a/audio/puddletag/Makefile +++ b/audio/puddletag/Makefile @@ -23,7 +23,7 @@ GH_ACCOUNT= keithgg USES= python:2 pyqt:4 USE_PYTHON= autoplist distutils USE_PYQT= gui_run svg_run -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/source +WRKSRC_SUBDIR= source NO_BUILD= yes NO_ARCH= yes diff --git a/biology/fastool/Makefile b/biology/fastool/Makefile index 0e290569743e..51f5f5bc5e19 100644 --- a/biology/fastool/Makefile +++ b/biology/fastool/Makefile @@ -14,8 +14,6 @@ USE_GITHUB= yes GH_ACCOUNT= fstrozzi GH_PROJECT= Fastool -WRKSRC= ${WRKDIR}/Fastool-${PORTVERSION} - PLIST_FILES= bin/fastool CFLAGS+= -std=c99 diff --git a/biology/p5-transdecoder/Makefile b/biology/p5-transdecoder/Makefile index 003ec621d474..cbd48413f3a4 100644 --- a/biology/p5-transdecoder/Makefile +++ b/biology/p5-transdecoder/Makefile @@ -26,8 +26,6 @@ SHEBANG_FILES= sample_data/cufflinks_example/runMe.sh \ USE_GITHUB= yes GH_PROJECT= TransDecoder -WRKSRC= ${WRKDIR}/${GH_PROJECT}-${PORTVERSION} - PERL_MOD_DIR= ${PREFIX}/${SITE_PERL_REL}/${PORTNAME} PERL_UTIL_DIR= ${PREFIX}/libexec/${PORTNAME} diff --git a/cad/linuxcnc-devel/Makefile b/cad/linuxcnc-devel/Makefile index 42d3c2ee72cd..46ce9bb8719c 100644 --- a/cad/linuxcnc-devel/Makefile +++ b/cad/linuxcnc-devel/Makefile @@ -1,10 +1,11 @@ # Created by: Edward Tomasz Napierala <trasz@FreeBSD.org> # $FreeBSD$ -PORTNAME= linuxcnc-devel +PORTNAME= linuxcnc PORTVERSION= 20160626 PORTREVISION= 1 CATEGORIES= cad +PKGNAMESUFFIX= -devel MAINTAINER= trasz@FreeBSD.org COMMENT= Open Source CNC machine controller @@ -30,7 +31,7 @@ BUILD_DEPENDS= ${RUN_DEPENDS} NO_PACKAGE= Licensing conflict between LinuxCNC (GPL2) and readline (GPL3) -WRKSRC= ${WRKDIR}/linuxcnc-${GH_TAGNAME}/src +WRKSRC_SUBDIR= src PATCH_WRKSRC= ${WRKDIR}/linuxcnc-${GH_TAGNAME} ALL_TARGET= default @@ -47,7 +48,6 @@ USE_XORG= ice sm x11 xext xft xinerama xmu xrender xscrnsaver xt USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= LinuxCNC -GH_PROJECT= linuxcnc GH_TAGNAME= fe7b155c03fe77d6eb301bcfdc3d7c1acdea73e4 post-patch: diff --git a/cad/openvsp/Makefile b/cad/openvsp/Makefile index b5b773782f2b..05da0e6dcdf1 100644 --- a/cad/openvsp/Makefile +++ b/cad/openvsp/Makefile @@ -33,8 +33,6 @@ USE_GITHUB= yes GH_PROJECT= OpenVSP GH_ACCOUNT= ${GH_PROJECT} -WRKSRC= ${WRKDIR}/${GH_PROJECT}-${GH_PROJECT}_${PORTVERSION} - CMAKE_SOURCE_PATH= ${WRKSRC}/SuperProject CMAKE_INSTALL_PREFIX= ${STAGEDIR}${PREFIX} USES= cmake:outsource compiler:gcc-c++11-lib jpeg diff --git a/databases/postgresql-plv8js/Makefile b/databases/postgresql-plv8js/Makefile index 3b3b7b44b478..7a9eb1144a43 100644 --- a/databases/postgresql-plv8js/Makefile +++ b/databases/postgresql-plv8js/Makefile @@ -1,11 +1,12 @@ # Created by: vanilla@ # $FreeBSD$ -PORTNAME= plv8js +PORTNAME= plv8 PORTVERSION= 1.4.8 DISTVERSIONPREFIX= v CATEGORIES= databases PKGNAMEPREFIX= postgresql${PGSQL_VER:S/.//}- +PKGNAMESUFFIX= js MAINTAINER= vanilla@FreeBSD.org COMMENT= PL/v8js procedural language for PostgreSQL database @@ -14,11 +15,9 @@ LICENSE= PostgreSQL LIB_DEPENDS+= libv8.so:lang/v8 -WRKSRC= ${WRKDIR}/plv8-${PORTVERSION} USES= compiler:c++11-lang gmake perl5 pgsql:9.1+ USE_PERL5= build USE_GITHUB= yes -GH_ACCOUNT= plv8 PLIST_SUB+= PORTVERSION="${PORTVERSION}" .include <bsd.port.mk> diff --git a/databases/postgresql-plv8js/distinfo b/databases/postgresql-plv8js/distinfo index 879555e6b144..3311176877e1 100644 --- a/databases/postgresql-plv8js/distinfo +++ b/databases/postgresql-plv8js/distinfo @@ -1,2 +1,3 @@ -SHA256 (plv8-plv8js-v1.4.8_GH0.tar.gz) = 485c4bb02cc4e7300d249d9ec0dc2be8f7f6b69ded0fd91ba4f7a4ed90ad384a -SIZE (plv8-plv8js-v1.4.8_GH0.tar.gz) = 155736 +TIMESTAMP = 1483464767 +SHA256 (plv8-plv8-v1.4.8_GH0.tar.gz) = 485c4bb02cc4e7300d249d9ec0dc2be8f7f6b69ded0fd91ba4f7a4ed90ad384a +SIZE (plv8-plv8-v1.4.8_GH0.tar.gz) = 155736 diff --git a/devel/dbus-sharp-glib/Makefile b/devel/dbus-sharp-glib/Makefile index ab02401fc298..6245cc554cd1 100644 --- a/devel/dbus-sharp-glib/Makefile +++ b/devel/dbus-sharp-glib/Makefile @@ -14,10 +14,8 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dbus-sharp-1.0.pc:devel/dbus-sharp USES= gmake pathfix pkgconfig USE_GITHUB= yes GH_ACCOUNT= mono -GH_PROJECT= dbus-sharp GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_path_GMCS=${LOCALBASE}/bin/mcs -WRKSRC= ${WRKDIR}/${DISTNAME} .include <bsd.port.mk> diff --git a/devel/ice/Makefile b/devel/ice/Makefile index ba6fab6facd3..878e55509b6e 100644 --- a/devel/ice/Makefile +++ b/devel/ice/Makefile @@ -35,8 +35,6 @@ USES+= python:build BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib .endif -WRKSRC= ${WRKDIR}/ice-${PORTVERSION} - USES+= bdb:5 INVALID_BDB_VER= 48 6 USE_LDCONFIG= yes @@ -44,7 +42,7 @@ BUILD_WRKSRC?= ${WRKSRC}/cpp INSTALL_WRKSRC?= ${WRKSRC}/cpp USE_GITHUB= yes GH_ACCOUNT= zeroc-ice - +GH_PROJECT= ice CFLAGS+= -ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT -I${LOCALBASE}/include diff --git a/devel/ice/distinfo b/devel/ice/distinfo index 535eb1621adb..611fd6d2eff1 100644 --- a/devel/ice/distinfo +++ b/devel/ice/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1476218141 -SHA256 (zeroc-ice-Ice-v3.6.3_GH0.tar.gz) = 82ff74e6d24d9fa396dbb4d9697dc183b17bc9c3f6f076fecdc05632be80a2dc -SIZE (zeroc-ice-Ice-v3.6.3_GH0.tar.gz) = 5512741 +TIMESTAMP = 1483464992 +SHA256 (zeroc-ice-ice-v3.6.3_GH0.tar.gz) = 82ff74e6d24d9fa396dbb4d9697dc183b17bc9c3f6f076fecdc05632be80a2dc +SIZE (zeroc-ice-ice-v3.6.3_GH0.tar.gz) = 5512741 diff --git a/devel/lua-alien/Makefile b/devel/lua-alien/Makefile index 82ff0d9a8dac..885db5eb9c6d 100644 --- a/devel/lua-alien/Makefile +++ b/devel/lua-alien/Makefile @@ -14,8 +14,6 @@ LICENSE= MIT LIB_DEPENDS= libffi.so:devel/libffi -WRKSRC= ${WRKDIR}/${DISTNAME} - USE_GITHUB= yes GH_ACCOUNT= mascarenhas diff --git a/devel/monodevelop/Makefile b/devel/monodevelop/Makefile index 11ac1bc2f136..ca345d5dd075 100644 --- a/devel/monodevelop/Makefile +++ b/devel/monodevelop/Makefile @@ -63,7 +63,7 @@ INSTALLS_ICONS= yes INSTALL_TARGET= install-strip MAKE_JOBS_UNSAFE= Build parallelization not implemented -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTNAME}-${PORTVERSION}/main +WRKSRC_SUBDIR= main PORTSCOUT= limit:^\d+\.\d+\.[1-9]\d* post-extract: diff --git a/devel/py-protobuf/Makefile b/devel/py-protobuf/Makefile index c2f32432d24c..61bfd5e11962 100644 --- a/devel/py-protobuf/Makefile +++ b/devel/py-protobuf/Makefile @@ -21,7 +21,7 @@ NO_ARCH= yes TEST_TARGET= test USE_PYTHON= autoplist distutils USES= python -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/python +WRKSRC_SUBDIR= python GH_ACCOUNT= google USE_GITHUB= yes diff --git a/devel/tcllib/Makefile b/devel/tcllib/Makefile index 208da9ded07b..ae5bfc5fbf69 100644 --- a/devel/tcllib/Makefile +++ b/devel/tcllib/Makefile @@ -18,7 +18,6 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept OPTIONS_DEFINE?=DOCS MANPAGES OPTIONS_SUB= yes -WRKSRC= ${WRKDIR}/tcllib-tcllib_${DISTVERSION} USE_GITHUB= yes GH_ACCOUNT= tcltk USES+= tcl diff --git a/games/pyfa/Makefile b/games/pyfa/Makefile index 4d8b52317d6d..a59375a9f1d1 100644 --- a/games/pyfa/Makefile +++ b/games/pyfa/Makefile @@ -19,11 +19,11 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \ USE_GITHUB= yes GH_ACCOUNT= pyfa-org +GH_PROJECT= Pyfa USES= python:2 dos2unix DOS2UNIX_GLOB= *.py NO_ARCH= yes -WRKSRC= ${WRKDIR}/Pyfa-${PORTVERSION} PLIST_FILES= bin/pyfa PORTDATA= * diff --git a/games/pyfa/distinfo b/games/pyfa/distinfo index 37c47d4b8953..0f074739df17 100644 --- a/games/pyfa/distinfo +++ b/games/pyfa/distinfo @@ -1,2 +1,3 @@ -SHA256 (pyfa-org-pyfa-v1.19.1_GH0.tar.gz) = f597019117b335971287fd47c1faa5be049f8a6879d4144b6c8a0039f35cea98 -SIZE (pyfa-org-pyfa-v1.19.1_GH0.tar.gz) = 6688136 +TIMESTAMP = 1483465523 +SHA256 (pyfa-org-Pyfa-v1.19.1_GH0.tar.gz) = f597019117b335971287fd47c1faa5be049f8a6879d4144b6c8a0039f35cea98 +SIZE (pyfa-org-Pyfa-v1.19.1_GH0.tar.gz) = 6688136 diff --git a/graphics/iiview/Makefile b/graphics/iiview/Makefile index c79ff2315427..f0a3f08fb629 100644 --- a/graphics/iiview/Makefile +++ b/graphics/iiview/Makefile @@ -19,7 +19,6 @@ USE_XORG= xpm x11 USE_GITHUB= yes GH_ACCOUNT= nakal -WRKSRC= ${WRKDIR}/iiview-${PORTVERSION} PLIST_FILES= bin/iiview man/man1/iiview.1.gz diff --git a/graphics/qtawesome/Makefile b/graphics/qtawesome/Makefile index bc68d5b7948d..aeb2456cd01c 100644 --- a/graphics/qtawesome/Makefile +++ b/graphics/qtawesome/Makefile @@ -25,7 +25,7 @@ QT4_USE= qt4=corelib,gui,qmake_build,moc_build QT5_USE= qt5=core,gui,qmake_build,buildtools_build MAKE_ARGS+= ${PORT_OPTIONS:MQT*:S/QT/QT=/} -WRKSRC= ${WRKDIR}/QtAwesome-${GH_TAGNAME}/QtAwesome +WRKSRC_SUBDIR= QtAwesome #MAKEFILE= ${FILESDIR}/BSDmakefile EXTRACT_AFTER_ARGS=--no-same-owner --no-same-permissions \ --exclude QtAwesomeSample --exclude fonts diff --git a/lang/micropython/Makefile b/lang/micropython/Makefile index 873f43d4e218..d2a9764f3dbe 100644 --- a/lang/micropython/Makefile +++ b/lang/micropython/Makefile @@ -19,7 +19,7 @@ USE_GITHUB= yes PLIST_FILES= bin/micropython -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/unix +WRKSRC_SUBDIR= unix SHEBANG_FILES= ../tools/make-frozen.py MAKE_ARGS+= V=1 diff --git a/math/arpack-ng/Makefile b/math/arpack-ng/Makefile index 218b14d8162e..63766a7ff449 100644 --- a/math/arpack-ng/Makefile +++ b/math/arpack-ng/Makefile @@ -31,8 +31,6 @@ CONFLICTS= arpack-[0-9]* CONFLICTS_INSTALL?= arpack-ng-mpich-3.* SLAVEDIRS= math/arpack-ng-mpich -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - OPTIONS_DEFINE= DOCS EXAMPLES OPTIONS_SUB= yes diff --git a/misc/bdelta/Makefile b/misc/bdelta/Makefile index 5eb299fc1321..4d58a7731445 100644 --- a/misc/bdelta/Makefile +++ b/misc/bdelta/Makefile @@ -11,7 +11,7 @@ COMMENT= Advanced delta creator, patcher, and library LICENSE= MPL -WRKSRC= ${WRKDIR}/BDelta-${PORTVERSION}/src +WRKSRC_SUBDIR= src USES= gmake USE_LDCONFIG= yes diff --git a/multimedia/plexhometheater/Makefile b/multimedia/plexhometheater/Makefile index 7816f4357fb5..18d8ee8c8916 100644 --- a/multimedia/plexhometheater/Makefile +++ b/multimedia/plexhometheater/Makefile @@ -86,8 +86,6 @@ ONLY_FOR_ARCHS= i386 amd64 PLEX_ARCH_i386= x86 PLEX_ARCH_amd64=x86_64 -WRKSRC= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT} - SUB_FILES= ${PORTNAME}.sh pkg-message PLIST_SUB= ARCH=${PLEX_ARCH_${ARCH}} diff --git a/multimedia/zoneminder-h264/Makefile b/multimedia/zoneminder-h264/Makefile index 6233768ff1a0..ae89cc143235 100644 --- a/multimedia/zoneminder-h264/Makefile +++ b/multimedia/zoneminder-h264/Makefile @@ -2,7 +2,6 @@ PORTNAME= zoneminder-h264 PORTVERSION= 1.30.20161104 -DISTVERSIONSUFFIX= a2f782d PORTREVISION= 1 CATEGORIES= multimedia @@ -36,11 +35,9 @@ RUN_DEPENDS= ${ZM_DEPENDS} \ zip:archivers/zip USE_GITHUB= yes -GH_TUPLE= zoneminder:zoneminder:a2f782d \ +GH_TUPLE= zoneminder:ZoneMinder:a2f782d \ FriendsOfCake:crud:c3976f1:crud -WRKSRC= ${WRKDIR}/ZoneMinder-${DISTVERSIONSUFFIX} - USES= cmake jpeg mysql perl5 php shebangfix ssl USE_RC_SUBR= zoneminder USE_PHP= json pdo_mysql session gd sockets diff --git a/multimedia/zoneminder-h264/distinfo b/multimedia/zoneminder-h264/distinfo index 53b0fe4a46d7..7f9460541153 100644 --- a/multimedia/zoneminder-h264/distinfo +++ b/multimedia/zoneminder-h264/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1478964450 -SHA256 (zoneminder-zoneminder-1.30.20161104a2f782d-a2f782d_GH0.tar.gz) = 8d5cca78c934833c2f62efa451dc3127af2add7d2947b56a0ff37501dc1b8a32 -SIZE (zoneminder-zoneminder-1.30.20161104a2f782d-a2f782d_GH0.tar.gz) = 9794587 +TIMESTAMP = 1483465799 +SHA256 (zoneminder-ZoneMinder-1.30.20161104-a2f782d_GH0.tar.gz) = 8d5cca78c934833c2f62efa451dc3127af2add7d2947b56a0ff37501dc1b8a32 +SIZE (zoneminder-ZoneMinder-1.30.20161104-a2f782d_GH0.tar.gz) = 9794587 SHA256 (FriendsOfCake-crud-c3976f1_GH0.tar.gz) = 7dfa29dd6dd95f05bca61bb05033f813828b7ab66f9d8793d306df0dd72471ce SIZE (FriendsOfCake-crud-c3976f1_GH0.tar.gz) = 72961 diff --git a/multimedia/zoneminder/Makefile b/multimedia/zoneminder/Makefile index 54cb92936373..376b4f3c8f45 100644 --- a/multimedia/zoneminder/Makefile +++ b/multimedia/zoneminder/Makefile @@ -30,10 +30,8 @@ RUN_DEPENDS= ${ZM_DEPENDS} \ zip:archivers/zip USE_GITHUB= yes -GH_TUPLE= zoneminder:zoneminder:${DISTVERSIONPREFIX}${PORTVERSION}${DISTVERSIONSUFFIX} \ - FriendsOfCake:crud:c3976f1:crud - -WRKSRC= ${WRKDIR}/ZoneMinder-${DISTVERSION}${DISTVERSIONSUFFIX} +GH_PROJECT= ZoneMinder +GH_TUPLE= FriendsOfCake:crud:c3976f1:crud USES= cmake jpeg mysql perl5 php shebangfix ssl USE_RC_SUBR= zoneminder diff --git a/multimedia/zoneminder/distinfo b/multimedia/zoneminder/distinfo index 6e9882bdb65a..f5fd2de02854 100644 --- a/multimedia/zoneminder/distinfo +++ b/multimedia/zoneminder/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1470703313 -SHA256 (zoneminder-zoneminder-v1.30.0_GH0.tar.gz) = e7c964c339305f42a044ca8e34fa4e6a33c452fdaf33642458735daf8b864325 -SIZE (zoneminder-zoneminder-v1.30.0_GH0.tar.gz) = 9757409 +TIMESTAMP = 1483465871 +SHA256 (zoneminder-ZoneMinder-v1.30.0_GH0.tar.gz) = e7c964c339305f42a044ca8e34fa4e6a33c452fdaf33642458735daf8b864325 +SIZE (zoneminder-ZoneMinder-v1.30.0_GH0.tar.gz) = 9757409 SHA256 (FriendsOfCake-crud-c3976f1_GH0.tar.gz) = 7dfa29dd6dd95f05bca61bb05033f813828b7ab66f9d8793d306df0dd72471ce SIZE (FriendsOfCake-crud-c3976f1_GH0.tar.gz) = 72961 diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile index 39f943bc5efc..00dd12f23010 100644 --- a/net-im/openfire/Makefile +++ b/net-im/openfire/Makefile @@ -17,6 +17,7 @@ RUN_DEPENDS= slf4j>=1.7.7:devel/slf4j USE_GITHUB= yes GH_ACCOUNT= igniterealtime +GH_PROJECT= Openfire OPTIONS_DEFINE= DOCS PLUGINS OPTIONS_DEFAULT=PLUGINS @@ -37,7 +38,6 @@ ALL_TARGET= openfire USE_RC_SUBR= openfire SUB_FILES+= pkg-message -WRKSRC= ${WRKDIR}/Openfire-${PORTVERSION} BUILD_WRKSRC= ${WRKSRC}/build INSTALL_WRKSRC= ${WRKSRC}/target/openfire DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/net-im/openfire/distinfo b/net-im/openfire/distinfo index 811c8c4fbf5b..94af616e43ac 100644 --- a/net-im/openfire/distinfo +++ b/net-im/openfire/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1483374593 -SHA256 (igniterealtime-openfire-v4.1.1_GH0.tar.gz) = b597756f7edf41384e6875d638af30dce7fcb726b04812abc4f93703b6ddf6c9 -SIZE (igniterealtime-openfire-v4.1.1_GH0.tar.gz) = 100915344 +TIMESTAMP = 1483465979 +SHA256 (igniterealtime-Openfire-v4.1.1_GH0.tar.gz) = b597756f7edf41384e6875d638af30dce7fcb726b04812abc4f93703b6ddf6c9 +SIZE (igniterealtime-Openfire-v4.1.1_GH0.tar.gz) = 100915344 diff --git a/net-mgmt/glpi-plugins-fusioninventory-server/Makefile b/net-mgmt/glpi-plugins-fusioninventory-server/Makefile index 47fc4e1f4dd6..4dfe19813944 100644 --- a/net-mgmt/glpi-plugins-fusioninventory-server/Makefile +++ b/net-mgmt/glpi-plugins-fusioninventory-server/Makefile @@ -17,12 +17,11 @@ RUN_DEPENDS= glpi>=0.90:www/glpi USE_GITHUB= yes GH_ACCOUNT= fusioninventory GH_PROJECT= fusioninventory-for-glpi -GH_TAGNAME= glpi090+1.3 +GH_TAGNAME= glpi090+${FUN_VER} USES= gettext php:fileinfo php:simplexml php:wddx shebangfix GLPI_VER= 0.90 FUNV_VER= 1.3 -WRKSRC= ${WRKDIR}/${GH_PROJECT}-glpi090-${FUNV_VER} NO_BUILD= yes NO_ARCH= yes diff --git a/net/dgd/Makefile b/net/dgd/Makefile index ad4ae8971126..c276abcb8557 100644 --- a/net/dgd/Makefile +++ b/net/dgd/Makefile @@ -21,9 +21,8 @@ USE_GITHUB= yes GH_ACCOUNT= dworkin DIST_SUBDIR= dgd -BASE_WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -WRKSRC= ${BASE_WRKSRC}/src -PATCH_WRKSRC= ${BASE_WRKSRC} +WRKSRC_SUBDIR= src +PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} ALL_TARGET= install MAKE_JOBS_UNSAFE= yes MAKE_ENV+= EXTRA_DEFINES="${EXTRA_DEFINES}" diff --git a/net/dhcpd/Makefile b/net/dhcpd/Makefile index f2287de8729d..e1708a10e2f6 100644 --- a/net/dhcpd/Makefile +++ b/net/dhcpd/Makefile @@ -9,7 +9,7 @@ COMMENT= OpenBSD dhcp daemon LICENSE= BSD3CLAUSE -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src/usr.sbin/${PORTNAME} +WRKSRC_SUBDIR= src/usr.sbin/${PORTNAME} USE_GITHUB= yes GH_ACCOUNT= koue diff --git a/net/google-daemon/Makefile b/net/google-daemon/Makefile index e60d42dbede9..99581a7fe14f 100644 --- a/net/google-daemon/Makefile +++ b/net/google-daemon/Makefile @@ -18,7 +18,7 @@ USE_GITHUB= yes GH_ACCOUNT= GoogleCloudPlatform GH_PROJECT= compute-image-packages USE_RC_SUBR= google-accounts-manager -WRKSRC= ${WRKDIR}/${GH_PROJECT}-${PORTVERSION}/${PORTNAME} +WRKSRC_SUBDIR= ${PORTNAME} SHEBANG_FILES= usr/share/google/google_daemon/accounts.py \ usr/share/google/google_daemon/accounts_manager.py \ diff --git a/net/google-startup-scripts/Makefile b/net/google-startup-scripts/Makefile index 95ac80f039f8..96ff715a4dac 100644 --- a/net/google-startup-scripts/Makefile +++ b/net/google-startup-scripts/Makefile @@ -19,7 +19,7 @@ USE_GITHUB= yes GH_ACCOUNT= GoogleCloudPlatform GH_PROJECT= compute-image-packages USE_RC_SUBR= google-startup -WRKSRC= ${WRKDIR}/${GH_PROJECT}-${PORTVERSION}/${PORTNAME} +WRKSRC_SUBDIR= ${PORTNAME} SHEBANG_FILES= usr/share/google/fetch_script \ usr/share/google/first-boot \ diff --git a/net/xorp/Makefile b/net/xorp/Makefile index 40b3a920f5a9..ac69978fb54f 100644 --- a/net/xorp/Makefile +++ b/net/xorp/Makefile @@ -22,7 +22,7 @@ GH_ACCOUNT= greearb GH_PROJECT= ${PORTNAME}.ct SHEBANG_FILES= xrl/scripts/clnt-gen xrl/scripts/tgt-gen python_OLD_CMD= .*python -WRKSRC= ${WRKDIR}/${GH_PROJECT}-${DISTVERSIONPREFIX}${DISTVERSION}/${PORTNAME} +WRKSRC_SUBDIR= ${PORTNAME} MAKE_ARGS= prefix=${PREFIX} enable_boost=1 SUB_FILES= pkg-message GROUPS= xorp diff --git a/science/py-pydicom/Makefile b/science/py-pydicom/Makefile index f41a1b73ece5..796f853c7293 100644 --- a/science/py-pydicom/Makefile +++ b/science/py-pydicom/Makefile @@ -12,7 +12,7 @@ COMMENT= Read, modify, and write DICOM files with Python code LICENSE= MIT -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/source +WRKSRC_SUBDIR= source USES= python shebangfix USE_GITHUB= yes diff --git a/security/easy-rsa2/Makefile b/security/easy-rsa2/Makefile index 2a7a43b2680c..436743fdd117 100644 --- a/security/easy-rsa2/Makefile +++ b/security/easy-rsa2/Makefile @@ -20,6 +20,4 @@ GH_ACCOUNT= OpenVPN GNU_CONFIGURE= yes USES= autoreconf -WRKSRC= ${WRKDIR}/easy-rsa-${DISTVERSION} - .include <bsd.port.mk> diff --git a/sysutils/fusefs-s3fs/Makefile b/sysutils/fusefs-s3fs/Makefile index 9ac9450ed910..cc8db5f4456f 100644 --- a/sysutils/fusefs-s3fs/Makefile +++ b/sysutils/fusefs-s3fs/Makefile @@ -17,13 +17,12 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ USE_GITHUB= yes GH_ACCOUNT= s3fs-fuse +GH_PROJECT= s3fs-fuse USES= autoreconf fuse pkgconfig GNU_CONFIGURE= yes USE_OPENSSL= yes -WRKSRC= ${WRKDIR}/${GH_ACCOUNT}-${PORTVERSION} - PLIST_FILES= bin/s3fs man/man1/s3fs.1.gz post-patch: diff --git a/sysutils/fusefs-s3fs/distinfo b/sysutils/fusefs-s3fs/distinfo index e00d88351eab..fc63257e0573 100644 --- a/sysutils/fusefs-s3fs/distinfo +++ b/sysutils/fusefs-s3fs/distinfo @@ -1,2 +1,3 @@ -SHA256 (s3fs-fuse-s3fs-v1.78_GH0.tar.gz) = 36c0b00a294d9676c462985c0c3f1362540e8ebc61c15bacb45e28a2f00297f5 -SIZE (s3fs-fuse-s3fs-v1.78_GH0.tar.gz) = 99538 +TIMESTAMP = 1483466309 +SHA256 (s3fs-fuse-s3fs-fuse-v1.78_GH0.tar.gz) = 36c0b00a294d9676c462985c0c3f1362540e8ebc61c15bacb45e28a2f00297f5 +SIZE (s3fs-fuse-s3fs-fuse-v1.78_GH0.tar.gz) = 99538 diff --git a/sysutils/hfsexplorer/Makefile b/sysutils/hfsexplorer/Makefile index d2af544789d0..03bb18701b08 100644 --- a/sysutils/hfsexplorer/Makefile +++ b/sysutils/hfsexplorer/Makefile @@ -25,7 +25,6 @@ USE_JAVA= yes JAVA_VERSION= 1.6+ OPTIONS_DEFINE= DOCS NO_ARCH= yes -WRKSRC= ${WRKDIR}/${GH_PROJECT}-${GH_PROJECT}-${DISTVERSION} do-configure: @cd ${WRKSRC}/dist/bin && ${REINPLACE_CMD} -e 's|BASEDIR=".*"|BASEDIR="${DATADIR}/lib"|g' \ diff --git a/sysutils/qtpass/Makefile b/sysutils/qtpass/Makefile index 944b4dd24169..b611ff479d9d 100644 --- a/sysutils/qtpass/Makefile +++ b/sysutils/qtpass/Makefile @@ -16,6 +16,8 @@ RUN_DEPENDS= pass:sysutils/password-store USES= qmake:outsource USE_GITHUB= yes GH_ACCOUNT= IJhack +GH_PROJECT= QtPass + USE_QT5= buildtools_build core gui linguisttools_build network widgets USE_GL= gl @@ -28,8 +30,6 @@ DESKTOP_ENTRIES= "QtPass" "" \ "${PREFIX}/bin/qtpass" \ "Security;Utility;" true -WRKSRC= ${WRKDIR}/QtPass-${PORTVERSION} - # Install the icon of the port. post-install: ${INSTALL_DATA} ${WRKSRC}/artwork/icon.png \ diff --git a/sysutils/qtpass/distinfo b/sysutils/qtpass/distinfo index 105862b36aa8..9fc13712e8c0 100644 --- a/sysutils/qtpass/distinfo +++ b/sysutils/qtpass/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1481543540 -SHA256 (IJhack-qtpass-v1.1.6_GH0.tar.gz) = d24d95de129ce716b9b0fde6114407f860ce8c77106bd0ee6a12e8e4e0deb42b -SIZE (IJhack-qtpass-v1.1.6_GH0.tar.gz) = 325329 +TIMESTAMP = 1483466358 +SHA256 (IJhack-QtPass-v1.1.6_GH0.tar.gz) = d24d95de129ce716b9b0fde6114407f860ce8c77106bd0ee6a12e8e4e0deb42b +SIZE (IJhack-QtPass-v1.1.6_GH0.tar.gz) = 325329 diff --git a/textproc/libfo/Makefile b/textproc/libfo/Makefile index efe2613290c1..945d673479ca 100644 --- a/textproc/libfo/Makefile +++ b/textproc/libfo/Makefile @@ -26,7 +26,7 @@ USE_GITHUB= yes GH_PROJECT= xmlroff GH_ACCOUNT= xmlroff USE_LDCONFIG= yes -WRKSRC= ${WRKDIR}/xmlroff-${PORTVERSION}/xmlroff +WRKSRC_SUBDIR= xmlroff GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-gtk-doc CPPFLAGS+= -I${LOCALBASE}/include diff --git a/textproc/py-ucl/Makefile b/textproc/py-ucl/Makefile index aff17e99556a..3d7fa241587b 100644 --- a/textproc/py-ucl/Makefile +++ b/textproc/py-ucl/Makefile @@ -20,6 +20,6 @@ USE_PYTHON= autoplist concurrent distutils GH_ACCOUNT= vstakhov GH_PROJECT= libucl -WRKSRC= ${WRKDIR}/libucl-${PORTVERSION}/python +WRKSRC_SUBDIR= python .include <bsd.port.mk> diff --git a/textproc/xmlroff/Makefile b/textproc/xmlroff/Makefile index ed458ec6f460..811640514ab9 100644 --- a/textproc/xmlroff/Makefile +++ b/textproc/xmlroff/Makefile @@ -22,7 +22,7 @@ USE_GNOME= libgnomeprint libartlgpl2 pango glib20 \ libxslt libxml2 gdkpixbuf2 GH_ACCOUNT= xmlroff GH_PROJECT= xmlroff -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME} +WRKSRC_SUBDIR= ${PORTNAME} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc INSTALL_TARGET= install-strip diff --git a/www/ach/Makefile b/www/ach/Makefile index e56941deacc4..95c1a2db5cc8 100644 --- a/www/ach/Makefile +++ b/www/ach/Makefile @@ -3,9 +3,9 @@ PORTNAME= ACH PORTVERSION= 1.0.3 +DISTVERSIONSUFFIX= -alpha CATEGORIES= www MASTER_SITES= GHC -EXTRACT_SUFX= -alpha.tar MAINTAINER= danilo@FreeBSD.org COMMENT= Free, open source tool for complex research problems @@ -13,12 +13,12 @@ COMMENT= Free, open source tool for complex research problems LICENSE= GPLv3 USE_MYSQL= yes -USES= php +USES= php tar USE_GITHUB= yes GH_ACCOUNT= Burton GH_PROJECT= Analysis-of-Competing-Hypotheses -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-alpha +WRKSRC= ${WRKDIR}/${DISTNAME} NO_BUILD= yes SUB_FILES+= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/www/codeigniter/Makefile b/www/codeigniter/Makefile index 6a16e2fdd38d..74ffbdca3d5f 100644 --- a/www/codeigniter/Makefile +++ b/www/codeigniter/Makefile @@ -13,6 +13,7 @@ LICENSE_FILE= ${WRKSRC}/license.txt USE_GITHUB= yes GH_ACCOUNT= bcit-ci +GH_PROJECT= CodeIgniter CONFLICTS= codeigniter-1.[0-9]* codeigniter22-2.[0-9]* @@ -24,7 +25,6 @@ PLIST_SUB= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} CI_SYS_DIR= system CI_CONF_DIR= application/config -WRKSRC= ${WRKDIR}/CodeIgniter-${PORTVERSION} PORTDOCS= * # These are all user-configurable files that we'll install diff --git a/www/codeigniter/distinfo b/www/codeigniter/distinfo index bb84d0ac70df..cbd0feb2a334 100644 --- a/www/codeigniter/distinfo +++ b/www/codeigniter/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1465044613 -SHA256 (bcit-ci-codeigniter-3.0.6_GH0.tar.gz) = 6cdd736e53614762887d352fcd977d5bf4eea24e7f562a42e7ae11a8b53cc461 -SIZE (bcit-ci-codeigniter-3.0.6_GH0.tar.gz) = 2048373 +TIMESTAMP = 1483466577 +SHA256 (bcit-ci-CodeIgniter-3.0.6_GH0.tar.gz) = 6cdd736e53614762887d352fcd977d5bf4eea24e7f562a42e7ae11a8b53cc461 +SIZE (bcit-ci-CodeIgniter-3.0.6_GH0.tar.gz) = 2048373 diff --git a/www/ilias/Makefile b/www/ilias/Makefile index 51b14ebea256..701b92d9dfc4 100644 --- a/www/ilias/Makefile +++ b/www/ilias/Makefile @@ -29,7 +29,6 @@ NO_BUILD= yes PLIST= ${WRKDIR}/plist SUB_FILES= pkg-message USE_PHP= mysql session zlib gd pdf dom xsl pcre -WRKSRC= ${WRKDIR}/ILIAS-${PORTVERSION} ILIASDIR= www/ilias ILIASDATADIR= www/iliasdata PLIST_SUB= ILIASDATADIR=${ILIASDATADIR} diff --git a/www/mod_webkit/Makefile b/www/mod_webkit/Makefile index d31892efa426..e7bcdf206fc1 100644 --- a/www/mod_webkit/Makefile +++ b/www/mod_webkit/Makefile @@ -19,7 +19,7 @@ AP_FAST_BUILD= yes AP_GENPLIST= yes AP_EXTRAS= marshal.c -WRKSRC= ${WRKDIR}/w4py-${PORTVERSION}/WebKit/Adapters/${PORTNAME}2 +WRKSRC_SUBDIR= WebKit/Adapters/${PORTNAME}2 post-patch: @${REINPLACE_CMD} -e 's|/usr/sbin/apxs|${APXS}|' ${WRKSRC}/Makefile diff --git a/www/obhttpd/Makefile b/www/obhttpd/Makefile index 5af8a7238e77..176b62860b40 100644 --- a/www/obhttpd/Makefile +++ b/www/obhttpd/Makefile @@ -9,7 +9,7 @@ COMMENT= OpenBSD http server LICENSE= BSD3CLAUSE -WRKSRC= ${WRKDIR}/${GH_PROJECT}-${PORTVERSION}/src/usr.sbin/${GH_PROJECT} +WRKSRC_SUBDIR= src/usr.sbin/${GH_PROJECT} USE_GITHUB= yes GH_ACCOUNT= koue diff --git a/www/py-WebTest/Makefile b/www/py-WebTest/Makefile index 43f0df2534f9..04079e7f5193 100644 --- a/www/py-WebTest/Makefile +++ b/www/py-WebTest/Makefile @@ -23,8 +23,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ USE_GITHUB= yes GH_ACCOUNT= Pylons +GH_PROJECT= webtest USES= python USE_PYTHON= autoplist distutils -WRKSRC= ${WRKDIR}/webtest-${PORTVERSION} .include <bsd.port.mk> diff --git a/www/py-WebTest/distinfo b/www/py-WebTest/distinfo index dfd89f184d9e..495085efbe40 100644 --- a/www/py-WebTest/distinfo +++ b/www/py-WebTest/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1470257289 -SHA256 (Pylons-WebTest-2.0.23_GH0.tar.gz) = 385d5e7506fee4b91ea38ef37ebcef815fca9c03a8e9d299458eec365a36b95f -SIZE (Pylons-WebTest-2.0.23_GH0.tar.gz) = 66480 +TIMESTAMP = 1483466783 +SHA256 (Pylons-webtest-2.0.23_GH0.tar.gz) = 385d5e7506fee4b91ea38ef37ebcef815fca9c03a8e9d299458eec365a36b95f +SIZE (Pylons-webtest-2.0.23_GH0.tar.gz) = 66480 diff --git a/www/slowcgi/Makefile b/www/slowcgi/Makefile index a7f46356e0b2..983243cbf968 100644 --- a/www/slowcgi/Makefile +++ b/www/slowcgi/Makefile @@ -11,7 +11,7 @@ LICENSE= BSD3CLAUSE LIB_DEPENDS= libevent.so:devel/libevent2 -WRKSRC= ${WRKDIR}/${GH_PROJECT}-${PORTVERSION}/src/usr.sbin/${GH_PROJECT} +WRKSRC_SUBDIR= src/usr.sbin/${GH_PROJECT} USE_GITHUB= yes GH_ACCOUNT= koue diff --git a/www/smarty3/Makefile b/www/smarty3/Makefile index a692f12b1f46..c2f006c42809 100644 --- a/www/smarty3/Makefile +++ b/www/smarty3/Makefile @@ -1,18 +1,17 @@ # Created by: Michael Fausten <ports@michael-fausten.de> # $FreeBSD$ -PORTNAME= smarty3 +PORTNAME= smarty PORTVERSION= 3.1.29 DISTVERSIONPREFIX= v CATEGORIES= www +PKGNAMESUFFIX= 3 MAINTAINER= ports@michael-fausten.de COMMENT= PHP compiling template engine LICENSE= LGPL3 -WRKSRC= ${WRKDIR}/smarty-${PORTVERSION} - NO_BUILD= yes USE_PHP= pcre WANT_PHP_WEB= yes @@ -22,7 +21,6 @@ SUB_FILES= pkg-message USE_GITHUB= yes GH_ACCOUNT= smarty-php -GH_PROJECT= smarty do-install: @${MKDIR} ${STAGEDIR}${DATADIR} diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile index 2dc1aafe6019..f23ccd5c80c1 100644 --- a/x11/cinnamon/Makefile +++ b/x11/cinnamon/Makefile @@ -35,14 +35,15 @@ RUN_DEPENDS= py*-dbus>=0:devel/py-dbus \ py*-pillow>=0:graphics/py-pillow \ py*-lxml>=0:devel/py-lxml -WRKSRC= ${WRKDIR}/Cinnamon-${PORTVERSION} - USES= autoreconf compiler:c11 gettext gmake libtool \ pathfix pkgconfig python shebangfix USE_GNOME= evolutiondataserver3 gconf2 gnomedesktop3 \ gnomeprefix gtk30 intlhack introspection:build + USE_GITHUB= yes GH_ACCOUNT= linuxmint +GH_PROJECT= Cinnamon + # this happens before moving the file to ${PREFIX} (which then will be copied to ${STAGEDIR}${PREFIX}) SHEBANG_FILES= files/usr/bin/cinnamon2d USE_XORG= x11 xfixes sm diff --git a/x11/cinnamon/distinfo b/x11/cinnamon/distinfo index 6067d3f914f4..12bc0353989c 100644 --- a/x11/cinnamon/distinfo +++ b/x11/cinnamon/distinfo @@ -1,2 +1,3 @@ -SHA256 (gnome3/linuxmint-cinnamon-2.4.6_GH0.tar.gz) = f0f8b0c56e8c6ee53daa06bea28c04967960eefed601db2f0ae745ca2abe78e1 -SIZE (gnome3/linuxmint-cinnamon-2.4.6_GH0.tar.gz) = 2813177 +TIMESTAMP = 1483466871 +SHA256 (gnome3/linuxmint-Cinnamon-2.4.6_GH0.tar.gz) = f0f8b0c56e8c6ee53daa06bea28c04967960eefed601db2f0ae745ca2abe78e1 +SIZE (gnome3/linuxmint-Cinnamon-2.4.6_GH0.tar.gz) = 2813177 |