From eefdcbfd7c7a0e4b1f29a085c8afc1f1da50f22d Mon Sep 17 00:00:00 2001 From: Tobias Kortkamp Date: Tue, 7 Jul 2020 12:27:18 +0000 Subject: [PATCH] Clean up some things Reported by: portscan and common sense --- audio/bambootracker/Makefile | 2 +- audio/zynaddsubfx/Makefile | 4 ++-- comms/nanovna-saver/Makefile | 3 +-- comms/openzwave-devel/Makefile | 12 +++++----- comms/telldus-core/Makefile | 2 -- comms/tlf/Makefile | 3 +-- databases/arrow/Makefile | 2 -- deskutils/cairo-dock-plugins/Makefile | 1 - devel/bossa/Makefile | 2 +- irc/smuxi/Makefile | 1 - lang/swi-pl/Makefile | 2 -- mail/rubygem-roadie-rails-rails4/Makefile | 1 - math/asymptote/Makefile | 1 - math/libmesh/Makefile | 1 - print/pdfchain/Makefile | 27 +++++------------------ x11/nezd/Makefile | 7 +++--- x11/nezd/pkg-plist | 2 +- x11/pcdm/Makefile | 1 - 18 files changed, 21 insertions(+), 53 deletions(-) diff --git a/audio/bambootracker/Makefile b/audio/bambootracker/Makefile index ef39ce005868..4e9f35023992 100644 --- a/audio/bambootracker/Makefile +++ b/audio/bambootracker/Makefile @@ -35,7 +35,7 @@ OPTIONS_DEFINE= ALSA EXAMPLES JACK NLS PULSEAUDIO OPTIONS_DEFAULT=PULSEAUDIO ALSA_DESC= ALSA audio architecture support (EXPERIMENTAL) -ALSA_JACK= JACK audio server support (EXPERIMENTAL) +JACK_DESC= JACK audio server support (EXPERIMENTAL) OPTIONS_SUB= yes diff --git a/audio/zynaddsubfx/Makefile b/audio/zynaddsubfx/Makefile index c582a19e6513..f9d6d0e6ed54 100644 --- a/audio/zynaddsubfx/Makefile +++ b/audio/zynaddsubfx/Makefile @@ -3,7 +3,7 @@ PORTNAME= zynaddsubfx PORTVERSION= 3.0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= SF @@ -44,7 +44,7 @@ DSSI_CMAKE_OFF= -DDssiEnable:BOOL=OFF GUI_LIB_DEPENDS= libfltk.so:x11-toolkits/fltk \ libpng.so:graphics/png \ libfontconfig.so:x11-fonts/fontconfig -GUI_ON= -DGuiModule:STRING=fltk +GUI_CMAKE_ON= -DGuiModule:STRING=fltk GUI_CMAKE_OFF= -DGuiModule:STRING=OFF GUI_USE+= XORG=x11,xext,xfixes,xcursor,xrender,ice,sm,xpm,xinerama,xft GUI_USE+= GL=gl,glu diff --git a/comms/nanovna-saver/Makefile b/comms/nanovna-saver/Makefile index 3fad24e7cf11..4190c9b30bb6 100644 --- a/comms/nanovna-saver/Makefile +++ b/comms/nanovna-saver/Makefile @@ -18,10 +18,9 @@ PY_DEPENDS= ${PYNUMPY} \ BUILD_DEPENDS= ${PY_DEPENDS} RUN_DEPENDS= ${PY_DEPENDS} -USES= python:3.3+ pyqt:5 qt:5 +USES= python:3.3+ pyqt:5 USE_PYTHON= distutils autoplist noflavors USE_PYQT= core_run gui_run widgets_run -QT5_USE= core gui widgets USE_GITHUB= yes GH_ACCOUNT= mihtjel diff --git a/comms/openzwave-devel/Makefile b/comms/openzwave-devel/Makefile index ecad228d7feb..55c8b66faf50 100644 --- a/comms/openzwave-devel/Makefile +++ b/comms/openzwave-devel/Makefile @@ -25,18 +25,16 @@ GH_TAGNAME= 14f2ba74 MAKE_ARGS= VERSION_REV=${VERSION_REV} LIBDIR=${WRKSRC} docdir=${DOCSDIR} CXX=${CXX} OPTIONS_DEFINE= DOXYGEN DOCS -OPTIONS_DEFAULT= OPTIONS_SUB= yes -PLIST_SUB= PORTVERSION=${PORTVERSION} - -DOXYGEN_DESCR= Build docs (requires doxygen + graphviz) -DOXYGEN_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen dot:${PORTSDIR}/graphics/graphviz +DOXYGEN_DESC= Build docs (requires doxygen + graphviz) +DOXYGEN_BUILD_DEPENDS= dot:graphics/graphviz \ + doxygen:devel/doxygen DOXYGEN_PORTDOCS= * post-install: - ${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/lib/libopenzwave.so.1.6 - ${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/bin/MinOZW + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopenzwave.so.1.6 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/MinOZW post-install-DOXYGEN-on: ${RM} ${STAGEDIR}${DOCSDIR}/Doxyfile.in diff --git a/comms/telldus-core/Makefile b/comms/telldus-core/Makefile index fb4e8a935710..66163ee4826f 100644 --- a/comms/telldus-core/Makefile +++ b/comms/telldus-core/Makefile @@ -32,8 +32,6 @@ CXXFLAGS_clang= -Wno-c++11-narrowing MAKE_JOBS_UNSAFE= yes USE_RC_SUBR= telldusd -USER= nobody -GROUP= dialer SUB_FILES= pkg-message diff --git a/comms/tlf/Makefile b/comms/tlf/Makefile index 62e744aeeb0e..099dfb6d4d08 100644 --- a/comms/tlf/Makefile +++ b/comms/tlf/Makefile @@ -17,9 +17,8 @@ RUN_DEPENDS= rec:audio/sox \ USES= autoreconf gnome ncurses pkgconfig USE_GITHUB= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= PANEL_LIB=-lpanel USE_GNOME= glib20 +GNU_CONFIGURE= yes CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -largp" \ CPPFLAGS=-I${LOCALBASE}/include diff --git a/databases/arrow/Makefile b/databases/arrow/Makefile index 6830c6060be9..e53220064941 100644 --- a/databases/arrow/Makefile +++ b/databases/arrow/Makefile @@ -34,8 +34,6 @@ BROTLI_LIB_DEPENDS= libbrotlicommon.so:archivers/brotli BZ2_DESC= bz2 compression support BZ2_CMAKE_BOOL= ARROW_WITH_BZ2 -SNAPPY_CMAKE_BOOL= ARROW_WITH_BZ2 - LZ4_CMAKE_BOOL= ARROW_WITH_LZ4 LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 diff --git a/deskutils/cairo-dock-plugins/Makefile b/deskutils/cairo-dock-plugins/Makefile index 48fd5d3884f9..7602f004baac 100644 --- a/deskutils/cairo-dock-plugins/Makefile +++ b/deskutils/cairo-dock-plugins/Makefile @@ -58,7 +58,6 @@ SOUND_EFFECTS_DESC= Sound Effects applet UPOWER_DESC= D-Bus daemon for power management tasks #TERMINAL_DESC= Terminal applet #VALA_DESC= Vala interface -WEBLETS_DESC= Weblets applet XGAMMA_DESC= Xgamma applet XFCE_INTEGRATION_DESC= XFCE integration support ZEITGEIST_DESC= User logs activities diff --git a/devel/bossa/Makefile b/devel/bossa/Makefile index e2783fe3a656..a8fc49030021 100644 --- a/devel/bossa/Makefile +++ b/devel/bossa/Makefile @@ -28,7 +28,7 @@ OPTIONS_SUB= yes BOSSA_DESC= Include BOSSA GUI application using wxWidgets BOSSA_ALL_TARGET= bin/bossa -BOSSA_USE= wx=3.0 wx_comps=wx +BOSSA_USE= wx=3.0 BOSSASH_DESC= Include BOSSA Shell BOSSASH_USES= readline diff --git a/irc/smuxi/Makefile b/irc/smuxi/Makefile index b274cd1428d8..6460f6c837d9 100644 --- a/irc/smuxi/Makefile +++ b/irc/smuxi/Makefile @@ -32,7 +32,6 @@ OPTIONS_SUB= yes DBUS_DESC= Build with DBUS support GTKSPELL_DESC= Support spell checking NLS_DESC= Build with NLS support -NOTIFY_DESC= Build with Notification Support DBUS_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:devel/ndesk-dbus \ ${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:devel/ndesk-dbus-glib diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile index 5dca8dfaaf4e..cea445155b89 100644 --- a/lang/swi-pl/Makefile +++ b/lang/swi-pl/Makefile @@ -36,8 +36,6 @@ CMAKE_BUILD_TYPE= Release NOPRECIOUSMAKEVARS= yes -MAKE_JOBS_SAFE= yes - .include USE_LDCONFIG= ${PREFIX}/lib/swipl/lib/${ARCH}-${OPSYS:tl} diff --git a/mail/rubygem-roadie-rails-rails4/Makefile b/mail/rubygem-roadie-rails-rails4/Makefile index d1f8c896fdd2..930e8aeca668 100644 --- a/mail/rubygem-roadie-rails-rails4/Makefile +++ b/mail/rubygem-roadie-rails-rails4/Makefile @@ -3,7 +3,6 @@ PORTNAME= roadie-rails PORTVERSION= 1.3.0 PORTREVISION= 1 -PORTREVISION= 1 CATEGORIES= mail rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails4 diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile index f59fba82b028..2524fc8d2c97 100644 --- a/math/asymptote/Makefile +++ b/math/asymptote/Makefile @@ -64,7 +64,6 @@ GSL_LIB_DEPENDS= libgsl.so:math/gsl MANPAGES_ALL_TARGET= man MANPAGES_BUILD_DEPENDS= texi2dvi:print/texinfo MANPAGES_INFO= asy-faq -MANPAGE_INSTALL_TARGET= install-man OFFSCREEN_CONFIGURE_ENABLE= offscreen OFFSCREEN_DESC= Enable offscreen rendering using OSMesa library diff --git a/math/libmesh/Makefile b/math/libmesh/Makefile index f427ab5029ce..6a1fad5fa13b 100644 --- a/math/libmesh/Makefile +++ b/math/libmesh/Makefile @@ -42,7 +42,6 @@ GLPK_LIB_DEPENDS= libglpk.so:math/glpk HDF5_CONFIGURE_ENABLE= hdf5 HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 MPI_CONFIGURE_ENABLE= mpi -FSCURVES_CONFIGURE_ENABLE= sfc EXAMPLES_CONFIGURE_ENABLE= examples EXAMPLES_VARS= PKGMESSAGE=pkg-message-examples SUB_FILES= pkg-message-examples diff --git a/print/pdfchain/Makefile b/print/pdfchain/Makefile index d315eccd59e7..d1ddecd853aa 100644 --- a/print/pdfchain/Makefile +++ b/print/pdfchain/Makefile @@ -3,34 +3,19 @@ PORTNAME= pdfchain PORTVERSION= 0.4.4.2 CATEGORIES= print -MASTER_SITES= https://sourceforge.net/projects/pdfchain/files/pdfchain-${PORTVERSION}/ +MASTER_SITES= SF/pdfchain/pdfchain-${PORTVERSION} MAINTAINER= chapelet@gmail.com COMMENT= Graphical user interface for the PDF Toolkit (PDFtk) LICENSE= GPLv3 -USES= compiler:c++11-lang -USES+= desktop-file-utils -USES+= gettext-runtime -USES+= gnome -USES+= pkgconfig +USES= compiler:c++11-lang desktop-file-utils gettext-runtime gnome \ + pkgconfig +USE_GNOME= atk atkmm cairo cairomm gdkpixbuf2 glib20 glibmm gtk30 gtkmm30 \ + libsigc++20 pango pangomm +INSTALLS_ICONS= yes GNU_CONFIGURE= yes -USE_GNOME= atk -USE_GNOME+= atkmm -USE_GNOME+= cairo -USE_GNOME+= cairomm -USE_GNOME+= gdkpixbuf2 -USE_GNOME+= glib20 -USE_GNOME+= glibmm -USE_GNOME+= gtk30 -USE_GNOME+= gtkmm30 -USE_GNOME+= libsigc++20 -USE_GNOME+= pango -USE_GNOME+= pangomm - -INSTALLS_ICONS= yes - .include diff --git a/x11/nezd/Makefile b/x11/nezd/Makefile index 4a25349ee374..9945eb2f5e37 100644 --- a/x11/nezd/Makefile +++ b/x11/nezd/Makefile @@ -2,6 +2,7 @@ PORTNAME= nezd PORTVERSION= 0.1.0 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= trevis@silencedpoet.com @@ -9,15 +10,13 @@ COMMENT= General purpose messaging, notification and menuing program for X11 LICENSE= MIT -USES= pkgconfig +USES= pkgconfig xorg USE_GITHUB= yes GH_ACCOUNT= telser USE_XORG= x11 xpm xinerama xft -CONFLITCS= dzen2 - -MANDIRS= ${PREFIX}/share/ +CONFLICTS_INSTALL= dzen2 OPTIONS_DEFINE= GADGETS GADGETS_DESC= Build and install gadgets diff --git a/x11/nezd/pkg-plist b/x11/nezd/pkg-plist index 77ec9b30f2c5..5fe1b1c75712 100644 --- a/x11/nezd/pkg-plist +++ b/x11/nezd/pkg-plist @@ -1,5 +1,5 @@ bin/nezd -%%DOCSDIR%%/README.nezd.gz +%%DOCSDIR%%/README.nezd share/man/man1/nezd.1.gz %%GADGETS%%bin/dbar %%GADGETS%%bin/gcpubar diff --git a/x11/pcdm/Makefile b/x11/pcdm/Makefile index dcc8a1a0d501..d42f50731b0c 100644 --- a/x11/pcdm/Makefile +++ b/x11/pcdm/Makefile @@ -21,7 +21,6 @@ USE_QT= core gui network svg multimedia imageformats \ buildtools_build x11extras widgets concurrent linguisttools_build USE_GL= gl USE_XORG= x11 -USE_OPENRC_SUBR=pcdm WRKSRC_SUBDIR= src-qt5 MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX}