cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't hardcode /usr/local; from maintainer Dan Weeks <danimal@danimal.org>.

Browse Source
This commit is contained in:
naddy 2002-01-17 15:18:07 +00:00
parent 742051faaa
commit 1b3018202c
5 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
audio/xmmix/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.18 2002/01/14 13:47:21 naddy Exp $
# $OpenBSD: Makefile,v 1.19 2002/01/17 15:18:07 naddy Exp $
COMMENT= "Motif-based audio mixer"
DISTNAME= xmmix-1.2.2
@ -20,4 +20,8 @@ USE_MOTIF= any
WRKDIST= ${WRKDIR}/xmmix-1.2
post-install:
@ perl -pi -e 's,\@PREFIX@,${TRUEPREFIX},;' \
${PREFIX}/lib/X11/app-defaults/XMmix
.include <bsd.port.mk>

9
audio/xmmix/patches/patch-Imakefile
View File

@ -1,12 +1,13 @@
$OpenBSD: patch-Imakefile,v 1.1 2002/01/14 13:47:22 naddy Exp $
--- Imakefile.orig Sun Jul 14 19:48:56 1996
+++ Imakefile Mon Jan 14 14:41:27 2002
@@ -43,7 +43,7 @@
--- Imakefile.orig Sun Jul 14 13:48:56 1996
+++ Imakefile Wed Jan 16 20:42:52 2002
@@ -43,8 +43,9 @@
* #include "Motif.tmpl"
* #include "Motif.rules"
*/
-LOCAL_LIBRARIES= XmClientLibs
+LOCAL_LIBRARIES= ${MOTIFLIB} ${XTOOLLIB} ${XLIB} -lossaudio
+CCOPTIONS= -DHLPPREFIX=\"$(PREFIX)\"
/*
* C Source files

8
audio/xmmix/patches/patch-XMmix_ad
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-XMmix_ad,v 1.1 2002/01/14 13:47:22 naddy Exp $
--- XMmix.ad.orig Sun Jul 14 19:48:58 1996
+++ XMmix.ad Sun Apr 9 18:34:52 2000
$OpenBSD: patch-XMmix_ad,v 1.2 2002/01/17 15:18:07 naddy Exp $
--- XMmix.ad.orig Sun Jul 14 13:48:58 1996
+++ XMmix.ad Mon Jan 14 15:01:05 2002
@@ -26,7 +26,7 @@
!*
! This points to the on-line help file
-XMmix*helpPath: /usr/lib/X11/xmmix.hlp
+XMmix*helpPath: /usr/local/lib/X11/xmmix.hlp
+XMmix*helpPath: @PREFIX@/lib/X11/xmmix.hlp
! This points to a mixer settings file that is automatically loaded
! upon startup. If set to /dev/null, then no file will be auto-loaded.

13
audio/xmmix/patches/patch-main_c
View File

@ -1,6 +1,15 @@
$OpenBSD: patch-main_c,v 1.1 2002/01/14 13:47:22 naddy Exp $
$OpenBSD: patch-main_c,v 1.2 2002/01/17 15:18:07 naddy Exp $
--- main.c.orig Thu Nov 7 17:01:43 1996
+++ main.c Mon Jan 14 14:41:27 2002
+++ main.c Thu Jan 17 16:14:05 2002
@@ -95,7 +95,7 @@ usage(int argc, char **argv)
* main
* The main function
*/
-void
+int
main(int argc, char **argv)
{
XtAppContext app;
@@ -159,7 +159,7 @@ main(int argc, char **argv)
post_realize_config(&widgets);

7
audio/xmmix/patches/patch-resource_h
View File

@ -1,12 +1,11 @@
$OpenBSD: patch-resource_h,v 1.1 2002/01/14 13:47:22 naddy Exp $
--- resource.h.orig Sun Jul 14 19:49:07 1996
+++ resource.h Sun Apr 9 18:35:52 2000
--- resource.h.orig Sun Jul 14 13:49:07 1996
+++ resource.h Wed Jan 16 20:24:43 2002
@@ -63,7 +63,7 @@ STATIC XtResource resources[] = {
XmcdNhelpPath, XmcdCHelpPath,
XmRString, sizeof(String),
XtOffsetOf(appdata_t, helppath), XmRImmediate,
- (XtPointer) "/usr/lib/X11/xmmix.hlp",
+ (XtPointer) "/usr/local/lib/X11/xmmix.hlp",
+ (XtPointer) HLPPREFIX"/lib/X11/xmmix.hlp",
},
{
XmcdNautoLoadOnStartUp, XmcdCAutoLoadOnStartUp,