Index: head/emulators/pcsxr/Makefile =================================================================== --- head/emulators/pcsxr/Makefile (revision 316087) +++ head/emulators/pcsxr/Makefile (revision 316088) @@ -1,85 +1,81 @@ -# New ports collection makefile for: pcsxr -# Date created: 11 June 2010 -# Whom: Ganael Laplanche -# +# Created by: Ganael Laplanche # $FreeBSD$ -# PORTNAME= pcsxr -PORTVERSION= 1.9.92.r81088 +PORTVERSION= 1.9.92.r84102 CATEGORIES= emulators MASTER_SITES= http://contribs.martymac.org/FreeBSD-ports/distfiles/ \ LOCAL/martymac MAINTAINER= martymac@FreeBSD.org COMMENT= Playstation (PSX) emulator LICENSE= GPLv2 BUILD_DEPENDS= gawk:${PORTSDIR}/lang/gawk LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis \ cdio:${PORTSDIR}/sysutils/libcdio ONLY_FOR_ARCHS= i386 amd64 USE_BZIP2= yes USE_AUTOTOOLS= autoconf:env aclocal:env automake:env libtool USE_GMAKE= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_CSTD= gnu89 CONFIGURE_ARGS= --enable-opengl --enable-libcdio USE_LDCONFIG= yes USE_DOS2UNIX= yes DOS2UNIX_REGEX= .*\.(c|h|cpp|hpp|am) -USE_GNOME= gtk20 desktopfileutils glib20 +USE_GNOME= gtk30 desktopfileutils glib20 USE_ICONV= yes USE_XORG= x11 xv xext xxf86vm xtst USE_SDL= sdl USE_GL= gl MAN1= pcsxr.1 PORTDOCS= ChangeLog README # Default CDROM device to use with dfcdrom, # accessed through libcdio (using cam(4) and pass(4)) DEFAULT_DVD_DEVICE?= /dev/cd0 .include .if ${ARCH} == "amd64" CONFIGURE_ARGS+= --enable-dynarec=x86_64 .endif .if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes CONFIGURE_ARGS+= --enable-nls PLIST_SUB+= NLS="" .else CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .endif # Add ${PREFIX} to plugins' lookup directories and set default CDROM device post-patch: @${REINPLACE_CMD} "s|%%PREFIX%%|${PREFIX}|" \ ${WRKSRC}/gui/LnxMain.c @${REINPLACE_CMD} "s|%%DVD_DEVICE%%|${DEFAULT_DVD_DEVICE}|" \ ${WRKSRC}/plugins/dfcdrom/cdr.h pre-configure: @(cd ${WRKSRC} && ${AUTORECONF} -fi) post-install: .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for doc in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR} .endfor .endif @-update-desktop-database .include Index: head/emulators/pcsxr/distinfo =================================================================== --- head/emulators/pcsxr/distinfo (revision 316087) +++ head/emulators/pcsxr/distinfo (revision 316088) @@ -1,2 +1,2 @@ -SHA256 (pcsxr-1.9.92.r81088.tar.bz2) = d514fd045f0dd4fe9c7f8d67afbe031412f38f039b3a53c0007c267366e9595d -SIZE (pcsxr-1.9.92.r81088.tar.bz2) = 1435621 +SHA256 (pcsxr-1.9.92.r84102.tar.bz2) = 88c86c5221f16b2d9d3c88191b7e5e08f4f62c71e17c084188497abb0e6c3295 +SIZE (pcsxr-1.9.92.r84102.tar.bz2) = 1451311 Index: head/emulators/pcsxr/files/patch-gui-Makefile.am =================================================================== --- head/emulators/pcsxr/files/patch-gui-Makefile.am (revision 316087) +++ head/emulators/pcsxr/files/patch-gui-Makefile.am (revision 316088) @@ -1,20 +1,20 @@ --- gui/Makefile.am.orig 2011-06-30 08:47:19.000000000 +0200 +++ gui/Makefile.am 2011-06-30 11:43:02.263535649 +0200 @@ -3,8 +3,8 @@ -DLOCALE_DIR=\"${datadir}/locale/\" \ - $(GTK2_CFLAGS) $(GLADE2_CFLAGS) \ + $(GTK3_CFLAGS) $(GLADE2_CFLAGS) \ -I$(top_srcdir)/libpcsxcore -I$(top_srcdir)/include \ - -DPSEMU_DATA_DIR=\"${datadir}/psemu\" \ - -DDEF_PLUGIN_DIR=\"${libdir}/games/psemu\" + -DPSEMU_DATA_DIR=\"${datadir}/pcsxr\" \ + -DDEF_PLUGIN_DIR=\"${libdir}/pcsxr\" bin_PROGRAMS = pcsxr @@ -29,4 +29,5 @@ pcsxr_LDADD = \ ../libpcsxcore/libpcsxcore.a \ -- $(GTK2_LIBS) $(GLADE2_LIBS) -lpthread -lz -lm -lXext -lXtst -+ $(GTK2_LIBS) $(GLADE2_LIBS) -lz -lm -lXext -lXtst -lGL +- $(GTK3_LIBS) $(GLADE2_LIBS) -lpthread -lz -lm -lXext -lXtst ++ $(GTK3_LIBS) $(GLADE2_LIBS) -lz -lm -lXext -lXtst -lGL +pcsxr_LDFLAGS = -pthread Property changes on: head/emulators/pcsxr/files/patch-gui-Makefile.am ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/emulators/pcsxr/files/patch-plugins-bladesio1-Makefile.am =================================================================== --- head/emulators/pcsxr/files/patch-plugins-bladesio1-Makefile.am (revision 316087) +++ head/emulators/pcsxr/files/patch-plugins-bladesio1-Makefile.am (revision 316088) @@ -1,26 +1,26 @@ --- plugins/bladesio1/Makefile.am.orig 2011-06-30 08:51:19.659732652 +0200 +++ plugins/bladesio1/Makefile.am 2011-06-30 08:52:16.694874269 +0200 @@ -1,5 +1,5 @@ -bindir = @libdir@/games/psemu/ -libdir = @libdir@/games/psemu/ +bindir = @libdir@/pcsxr/ +libdir = @libdir@/pcsxr/ lib_LTLIBRARIES = libBladeSio1.la @@ -7,7 +7,7 @@ libBladeSio1_la_LDFLAGS = -module -avoid-version AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ - -DDATADIR=\"${datadir}/psemu/\" \ + -DDATADIR=\"${datadir}/pcsxr/\" \ - $(GTK2_CFLAGS) \ + $(GTK3_CFLAGS) \ -I../../libpcsxcore -I../../include @@ -16,5 +16,5 @@ - cfgBladeSio1_LDADD = $(GTK2_LIBS) + cfgBladeSio1_LDADD = $(GTK3_LIBS) glade_DATA = sio1.ui -gladedir = $(datadir)/psemu/ +gladedir = $(datadir)/pcsxr/ EXTRA_DIST = $(glade_DATA) Property changes on: head/emulators/pcsxr/files/patch-plugins-bladesio1-Makefile.am ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/emulators/pcsxr/files/patch-plugins-dfcdrom-Makefile.am =================================================================== --- head/emulators/pcsxr/files/patch-plugins-dfcdrom-Makefile.am (revision 316087) +++ head/emulators/pcsxr/files/patch-plugins-dfcdrom-Makefile.am (revision 316088) @@ -1,37 +1,37 @@ --- plugins/dfcdrom/Makefile.am.orig 2011-06-30 08:55:41.398655616 +0200 +++ plugins/dfcdrom/Makefile.am 2011-06-30 08:57:01.844014733 +0200 @@ -1,5 +1,5 @@ -bindir = @libdir@/games/psemu/ -libdir = @libdir@/games/psemu/ +bindir = @libdir@/pcsxr/ +libdir = @libdir@/pcsxr/ lib_LTLIBRARIES = libDFCdrom.la @@ -13,8 +13,8 @@ util.c libDFCdrom_la_CFLAGS = -libDFCdrom_la_LDFLAGS = -module -avoid-version -libDFCdrom_la_LIBADD = -lpthread +libDFCdrom_la_LDFLAGS = -module -avoid-version -pthread +libDFCdrom_la_LIBADD = if USE_LIBCDIO libDFCdrom_la_CFLAGS += -DUSE_LIBCDIO=1 $(LIBCDIO_CFLAGS) @@ -22,7 +22,7 @@ endif AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ - -DDATADIR=\"${datadir}/psemu/\" \ + -DDATADIR=\"${datadir}/pcsxr/\" \ - $(GTK2_CFLAGS) \ + $(GTK3_CFLAGS) \ -I../../libpcsxcore -I../../include @@ -31,5 +31,5 @@ - cfgDFCdrom_LDADD = $(GTK2_LIBS) + cfgDFCdrom_LDADD = $(GTK3_LIBS) glade_DATA = cdrcfg-0.1df/dfcdrom.ui -gladedir = $(datadir)/psemu/ +gladedir = $(datadir)/pcsxr/ EXTRA_DIST = $(glade_DATA) Property changes on: head/emulators/pcsxr/files/patch-plugins-dfcdrom-Makefile.am ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/emulators/pcsxr/files/patch-plugins-dfinput-Makefile.am =================================================================== --- head/emulators/pcsxr/files/patch-plugins-dfinput-Makefile.am (revision 316087) +++ head/emulators/pcsxr/files/patch-plugins-dfinput-Makefile.am (revision 316088) @@ -1,29 +1,29 @@ --- plugins/dfinput/Makefile.am.orig 2012-11-07 17:22:21.000000000 +0100 +++ plugins/dfinput/Makefile.am 2012-11-07 17:24:22.000000000 +0100 @@ -1,14 +1,14 @@ -bindir = @libdir@/games/psemu/ -libdir = @libdir@/games/psemu/ +bindir = @libdir@/pcsxr/ +libdir = @libdir@/pcsxr/ lib_LTLIBRARIES = libDFInput.la libDFInput_la_SOURCES = cfg.c pad.c pad.h sdljoy.c xkb.c analog.c util.c util.h -libDFInput_la_LDFLAGS = -module -avoid-version -libDFInput_la_LIBADD = -lpthread -lX11 $(SDL_LIBS) +libDFInput_la_LDFLAGS = -module -avoid-version -pthread +libDFInput_la_LIBADD = -lX11 $(SDL_LIBS) AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ - -DDATADIR=\"${datadir}/psemu/\" \ + -DDATADIR=\"${datadir}/pcsxr/\" \ - $(GTK2_CFLAGS) \ + $(GTK3_CFLAGS) \ -I../../include -I../../libpcsxcore $(SDL_CFLAGS) @@ -17,5 +17,5 @@ - cfgDFInput_LDADD = $(GTK2_LIBS) $(SDL_LIBS) -lX11 + cfgDFInput_LDADD = $(GTK3_LIBS) $(SDL_LIBS) -lX11 glade_DATA = dfinput.ui -gladedir = $(datadir)/psemu/ +gladedir = $(datadir)/pcsxr/ EXTRA_DIST = $(glade_DATA) Index: head/emulators/pcsxr/files/patch-plugins-dfinput-pad.c =================================================================== --- head/emulators/pcsxr/files/patch-plugins-dfinput-pad.c (revision 316087) +++ head/emulators/pcsxr/files/patch-plugins-dfinput-pad.c (revision 316088) @@ -1,18 +1,9 @@ ---- plugins/dfinput/pad.c.orig 2012-11-08 06:07:00.000000000 +0100 -+++ plugins/dfinput/pad.c 2012-11-08 06:09:26.000000000 +0100 -@@ -676,8 +676,6 @@ - } else if (pid > 0) { - waitpid(pid, NULL, 0); - } -- -- return PSE_PAD_ERR_SUCCESS; - } - - #endif -@@ -685,3 +683,6 @@ +--- plugins/dfinput/pad.c.orig 2013-04-17 16:44:04.000000000 +0200 ++++ plugins/dfinput/pad.c 2013-04-17 16:46:50.000000000 +0200 +@@ -683,3 +683,6 @@ long PADtest(void) { return PSE_PAD_ERR_SUCCESS; } + +/* missing symbol : do nothing */ +void PADsetSensitive(int sensitive) {} Index: head/emulators/pcsxr/files/patch-plugins-dfnet-Makefile.am =================================================================== --- head/emulators/pcsxr/files/patch-plugins-dfnet-Makefile.am (revision 316087) +++ head/emulators/pcsxr/files/patch-plugins-dfnet-Makefile.am (revision 316088) @@ -1,26 +1,26 @@ --- plugins/dfnet/Makefile.am.orig 2012-11-07 17:26:37.000000000 +0100 +++ plugins/dfnet/Makefile.am 2012-11-07 17:28:04.000000000 +0100 @@ -1,5 +1,5 @@ -bindir = @libdir@/games/psemu/ -libdir = @libdir@/games/psemu/ +bindir = @libdir@/pcsxr/ +libdir = @libdir@/pcsxr/ lib_LTLIBRARIES = libDFNet.la @@ -7,7 +7,7 @@ libDFNet_la_LDFLAGS = -module -avoid-version AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ - -DDATADIR=\"${datadir}/psemu/\" \ + -DDATADIR=\"${datadir}/pcsxr/\" \ - $(GTK2_CFLAGS) \ + $(GTK3_CFLAGS) \ -I../../libpcsxcore -I../../include @@ -16,5 +16,5 @@ - cfgDFNet_LDADD = $(GTK2_LIBS) + cfgDFNet_LDADD = $(GTK3_LIBS) glade_DATA = dfnet.ui -gladedir = $(datadir)/psemu/ +gladedir = $(datadir)/pcsxr/ EXTRA_DIST = $(glade_DATA) Index: head/emulators/pcsxr/files/patch-plugins-dfsound-Makefile.am =================================================================== --- head/emulators/pcsxr/files/patch-plugins-dfsound-Makefile.am (revision 316087) +++ head/emulators/pcsxr/files/patch-plugins-dfsound-Makefile.am (revision 316088) @@ -1,36 +1,36 @@ --- plugins/dfsound/Makefile.am.orig 2011-07-01 09:14:20.495315356 +0200 +++ plugins/dfsound/Makefile.am 2011-07-01 09:13:24.000000000 +0200 @@ -1,15 +1,15 @@ AM_CPPFLAGS = -I../../include -bindir = @libdir@/games/psemu/ -libdir = @libdir@/games/psemu/ +bindir = @libdir@/pcsxr/ +libdir = @libdir@/pcsxr/ lib_LTLIBRARIES = libDFSound.la libDFSound_la_SOURCES = adsr.c adsr.h spu.c spu.h cfg.c cfg.h dma.c dma.h gauss_i.h freeze.c reverb.c reverb.h registers.c registers.h externals.c externals.h dsoundoss.h psemuxa.h regs.h xa.c xa.h stdafx.h libDFSound_la_CPPFLAGS = $(AM_CPPFLAGS) -libDFSound_la_LDFLAGS = -module -avoid-version -libDFSound_la_LIBADD = -lpthread -lm +libDFSound_la_LDFLAGS = -module -avoid-version -pthread +libDFSound_la_LIBADD = -lm if SOUND_ALSA libDFSound_la_SOURCES += alsa.c @@ -47,11 +47,11 @@ bin_PROGRAMS = cfgDFSound cfgDFSound_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ - -DDATADIR=\"${datadir}/psemu/\" \ + -DDATADIR=\"${datadir}/pcsxr/\" \ - $(GTK2_CFLAGS) $(AM_CPPFLAGS) + $(GTK3_CFLAGS) $(AM_CPPFLAGS) cfgDFSound_SOURCES = spucfg-0.1df/main.c - cfgDFSound_LDADD = $(GTK2_LIBS) + cfgDFSound_LDADD = $(GTK3_LIBS) glade_DATA = spucfg-0.1df/dfsound.ui -gladedir = $(datadir)/psemu/ +gladedir = $(datadir)/pcsxr/ EXTRA_DIST = $(glade_DATA) Property changes on: head/emulators/pcsxr/files/patch-plugins-dfsound-Makefile.am ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/emulators/pcsxr/files/patch-plugins-dfxvideo-Makefile.am =================================================================== --- head/emulators/pcsxr/files/patch-plugins-dfxvideo-Makefile.am (revision 316087) +++ head/emulators/pcsxr/files/patch-plugins-dfxvideo-Makefile.am (revision 316088) @@ -1,26 +1,26 @@ --- plugins/dfxvideo/Makefile.am.orig 2011-06-30 09:12:42.916385383 +0200 +++ plugins/dfxvideo/Makefile.am 2011-06-30 09:14:44.735162351 +0200 @@ -7,13 +7,13 @@ $(STRIP_FPIC) $(NASM) -f elf -d ELF -I${srcdir}/ $< AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \ - -DDATADIR=\"${datadir}/psemu/\" \ + -DDATADIR=\"${datadir}/pcsxr/\" \ - $(GTK2_CFLAGS)\ + $(GTK3_CFLAGS)\ -I../../libpcsxcore \ -I../../include -bindir = @libdir@/games/psemu/ -libdir = @libdir@/games/psemu/ +bindir = @libdir@/pcsxr/ +libdir = @libdir@/pcsxr/ lib_LTLIBRARIES = libDFXVideo.la @@ -30,5 +30,5 @@ - cfgDFXVideo_LDADD = $(GTK2_LIBS) -lXext + cfgDFXVideo_LDADD = $(GTK3_LIBS) -lXext glade_DATA = gpucfg-0.1df/dfxvideo.ui -gladedir = $(datadir)/psemu/ +gladedir = $(datadir)/pcsxr/ EXTRA_DIST = $(glade_DATA) Property changes on: head/emulators/pcsxr/files/patch-plugins-dfxvideo-Makefile.am ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/emulators/pcsxr/files/patch-plugins-peopsxgl-Makefile.am =================================================================== --- head/emulators/pcsxr/files/patch-plugins-peopsxgl-Makefile.am (revision 316087) +++ head/emulators/pcsxr/files/patch-plugins-peopsxgl-Makefile.am (revision 316088) @@ -1,24 +1,24 @@ --- plugins/peopsxgl/Makefile.am.orig 2011-01-21 18:18:40.882339497 +0100 +++ plugins/peopsxgl/Makefile.am 2011-01-21 18:20:06.105901151 +0100 @@ -1,11 +1,11 @@ AM_CPPFLAGS = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \ -DLOCALE_DIR=\"${datadir}/locale/\" \ - -DDATADIR=\"${datadir}/psemu/\" \ + -DDATADIR=\"${datadir}/pcsxr/\" \ - $(GTK2_CFLAGS) \ + $(GTK3_CFLAGS) \ -I../../libpcsxcore -I../../include -bindir = @libdir@/games/psemu/ -libdir = @libdir@/games/psemu/ +bindir = @libdir@/pcsxr/ +libdir = @libdir@/pcsxr/ lib_LTLIBRARIES = libpeopsxgl.la @@ -19,5 +19,5 @@ - cfgpeopsxgl_LDADD = $(GTK2_LIBS) + cfgpeopsxgl_LDADD = $(GTK3_LIBS) glade_DATA = gpucfg/peopsxgl.ui -gladedir = $(datadir)/psemu/ +gladedir = $(datadir)/pcsxr/ EXTRA_DIST = $(glade_DATA) Property changes on: head/emulators/pcsxr/files/patch-plugins-peopsxgl-Makefile.am ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/emulators/pcsxr/pkg-plist =================================================================== --- head/emulators/pcsxr/pkg-plist (revision 316087) +++ head/emulators/pcsxr/pkg-plist (revision 316088) @@ -1,65 +1,61 @@ bin/pcsxr %%NLS%%share/locale/fr_FR/LC_MESSAGES/pcsxr.mo %%NLS%%share/locale/it/LC_MESSAGES/pcsxr.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/pcsxr.mo %%NLS%%share/locale/ru_RU/LC_MESSAGES/pcsxr.mo %%NLS%%share/locale/hu_HU/LC_MESSAGES/pcsxr.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/pcsxr.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/pcsxr.mo %%NLS%%@dirrmtry share/locale/hu_HU/LC_MESSAGES %%NLS%%@dirrmtry share/locale/hu_HU %%NLS%%@dirrmtry share/locale/ru_RU/LC_MESSAGES %%NLS%%@dirrmtry share/locale/ru_RU share/pcsxr/peopsxgl.ui share/pcsxr/dfinput.ui share/pcsxr/dfnet.ui share/pcsxr/dfxvideo.ui share/pcsxr/dfcdrom.ui -share/pcsxr/sio1.ui share/pcsxr/gpu.png share/pcsxr/dfsound.ui share/pcsxr/spu.png +share/pcsxr/sio1.png share/pcsxr/cd.png share/pcsxr/iso-reopen.png share/pcsxr/cdr.png share/pcsxr/pcsxr.ui share/pcsxr/iso-open.png share/pcsxr/play.png share/pcsxr/pad.png share/pcsxr/memcard.png share/pcsxr/pcsxr.png @dirrm share/pcsxr share/pixmaps/pcsxr-icon.png share/applications/pcsxr.desktop @dirrmtry share/applications lib/pcsxr/cfgDFXVideo lib/pcsxr/cfgpeopsxgl lib/pcsxr/cfgDFInput lib/pcsxr/cfgDFCdrom lib/pcsxr/cfgDFSound lib/pcsxr/cfgDFNet -lib/pcsxr/cfgBladeSio1 lib/pcsxr/libDFXVideo.a lib/pcsxr/libDFXVideo.la lib/pcsxr/libDFXVideo.so lib/pcsxr/libpeopsxgl.a lib/pcsxr/libpeopsxgl.la lib/pcsxr/libpeopsxgl.so lib/pcsxr/libDFInput.a lib/pcsxr/libDFInput.la lib/pcsxr/libDFInput.so lib/pcsxr/libDFSound.a lib/pcsxr/libDFSound.la lib/pcsxr/libDFSound.so lib/pcsxr/libDFCdrom.a lib/pcsxr/libDFCdrom.la lib/pcsxr/libDFCdrom.so lib/pcsxr/libDFNet.a lib/pcsxr/libDFNet.la lib/pcsxr/libDFNet.so -lib/pcsxr/libBladeSio1.a -lib/pcsxr/libBladeSio1.la -lib/pcsxr/libBladeSio1.so @dirrm lib/pcsxr @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true