FreeBSD Bugzilla – Attachment 22277 Details for
Bug 38706
Update port: audio/gnump3d
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 3.64 KB, created by
tkato
on 2002-05-29 23:10:01 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
tkato
Created:
2002-05-29 23:10:01 UTC
Size:
3.64 KB
patch
obsolete
>diff -urN /usr/ports/audio/gnump3d/Makefile audio/gnump3d/Makefile >--- /usr/ports/audio/gnump3d/Makefile Mon May 27 22:24:59 2002 >+++ audio/gnump3d/Makefile Tue May 28 02:14:43 2002 >@@ -8,19 +8,18 @@ > > PORTNAME= gnump3d > PORTVERSION= 0.9.9.7 >+PORTREVISION= 1 > CATEGORIES= audio > MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} > MASTER_SITE_SUBDIR= ${PORTNAME} > > MAINTAINER= ports@FreeBSD.org > >+MAKE_ENV= CC="${CXX}" CFLAGS="${CXXFLAGS}" \ >+ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ >+ PTHREAD_LIBS="${PTHREAD_LIBS}" > ALL_TARGET= freebsd > > MAN1= mp3d.1 mp3d.conf.1 mp3d-top.1 >- >-post-patch: >- @${PERL} -pi -e "s,^PREFIX,#PREFIX,g ; \ >- s,/usr/local,${PREFIX},g ; \ >- s,-pthread,${PTHREAD_LIBS},g" ${WRKSRC}/mkfiles/freebsd > > .include <bsd.port.mk> >diff -urN /usr/ports/audio/gnump3d/files/patch-freebsd audio/gnump3d/files/patch-freebsd >--- /usr/ports/audio/gnump3d/files/patch-freebsd Mon May 27 22:25:00 2002 >+++ audio/gnump3d/files/patch-freebsd Tue May 28 02:00:30 2002 >@@ -1,15 +1,75 @@ >---- mkfiles/freebsd.orig Mon May 27 21:23:17 2002 >-+++ mkfiles/freebsd Mon May 27 21:23:31 2002 >-@@ -116,10 +116,10 @@ >- install ../mp3d.conf $(CONFIGDIR) >+--- mkfiles/freebsd.orig Thu May 16 18:08:35 2002 >++++ mkfiles/freebsd Tue May 28 02:00:05 2002 >+@@ -6,8 +6,8 @@ >+ # if you wish you may change PREFIX to be /usr/local, >+ # for example >+ # >+-PREFIX = >+-#PREFIX = /usr/local >++#PREFIX = >++PREFIX ?= /usr/local >+ >+ # >+ # Binary installation directory. >+@@ -24,7 +24,7 @@ >+ # >+ # Where we install the manpages. >+ # >+-MANDIR = /usr/local/man/man1 >++MANDIR = $(PREFIX)/man/man1 >+ >+ >+ >+@@ -32,12 +32,12 @@ >+ O = o >+ RM = rm -f >+ RMDIR = rm -rf >+-CC = g++ >+-LIBS = -pthread >++CC ?= g++ >++LIBS = ${PTHREAD_LIBS} >+ >+ >+-DEFAULT_CFLAGS = -I. -D_THREAD_SAFE -D_REENTRANT -DBINARY_DIR="\"$(BINARYDIR)\"" -DSYSCONFDIR="\"$(CONFIGDIR)\"" -DVERSION="\"0.9.9.7\"" >+-CFLAGS = $(DEFAULT_CFLAGS) -Wall -DFREEBSD=1 -DOS_TYPE="\"FreeBSD\"" >++DEFAULT_CFLAGS = -I. ${PTHREAD_CFLAGS} -D_REENTRANT -DBINARY_DIR="\"$(BINARYDIR)\"" -DSYSCONFDIR="\"$(CONFIGDIR)\"" -DVERSION="\"0.9.9.7\"" >++CFLAGS += $(DEFAULT_CFLAGS) -Wall -DFREEBSD=1 -DOS_TYPE="\"FreeBSD\"" >+ >+ >+ # >+@@ -110,22 +110,22 @@ >+ # Install the software. >+ # >+ install: $(PROG) >+- install -d $(BINARYDIR) -d $(CONFIGDIR) -d $(TEMPLATEDIR) >+- install ../mp3d $(BINARYDIR) >+- install ../contrib/stats/mp3d-top $(BINARYDIR) >+- install ../mp3d.conf $(CONFIGDIR) >++ mkdir -p $(BINARYDIR) $(CONFIGDIR) $(TEMPLATEDIR) >++ ${BSD_INSTALL_PROGRAM} ../mp3d $(BINARYDIR) >++ ${BSD_INSTALL_SCRIPT} ../contrib/stats/mp3d-top $(BINARYDIR) >++ ${BSD_INSTALL_DATA} ../mp3d.conf $(CONFIGDIR) > # Default template. >- install -d $(TEMPLATEDIR)/default >+- install -d $(TEMPLATEDIR)/default > - cp -R ../templates/default/ $(TEMPLATEDIR) >-+ cp -R ../templates/default $(TEMPLATEDIR) >++ mkdir -p $(TEMPLATEDIR)/default >++ ${BSD_INSTALL_DATA} ../templates/default/* $(TEMPLATEDIR)/default > # Simple template >- install -d $(TEMPLATEDIR)/simple >+- install -d $(TEMPLATEDIR)/simple > - cp -R ../templates/simple/ $(TEMPLATEDIR) >-+ cp -R ../templates/simple $(TEMPLATEDIR) >- install ../templates/README $(TEMPLATEDIR) >+- install ../templates/README $(TEMPLATEDIR) >++ mkdir -p $(TEMPLATEDIR)/simple >++ ${BSD_INSTALL_DATA} ../templates/simple/* $(TEMPLATEDIR)/simple >++ ${BSD_INSTALL_DATA} ../templates/README $(TEMPLATEDIR) > # Man pages. >- install -d $(MANDIR) >+- install -d $(MANDIR) >+- install ../doc/mp3d.1 $(MANDIR) >+- install ../doc/mp3d.conf.1 $(MANDIR) >+- install ../doc/mp3d-top.1 $(MANDIR) >++ mkdir -p $(MANDIR) >++ ${BSD_INSTALL_DATA} ../doc/mp3d.1 $(MANDIR) >++ ${BSD_INSTALL_DATA} ../doc/mp3d.conf.1 $(MANDIR) >++ ${BSD_INSTALL_DATA} ../doc/mp3d-top.1 $(MANDIR) >+ >+ >+ #
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 38706
: 22277