diff options
31 files changed, 16 insertions, 53 deletions
diff --git a/deskutils/jjclient/Makefile b/deskutils/jjclient/Makefile index 7bae2c2bdb6f..cc20e0c08090 100644 --- a/deskutils/jjclient/Makefile +++ b/deskutils/jjclient/Makefile @@ -8,11 +8,10 @@ CATEGORIES= deskutils MASTER_SITES= SF/justjournal/JustJournal%20UNIX%20Client/${PORTVERSION} \ http://www.justjournal.com/software/unix/ - MAINTAINER= luke@justjournal.com COMMENT= Command line client for posting JustJournal entries -LIB_DEPENDS+= libxmlrpc.so:net/xmlrpc-c +LIB_DEPENDS= libxmlrpc.so:net/xmlrpc-c PLIST_FILES= bin/jjclient diff --git a/deskutils/wmpinboard/Makefile b/deskutils/wmpinboard/Makefile index 40317ed6d1d8..15a6320349e6 100644 --- a/deskutils/wmpinboard/Makefile +++ b/deskutils/wmpinboard/Makefile @@ -19,7 +19,6 @@ GNU_CONFIGURE= yes MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" - PLIST_FILES= bin/wmpinboard \ man/man1/wmpinboard.1.gz diff --git a/emulators/rtc/files/Makefile b/emulators/rtc/files/Makefile index 5fc281685f6e..32ea55733f2c 100644 --- a/emulators/rtc/files/Makefile +++ b/emulators/rtc/files/Makefile @@ -37,7 +37,6 @@ CDEV_MAJOR?= 202 DEVNAME= ${KMOD} SRCS= rtc.c rtc_linux.c vnode_if.h - INCLUDE= -I${.CURDIR} -I${SYS} CFLAGS+= ${INCLUDE} -DCDEV_MAJOR_=${CDEV_MAJOR} diff --git a/games/megamario/Makefile b/games/megamario/Makefile index 08ecd229d78e..dd3c477358c1 100644 --- a/games/megamario/Makefile +++ b/games/megamario/Makefile @@ -59,7 +59,7 @@ post-install: ${STAGEDIR}${PREFIX}/share/pixmaps/ ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR} - +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR2} diff --git a/graphics/aeskulap/Makefile b/graphics/aeskulap/Makefile index 4460929fb4ba..6cb96fe354fc 100644 --- a/graphics/aeskulap/Makefile +++ b/graphics/aeskulap/Makefile @@ -19,8 +19,8 @@ USE_GITHUB= yes GH_ACCOUNT= pipelka GH_TAGNAME= ea0a119 -USES= compiler:c++11-lang autoreconf desktop-file-utils gettext gmake \ - libtool localbase pkgconfig +USES= compiler:c++11-lang autoreconf desktop-file-utils gettext \ + gmake libtool localbase pkgconfig USE_CXXSTD= c++11 USE_GNOME= gconfmm26 gtkmm24 intltool GCONF_SCHEMAS= aeskulap.schemas @@ -31,5 +31,4 @@ CONFIGURE_ARGS= --disable-static INSTALL_TARGET= install-strip INSTALLS_ICONS= yes - .include <bsd.port.mk> diff --git a/graphics/imc/Makefile b/graphics/imc/Makefile index 08ee9a54d1ce..b7750168c80b 100644 --- a/graphics/imc/Makefile +++ b/graphics/imc/Makefile @@ -28,7 +28,6 @@ PLIST_FILES= bin/${PORTNAME} \ OPTIONS_DEFINE= DOCS EXAMPLES - post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS ChangeLog NEWS README THANKS Todo \ diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile index e67b2f3bbbd0..07407c51b7e3 100644 --- a/graphics/mapserver/Makefile +++ b/graphics/mapserver/Makefile @@ -199,10 +199,8 @@ do-install-PHP-on: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/php @${ECHO_CMD} "extension=php_mapscript.so" > ${STAGEDIR}${PREFIX}/etc/php/ext-20-php_mapscript.ini - do-install-PYTHON-on: @${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/ (cd ${BUILD_WRKSRC}/mapscript/python && ${CP} mapscript.py _mapscript.so ${STAGEDIR}${PYTHON_SITELIBDIR}/) - .include <bsd.port.mk> diff --git a/graphics/p5-Gimp/Makefile b/graphics/p5-Gimp/Makefile index 5e5fcbbd5634..28ac7114a660 100644 --- a/graphics/p5-Gimp/Makefile +++ b/graphics/p5-Gimp/Makefile @@ -38,5 +38,4 @@ MAKE_JOBS_UNSAFE= yes BUILD_DEPENDS+= p5-ExtUtils-MakeMaker>=7.14:devel/p5-ExtUtils-MakeMaker .endif - .include <bsd.port.post.mk> diff --git a/irc/bip/Makefile b/irc/bip/Makefile index 690dffbc5636..7c61affa9fc6 100644 --- a/irc/bip/Makefile +++ b/irc/bip/Makefile @@ -38,7 +38,6 @@ post-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/${docs} ${STAGEDIR}${DOCSDIR} .endfor - post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for i in ${EXAMPLEFILES} diff --git a/japanese/kana-no-quiz/Makefile b/japanese/kana-no-quiz/Makefile index 8536a80abb83..ffa154270c9a 100644 --- a/japanese/kana-no-quiz/Makefile +++ b/japanese/kana-no-quiz/Makefile @@ -1,4 +1,4 @@ -# Created by: Nicola Vitale <nivit@email.it> +# Created by: Nicola Vitale <nivit@email.it> # $FreeBSD$ PORTNAME= kana-no-quiz @@ -18,7 +18,6 @@ RUN_DEPENDS= ${PYGAME} NO_BUILD= yes NO_ARCH= yes - USES= gettext python:2.7 tar:bzip2 USE_GNOME= pygtk2:run USE_PYTHON= distutils autoplist diff --git a/japanese/today/files/Makefile b/japanese/today/files/Makefile index baded60dba24..8f0150633a33 100644 --- a/japanese/today/files/Makefile +++ b/japanese/today/files/Makefile @@ -19,7 +19,6 @@ OBJSC1 = config.o getfile.o getsb.o kyureki2.o \ misc2.o rdcalend.o schedule2.o OBJS_CAL = calendar.o $(OBJSC1) - all: today calendar dayinfo install: today calendar dayinfo @@ -44,7 +43,6 @@ dayinfo: dayinfo.c clean: rm -f *.o core dayinfo calendar today - birthday.o: birthday.c $(HFILES) calendar.o: calendar.c $(HFILES) $(OBJSC1) $(CC) $(CFLAGS) -DINCLUDE_CALENDAR -c -o $@ calendar.c diff --git a/lang/cjs/Makefile b/lang/cjs/Makefile index f6625b1078b7..4febd67be76d 100644 --- a/lang/cjs/Makefile +++ b/lang/cjs/Makefile @@ -29,5 +29,4 @@ LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip CONFIGURE_ARGS+=--enable-compile-warnings=no - .include <bsd.port.mk> diff --git a/math/R-cran-sspir/Makefile b/math/R-cran-sspir/Makefile index d7cf9edfc8d8..f25d2e586578 100644 --- a/math/R-cran-sspir/Makefile +++ b/math/R-cran-sspir/Makefile @@ -14,7 +14,6 @@ COMMENT= glm-like formula to define dynamic generalized linear models RUN_DEPENDS= R-cran-mvtnorm>=0.9.96_11:math/R-cran-mvtnorm \ R-cran-KFAS>=0.9.11_3:math/R-cran-KFAS -USES= cran:auto-plist - +USES= cran:auto-plist .include <bsd.port.mk> diff --git a/math/testu01/Makefile b/math/testu01/Makefile index 7f4391866a60..9f2c14a472f5 100644 --- a/math/testu01/Makefile +++ b/math/testu01/Makefile @@ -41,11 +41,9 @@ post-patch-DOCS-off: @${FIND} -X ${WRKSRC} -name 'Makefile.in' | ${XARGS} ${REINPLACE_CMD} \ -e '/^install-data-am\: /s/install-docDATA//' - post-patch-EXAMPLES-off: @${REINPLACE_CMD} -e '/^SUBDIRS \=/s/ examples / /' ${WRKSRC}/Makefile.in - post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DISTDIR}/testu01.pdf ${STAGEDIR}${DOCSDIR} diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile index 008caf3536dc..b544eaf31d1b 100644 --- a/math/vtk5/Makefile +++ b/math/vtk5/Makefile @@ -72,7 +72,6 @@ TCLTK_CMAKE_BOOL= VTK_WRAP_TCL DBGLEAKS_CMAKE_BOOL= VTK_DEBUG_LEAKS LEGACY_CMAKE_BOOL_OFF= VTK_LEGACY_REMOVE - .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MSHARED} diff --git a/misc/fortune-mod-bible/Makefile b/misc/fortune-mod-bible/Makefile index 570654e4f431..3caa9e8ef43f 100644 --- a/misc/fortune-mod-bible/Makefile +++ b/misc/fortune-mod-bible/Makefile @@ -34,5 +34,4 @@ do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/games/fortune ${INSTALL_DATA} ${WRKSRC}/bible* ${STAGEDIR}${PREFIX}/share/games/fortune - .include <bsd.port.mk> diff --git a/misc/lxde-common/Makefile b/misc/lxde-common/Makefile index 0fa6e37e14c7..fe2ab04d4676 100644 --- a/misc/lxde-common/Makefile +++ b/misc/lxde-common/Makefile @@ -13,20 +13,19 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= lxde-icon-theme>=0:x11-themes/lxde-icon-theme \ - gnome-themes-standard>=3.18:x11-themes/gnome-themes-standard \ - xscreensaver:x11/xscreensaver + gnome-themes-standard>=3.18:x11-themes/gnome-themes-standard \ + xscreensaver:x11/xscreensaver USES= gettext-tools gmake localbase tar:xz USE_GNOME= gtk20 intltool GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc \ - --with-xsession-path=${PREFIX}/share/xsessions +CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ + --with-xsession-path=${PREFIX}/share/xsessions NO_ARCH= yes DATADIR= ${PREFIX}/share/lxde INSTALLS_ICONS= yes - post-install: ${INSTALL_DATA} ${WRKSRC}/desktop.conf \ ${STAGEDIR}${PREFIX}/etc/xdg/lxsession/LXDE/desktop.conf.sample diff --git a/misc/qtchooser/Makefile b/misc/qtchooser/Makefile index 237e55f340b3..d613edba9a05 100644 --- a/misc/qtchooser/Makefile +++ b/misc/qtchooser/Makefile @@ -43,5 +43,4 @@ post-install: # Create the default profile. cd ${STAGEDIR}/${QT_QTCHOOSERDIR} && ${LN} -s qt5.conf default.conf - .include <bsd.port.mk> diff --git a/multimedia/qt5-phonon4/Makefile b/multimedia/qt5-phonon4/Makefile index 73944ddf2bac..ea409fab4ea5 100644 --- a/multimedia/qt5-phonon4/Makefile +++ b/multimedia/qt5-phonon4/Makefile @@ -14,7 +14,6 @@ COMMENT= Phonon 4 transitional library for Qt 5 LICENSE= LGPL21 - USES= cmake:outsource kde:5 pathfix tar:xz USE_KDE= ecm USE_QT5= core dbus gui opengl widgets \ diff --git a/net-mgmt/p5-SNMP_Session/Makefile b/net-mgmt/p5-SNMP_Session/Makefile index 36eb527ff9ef..9fc169b8e1da 100644 --- a/net-mgmt/p5-SNMP_Session/Makefile +++ b/net-mgmt/p5-SNMP_Session/Makefile @@ -27,5 +27,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor - .include <bsd.port.mk> diff --git a/net-mgmt/xymon-client/files/Makefile b/net-mgmt/xymon-client/files/Makefile index 5237e22d4007..f026d2629dca 100644 --- a/net-mgmt/xymon-client/files/Makefile +++ b/net-mgmt/xymon-client/files/Makefile @@ -1,5 +1,6 @@ # Toplevel Makefile for Xymon # $FreeBSD$ + BUILDTOPDIR=`pwd` CLIENTONLY = yes LOCALCLIENT = no @@ -20,9 +21,6 @@ LFSDEF = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 include build/Makefile.FreeBSD - -# -# Add local CFLAGS etc. settings here +# Add local CFLAGS, etc. settings here include build/Makefile.rules - diff --git a/net-mgmt/xymon-server/files/Makefile b/net-mgmt/xymon-server/files/Makefile index eb674689e513..86c0428a3529 100644 --- a/net-mgmt/xymon-server/files/Makefile +++ b/net-mgmt/xymon-server/files/Makefile @@ -1,5 +1,6 @@ # Toplevel Makefile for Xymon # $FreeBSD$ + BUILDTOPDIR=`pwd` # configure settings for Xymon @@ -89,8 +90,6 @@ LFSDEF = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 include build/Makefile.FreeBSD - -# Add local CFLAGS etc. settings here +# Add local CFLAGS, etc. settings here include build/Makefile.rules - diff --git a/net-p2p/frost/Makefile b/net-p2p/frost/Makefile index 78ee48af456b..62b6920f1bfe 100644 --- a/net-p2p/frost/Makefile +++ b/net-p2p/frost/Makefile @@ -24,7 +24,6 @@ DATADIR= ${JAVASHAREDIR}/${PORTNAME} OPTIONS_DEFINE= DOCS - JAVAVM= ${LOCALBASE}/bin/java JAR_DIR= ${JAVAJARDIR:S,^${PREFIX}/,,}/${PORTNAME} JAR_FILE= frost.jar @@ -59,8 +58,6 @@ DESKTOP_ENTRIES= "Frost" "Freenet Client" \ "frost" "P2P;Network;Java;" \ false -pre-everything:: - post-patch: @${SED} -e "s|%%PREFIX%%|${PREFIX}|; \ s|%%JAVA_VERSION%%|${JAVA_VERSION}|; \ diff --git a/news/nntp/Makefile b/news/nntp/Makefile index 369664888728..b9f415129096 100644 --- a/news/nntp/Makefile +++ b/news/nntp/Makefile @@ -49,7 +49,6 @@ ALONE= -e 's|\#define.ALONE|\#undef ALONE|' post-extract: ${CP} ${WRKSRC}/conf.h.dist ${WRKSRC}/conf.h - post-patch: ${REINPLACE_CMD} \ -e 's=getline(=xmit_getline(=' \ diff --git a/ports-mgmt/p5-FreeBSD-Ports/Makefile b/ports-mgmt/p5-FreeBSD-Ports/Makefile index 1101b05f9ade..038e56ee8535 100644 --- a/ports-mgmt/p5-FreeBSD-Ports/Makefile +++ b/ports-mgmt/p5-FreeBSD-Ports/Makefile @@ -11,7 +11,6 @@ PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= Perl modules for parsing FreeBSD's Ports INDEX file - USES= perl5 tar:bzip2 USE_PERL5= configure diff --git a/science/h5utils/Makefile b/science/h5utils/Makefile index a0aceb2c9b1f..fe33d82e20a6 100644 --- a/science/h5utils/Makefile +++ b/science/h5utils/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT GPLv2 LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING -GNU_CONFIGURE= YES +GNU_CONFIGURE= yes CFLAGS += -L${LOCALBASE}/lib -I${LOCALBASE}/include -lpthread BUILD_DEPENDS+= gawk:lang/gawk @@ -22,8 +22,6 @@ LIB_DEPENDS+= libhdf5.so:science/hdf5 \ USES= autoreconf GNU_CONFIGURE= yes - - USE_GITHUB= yes GH_ACCOUNT= stevengj diff --git a/www/mod_tsa/Makefile b/www/mod_tsa/Makefile index 05e32bf6de97..13f78e7f43d1 100644 --- a/www/mod_tsa/Makefile +++ b/www/mod_tsa/Makefile @@ -14,7 +14,6 @@ COMMENT= Time stamping authority (RFC 3161) module for apache OPTIONS_DEFINE= MYSQL PGSQL FIREBIRD DEBUG DEBUG_MEMORY DEBUG_MEMORY_DESC= Memory debug - GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-openssl-incdir=${OPENSSLINC} \ --with-openssl-libdir=${OPENSSLLIB} \ diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile index a65db976c8b1..fdbbb2725eaa 100644 --- a/www/sitecopy/Makefile +++ b/www/sitecopy/Makefile @@ -38,7 +38,6 @@ USES+= ssl CONFIGURE_ARGS+= --with-ssl .endif - post-patch: @${REINPLACE_CMD} -e 's|;;|;|g' \ ${WRKSRC}/src/sitestore.c diff --git a/x11-toolkits/fltk-devel/Makefile b/x11-toolkits/fltk-devel/Makefile index 93bd05c5573d..777844e6dc08 100644 --- a/x11-toolkits/fltk-devel/Makefile +++ b/x11-toolkits/fltk-devel/Makefile @@ -32,7 +32,6 @@ CMAKE_ARGS+= -DOPTION_BUILD_SHARED_LIBS:BOOL=ON \ -DPREFIX_INCLUDE:PATH=${PREFIX}/include/fltk-devel \ -DPREFIX_LIB:PATH=${PREFIX}/lib/fltk-devel - SNAPSHOT_VERS= 10370 PORTEXAMPLES= * EXAMPLESDIR= ${PREFIX}/share/examples/${PORTNAME}${PKGNAMESUFFIX} diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile index 670524630c56..ea5d6d068fab 100644 --- a/x11-toolkits/py-wxPython28/Makefile +++ b/x11-toolkits/py-wxPython28/Makefile @@ -84,7 +84,6 @@ PYDISTUTILS_BUILDARGS+= \ NO_SCRIPTS=1 \ INSTALL_MULTIVERSION=1 - PYDISTUTILS_BUILDARGS+= \ UNICODE=1 WX_PYTHON_DIR= wx-${WX_VERSION}-${WXPORT}-unicode diff --git a/x11/lxrandr/Makefile b/x11/lxrandr/Makefile index 13e5f624787e..ccb94ca90987 100644 --- a/x11/lxrandr/Makefile +++ b/x11/lxrandr/Makefile @@ -12,7 +12,7 @@ COMMENT= Monitor configuration tool LICENSE= GPLv2 LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 + libfreetype.so:print/freetype2 USES= desktop-file-utils gmake localbase pkgconfig tar:xz USE_GNOME= gtk20 intltool cairo @@ -20,7 +20,6 @@ USE_XORG= xrandr GNU_CONFIGURE= yes INSTALLS_ICONS= yes - OPTIONS_DEFINE= NLS OPTIONS_SUB= yes |