diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-01-28 07:06:56 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-01-28 07:06:56 +0800 |
| commit | 8c76a802b8c078772368832e1b2331df8644846b (patch) | |
| tree | 8a426d549e9188e3cb63868ec0ba7efe8be557e1 | |
| parent | 36f5d7f1e77bfc30fd9e297837207b13d71f4924 (diff) | |
| download | marcuscom-ports-8c76a802b8c078772368832e1b2331df8644846b.tar marcuscom-ports-8c76a802b8c078772368832e1b2331df8644846b.tar.gz marcuscom-ports-8c76a802b8c078772368832e1b2331df8644846b.tar.bz2 marcuscom-ports-8c76a802b8c078772368832e1b2331df8644846b.tar.lz marcuscom-ports-8c76a802b8c078772368832e1b2331df8644846b.tar.xz marcuscom-ports-8c76a802b8c078772368832e1b2331df8644846b.tar.zst marcuscom-ports-8c76a802b8c078772368832e1b2331df8644846b.zip | |
Ugh, how long have I been doing this? Don't hardcode /usr/local.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@471 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | multimedia/acme/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/acme/files/patch-src_acme.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/multimedia/acme/Makefile b/multimedia/acme/Makefile index e5b7a5063..9a60f5371 100644 --- a/multimedia/acme/Makefile +++ b/multimedia/acme/Makefile @@ -33,5 +33,7 @@ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/src/acme.c .include <bsd.port.mk> diff --git a/multimedia/acme/files/patch-src_acme.c b/multimedia/acme/files/patch-src_acme.c index 9d05cccac..3a46a7e34 100644 --- a/multimedia/acme/files/patch-src_acme.c +++ b/multimedia/acme/files/patch-src_acme.c @@ -5,11 +5,11 @@ return; - if (g_file_test ("/usr/bin/esdplay", -+ if (g_file_test ("/usr/local/bin/esdplay", ++ if (g_file_test ("%%LOCALBASE%%/bin/esdplay", (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_EXECUTABLE))) { - command = g_strdup_printf ("/usr/bin/esdplay %s", -+ command = g_strdup_printf ("/usr/local/bin/esdplay %s", ++ command = g_strdup_printf ("%%LOCALBASE%%/bin/esdplay %s", soundfile); } else if (g_file_test ("/usr/bin/play", (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_EXECUTABLE))) |