diff options
author | Jim Mock <jim@FreeBSD.org> | 2000-08-06 20:27:11 +0000 |
---|---|---|
committer | Jim Mock <jim@FreeBSD.org> | 2000-08-06 20:27:11 +0000 |
commit | 52980b4ae83b0aba62dce41add26109e40ed9bea (patch) | |
tree | 7651bb43558cdb61865f966b1433503564551301 /audio | |
parent | Update to 1.4.1 (diff) |
Support CFLAGS/PREFIX properly.
PR: 20413
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Notes
Notes:
svn path=/head/; revision=31351
Diffstat (limited to 'audio')
-rw-r--r-- | audio/ascd/Makefile | 10 | ||||
-rw-r--r-- | audio/ascd/files/patch-aa | 4 | ||||
-rw-r--r-- | audio/ascd/files/patch-ab | 6 | ||||
-rw-r--r-- | audio/ascd/files/patch-ae | 13 |
4 files changed, 19 insertions, 14 deletions
diff --git a/audio/ascd/Makefile b/audio/ascd/Makefile index ea169edc278f..398df0f0c47c 100644 --- a/audio/ascd/Makefile +++ b/audio/ascd/Makefile @@ -16,17 +16,21 @@ MAINTAINER= jim@FreeBSD.org LIB_DEPENDS= workman.1:${PORTSDIR}/audio/libworkman WRKSRC= ${WRKDIR}/${PKGNAME} + USE_IMAKE= yes USE_XPM= yes -HAS_CONFIGURE= yes -CONFIGURE_SCRIPT= default + DATAFILES= ascd-0.13pr6-themes.tgz THEMESDIR= ascd-0.13pr6-themes MAN1= ascd.1 post-patch: - @${LN} -fs ${WRKSRC}/misc/default ${WRKSRC}/default + @${SED} -e "s:%%PREFIX%%:${PREFIX}:g" \ + ${WRKSRC}/misc/config.h.default > ${WRKSRC}/config.h + @${SED} -e "s:%%PREFIX%%:${PREFIX}:g" \ + ${WRKSRC}/misc/dirs.h.default > ${WRKSRC}/dirs.h + @${CAT} ${WRKSRC}/version.h >> ${WRKSRC}/config.h post-install: @${CP} ${FILESDIR}/install ${WRKDIR}/${THEMESDIR} diff --git a/audio/ascd/files/patch-aa b/audio/ascd/files/patch-aa index 7597ba9aeb4f..1825012fba10 100644 --- a/audio/ascd/files/patch-aa +++ b/audio/ascd/files/patch-aa @@ -6,5 +6,5 @@ #define DEFAULT_BGCOLOR "#000000" -#define DEFAULTDEVICE "/dev/cdrom" -#define THDIR "/usr/local/share/AScd" -+#define DEFAULTDEVICE "/dev/wcd0c" -+#define THDIR "/usr/X11R6/share/ascd" ++#define DEFAULTDEVICE "/dev/acd0c" ++#define THDIR "%%PREFIX%%/share/ascd" diff --git a/audio/ascd/files/patch-ab b/audio/ascd/files/patch-ab index ba7c495c4e3e..9b950f0f898b 100644 --- a/audio/ascd/files/patch-ab +++ b/audio/ascd/files/patch-ab @@ -4,6 +4,6 @@ -#define CBINDIR /usr/local/bin -#define CMANDIR /usr/local/man/man1 -#define CTHDIR /usr/local/share/AScd -+#define CBINDIR /usr/X11R6/bin -+#define CMANDIR /usr/X11R6/man/man1 -+#define CTHDIR /usr/X11R6/share/ascd ++#define CBINDIR %%PREFIX%%/bin ++#define CMANDIR %%PREFIX%%/man/man1 ++#define CTHDIR %%PREFIX%%/share/ascd diff --git a/audio/ascd/files/patch-ae b/audio/ascd/files/patch-ae index 0532a363b8e8..697bbe83009c 100644 --- a/audio/ascd/files/patch-ae +++ b/audio/ascd/files/patch-ae @@ -1,15 +1,16 @@ ---- Imakefile.orig Sun Sep 5 09:24:23 1999 -+++ Imakefile Sat Sep 25 23:52:18 1999 -@@ -6,10 +6,10 @@ +--- Imakefile.orig Sun Sep 5 08:24:23 1999 ++++ Imakefile Wed Aug 2 04:41:16 2000 +@@ -5,11 +5,10 @@ + BINDIR = CBINDIR MANDIR = CMANDIR THEMESDIR = CTHDIR - MOREFLAGS = -I/usr/local/include -I/usr/X11R6/include -I. +-MOREFLAGS = -I/usr/local/include -I/usr/X11R6/include -I. -CCOPTIONS = $(MOREFLAGS) -+CCOPTIONS = -O0 $(MOREFLAGS) ++EXTRA_INCLUDES = -I. SYS_LIBRARIES = $(XLIB) -lXpm -LOCAL_LIBRARIES = -L../libworkman -lworkman -L/usr/local/lib -+LOCAL_LIBRARIES = -L../libworkman -lworkman -L/usr/X11R6/lib ++LOCAL_LIBRARIES = -lworkman SRCS_OPT1 = SRCS_OPT2 = |