diff --git a/archivers/lua-lzlib/Makefile b/archivers/lua-lzlib/Makefile index 74eb73f24f50..1942e1c79dc0 100644 --- a/archivers/lua-lzlib/Makefile +++ b/archivers/lua-lzlib/Makefile @@ -1,28 +1,28 @@ PORTNAME= lzlib PORTVERSION= 0.4.3 PORTREVISION= 1 CATEGORIES= archivers PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} MAINTAINER= daniel@blodan.se COMMENT= Lua bindings to the ZLib compression library LICENSE= MIT USES= cmake lua:51-52,module USE_GITHUB= yes GH_ACCOUNT= LuaDist CMAKE_ARGS= -DINSTALL_LMOD="${LUA_MODSHAREDIR}" \ -DINSTALL_CMOD="${LUA_MODLIBDIR}" \ -DINSTALL_DOC="${DOCSDIR}" \ -DINSTALL_TEST="${EXAMPLESDIR}" -CONFLICTS_INSTALL= ${LUA_PKGNAMEPREFIX}zlib lua[0-9][0-9]-lzlib # lib/lua/5.1/zlib.so share/doc/lzlib/README +CONFLICTS_INSTALL= lua[0-9][0-9]-lzlib lua[0-9][0-9]-zlib # lib/lua/5.1/zlib.so share/doc/lzlib/README OPTIONS_DEFINE= DOCS EXAMPLES post-patch: @${REINPLACE_CMD} -e '/README/s/install_data/install_doc/' \ ${WRKSRC}/CMakeLists.txt .include diff --git a/archivers/zutils/Makefile b/archivers/zutils/Makefile index 13322d112a15..80d9048ef6a2 100644 --- a/archivers/zutils/Makefile +++ b/archivers/zutils/Makefile @@ -1,30 +1,30 @@ # Created by: Albert Vernon PORTNAME= zutils PORTVERSION= 1.11 CATEGORIES= archivers MASTER_SITES= SAVANNAH/zutils MAINTAINER= ports@FreeBSD.org COMMENT= Utilities for searching in bzip2, gzip, lzip, and xz archives LICENSE= GPLv2 USES= cpe tar:lz GNU_CONFIGURE= yes -CONFLICTS_INSTALL= gzip openzfs # bin/zcat bin/zcmp bin/zdiff bin/zgrep man/man1/ztest.1.gz +CONFLICTS_INSTALL= gzip # bin/zcat bin/zcmp bin/zdiff bin/zgrep man/man1/ztest.1.gz INSTALL_TARGET= install-strip CPE_VENDOR= nongnu INFO= zutils post-patch: # Remove compiler hardcoded flags and use environment @${REINPLACE_CMD} '23,26d' ${WRKSRC}/configure post-install: @-${RM} ${STAGEDIR}${PREFIX}/info/dir .include diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile index 1032e58c7ca8..542ce4d5165e 100644 --- a/astro/celestia/Makefile +++ b/astro/celestia/Makefile @@ -1,100 +1,100 @@ # Created by: trevor PORTNAME= celestia PORTVERSION= 1.6.1 PORTREVISION= 13 CATEGORIES= astro MASTER_SITES= SF/${PORTNAME}/Celestia-source/${PORTVERSION} PKGNAMESUFFIX= -${CELESTIA_UI} MAINTAINER= danfe@FreeBSD.org COMMENT= Scriptable space flight simulator for X11 LICENSE= GPLv2 LIB_DEPENDS= libpng.so:graphics/png USES= compiler:c++11-lang gettext gl gmake jpeg libtool lua:52 pkgconfig USE_GL= gl GNU_CONFIGURE= yes EXTRA_PATCHES= ${FILESDIR}/celestia-1.6.1-lua-5.2.patch:-p1 \ ${FILESDIR}/celestia-lua-52-fix.patch:-p1 \ ${FILESDIR}/celestia-1.6.1-gcc47.patch:-p1 \ ${FILESDIR}/celestia-1.6.1-gcc48.patch:-p1 CXXFLAGS+= -fsigned-char # fix text rendering (see Gentoo bug 316573) CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -pthread UI_LIST= glut gtk gnome CELESTIA_UI?= glut -CONFLICTS= ${UI_LIST:S|${CELESTIA_UI}||:S|^|celestia-|} +CONFLICTS_INSTALL= ${UI_LIST:S|^|celestia-|} # Celestia provides different UI frontends; you should pick one that suits # you best by setting CELESTIA_UI variable. Possible values are: # # glut Bare-boned minimal GLUT-based core with no toolbar or menu (this is # the default one); # gtk Full interface with minimal dependencies: adds menu, configuration # dialog, some other utilities; # .if ${CELESTIA_UI} == "glut" CONFIGURE_ARGS+= --with-glut USE_GL+= glut LDFLAGS+= -lGL .elif ${CELESTIA_UI} == "gtk" CONFIGURE_ARGS+= --with-gtk USES+= gnome USE_GNOME+= gtk20 PLIST_FILES= share/applications/celestia.desktop .else IGNORE= requires one of the <${UI_LIST}> values for CELESTIA_UI .endif .if ${CELESTIA_UI} == "gtk" USES+= pathfix LIB_DEPENDS+= libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \ libtheora.so:multimedia/libtheora STARTUP_NOTIFY= true PLIST_FILES+= share/celestia/celestia-logo.png share/celestia/celestiaui.xml .else STARTUP_NOTIFY= false .endif PORTDOCS= AUTHORS ChangeLog README OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -E '/fav(->|\.)fov/s|NULL|0.0|' \ ${WRKSRC}/src/celestia/celestiacore.cpp \ ${WRKSRC}/src/celestia/favorites.cpp @${REINPLACE_CMD} -e '280s,NULL,false,' \ ${WRKSRC}/src/celengine/parseobject.cpp # Fix Lua discovery pkg-config(1) calls @${REINPLACE_CMD} -E 's|lua5\.?|lua-5.|' ${WRKSRC}/configure # Remove controversial compiler options (respect our C[XX]FLAGS) .for o in O2 ffast-math fexpensive-optimizations fomit-frame-pointer @${REINPLACE_CMD} -e 's|-${o}||g' ${WRKSRC}/configure .endfor # Allow add-ons to be placed inside user's home directory @${REINPLACE_CMD} -e '/^#/!s|"extras"|& "~/.celestia"|' \ ${WRKSRC}/celestia.cfg # Inhibit installation of copies of GPL (lots of them; use LICENSE framework # instead) and remove bogus argument from mv(1) @${REINPLACE_CMD} -e 's|COPYING||g ; s| -b|| ' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|=.*COPYING_\*)|=| ; \ /KDE_DIST/s|COPYING_[^ ]* ||g' ${WRKSRC}/locale/Makefile.in @${REINPLACE_CMD} -e 's|kde_libs_htmldir|kde_htmldir|' \ ${WRKSRC}/src/celestia/kde/doc/celestia/Makefile.in post-install: # Technically, we should only install icon explicitly for GLUT UI, since # correct icons are properly installed for other cases, but doing it here # does not hurt and simplifies PLIST handling ${INSTALL_DATA} ${WRKSRC}/src/celestia/gtk/data/celestia.png \ ${STAGEDIR}${PREFIX}/share/pixmaps @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include diff --git a/astro/match/Makefile b/astro/match/Makefile index 8ef95524aabe..6565e91d00e8 100644 --- a/astro/match/Makefile +++ b/astro/match/Makefile @@ -1,18 +1,18 @@ # Created by: ijliao PORTNAME= match PORTVERSION= 1.0 CATEGORIES= astro MASTER_SITES= http://spiff.rit.edu/match/ MAINTAINER= a.andersson.thn@gmail.com COMMENT= Program for matching star lists LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes -CONFLICTS= avenger schilyutils # bin/match man/man1/match.1.gz +CONFLICTS_INSTALL= avenger # man/man1/match.1.gz .include diff --git a/audio/julius/Makefile b/audio/julius/Makefile index 42737006edba..54625d09493f 100644 --- a/audio/julius/Makefile +++ b/audio/julius/Makefile @@ -1,43 +1,43 @@ # Created by: numisemis at yahoo dot com PORTNAME= julius PORTVERSION= 4.1.2 PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= OSDN/julius MAINTAINER= numisemis@yahoo.com COMMENT= Large Vocabulary Continuous Speech Recognition Engine BUILD_DEPENDS= ja-p5-Jcode>=0:japanese/p5-Jcode RUN_DEPENDS= ja-p5-Jcode>=0:japanese/p5-Jcode GNU_CONFIGURE= yes USES= iconv perl5 shebangfix SHEBANG_FILES= jclient-perl/jclient.pl -CONFLICTS_INSTALL= generate julius-caesariii php*-pear-Text_Highlighter # bin/generate bin/julius +CONFLICTS_INSTALL= generate # bin/generate bin/julius CONFIGURE_ENV= ac_cv_path_PERL=${PERL} CPPFLAGS+= -I${LOCALBASE}/include CFLAGS+= -Wno-return-type LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} post-configure: @${FIND} ${WRKSRC} -type f -name Makefile | ${XARGS} ${REINPLACE_CMD} -E \ -e "s|INSTALL=(\.\./)+|INSTALL=install|" \ -e "s|install -s|install|; s|-m 555|-m 755|g" \ -e "s,\{(bin|lib|include|man)dir,\(DESTDIR\)$$&,g" \ -e "/(INSTALL|install)/ s,\{exec_prefix,\(DESTDIR\)$$&,g" @${REINPLACE_CMD} -E -e "s|man1/ja|ja/man1|" \ -e "s| /usr/local| ${STAGEDIR}${PREFIX}|g" \ ${WRKSRC}/man/Makefile post-install: .for file in accept_check adinrec adintool dfa_determinize dfa_minimize \ generate-ngram generate jcontrol julius mkbingram mkbinhmm mkbinhmmlist mkfa \ mkss nextword @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${file} .endfor .include diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile index cba35c7387c9..f9d7d022c6c4 100644 --- a/audio/mp3blaster/Makefile +++ b/audio/mp3blaster/Makefile @@ -1,55 +1,55 @@ # Created by: Michael Vasilenko PORTNAME= mp3blaster PORTVERSION= 3.2.6 PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= novel@FreeBSD.org COMMENT= MP3 console ncurses-based player LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING USES= gmake localbase:ldflags ncurses GNU_CONFIGURE= yes -CONFLICTS_INSTALL= p5-MP3-Tag-Utils splay # bin/mp3tag bin/splay +CONFLICTS_INSTALL= splay # bin/mp3tag bin/splay OPTIONS_DEFINE= DOCS LIRC NAS SDL SIDPLAY VORBIS OPTIONS_DEFAULT= SIDPLAY VORBIS SIDPLAY_DESC= Sidplayer support PORTDOCS= AUTHORS CREDITS ChangeLog FAQ README TODO LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc LIRC_CONFIGURE_WITH= lirc SIDPLAY_LIB_DEPENDS= libsidplay.so:audio/libsidplay SIDPLAY_CONFIGURE_WITH= sidplay VORBIS_LIB_DEPENDS= libvorbisfile.so:audio/libvorbis VORBIS_CONFIGURE_WITH= oggvorbis SDL_CONFIGURE_WITH= sdl SDL_USES= sdl SDL_USE= SDL=sdl NAS_CONFIGURE_WITH= nas NAS_LIB_DEPENDS= libaudio.so:audio/nas NAS_LDFLAGS= -laudio NAS_USES= xorg NAS_USE= XORG=x11,xt,ice,sm post-patch: @${REINPLACE_CMD} -e 's|/usr/local/share/mp3blaster/win2koi.tbl|${DATADIR}/charmap/win2koi.tbl|' \ ${WRKSRC}/doc/sample.mp3blasterrc post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor .include