diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2003-09-08 05:49:41 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2003-09-08 05:49:41 +0000 |
| commit | 7e5f15f92760e034c3c47c430582f9b6dc9f6d49 (patch) | |
| tree | 07d7fe3f5318d9326c155d62a2b85907e06a00d2 /sysutils | |
| parent | 0f15a9d90f170d1c44455423fa212c1c449ffc68 (diff) | |
| download | ports-7e5f15f92760e034c3c47c430582f9b6dc9f6d49.tar.gz ports-7e5f15f92760e034c3c47c430582f9b6dc9f6d49.zip | |
Update port: sysutils/gtoaster
- Fix handling PORTVERSION
- Reaarange USE_GNOME
- machine/soundcard.h -> sys/soundcard.h
PR: ports/56530
Submitted by: KATO Tsuguru <tkato@prontomail.com>
Notes
Notes:
svn path=/head/; revision=88733
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/gtoaster/Makefile | 55 | ||||
| -rw-r--r-- | sysutils/gtoaster/files/patch-audio_oss.c | 11 | ||||
| -rw-r--r-- | sysutils/gtoaster/files/patch-configure | 11 |
3 files changed, 62 insertions, 15 deletions
diff --git a/sysutils/gtoaster/Makefile b/sysutils/gtoaster/Makefile index 28d8edcc1b74..31d45b82d257 100644 --- a/sysutils/gtoaster/Makefile +++ b/sysutils/gtoaster/Makefile @@ -6,11 +6,11 @@ # PORTNAME= gtoaster -PORTVERSION= 1.0.Beta6 -PORTEPOCH= 1 +PORTVERSION= 1.0.b6 +PORTEPOCH= 2 CATEGORIES= sysutils gnome MASTER_SITES= http://gnometoaster.rulez.org/archive/ -DISTNAME= ${PORTNAME}1.0Beta6 +DISTNAME= ${PORTNAME}${PORTVERSION:S/.b/Beta/} EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org @@ -19,17 +19,42 @@ COMMENT= Graphical cd cooking interface RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools \ mkisofs:${PORTSDIR}/sysutils/mkisofs -WRKSRC= ${WRKDIR}/gtoaster +WRKSRC= ${WRKDIR}/${PORTNAME} -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${X11BASE} -CONFIGURE_ENV= GTK_CONFIG=${X11BASE}/bin/gtk12-config - -USE_GNOME= gtk12 -USE_GMAKE= yes USE_X_PREFIX= yes - -pre-configure: - @${RM} ${WRKSRC}/config.guess - -.include <bsd.port.mk> +WANT_GNOME= yes +USE_GNOME= gnomehack gnometarget gtk12 +USE_GMAKE= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +.include <bsd.port.pre.mk> + +.if ${HAVE_GNOME:Mgnomelibs}!="" +PKGNAMESUFFIX= -gnome +USE_GNOME+= gnomelibs +.else +CONFIGURE_ARGS+= --without-gnome +.endif + +.if ${HAVE_GNOME:Morbit}!="" +USE_GNOME+= orbit +.else +CONFIGURE_ARGS+= --without-orbit +.endif + +.if ${HAVE_GNOME:Mesound}!="" +USE_GNOME+= esound +.else +CONFIGURE_ARGS+= --without-esd +.endif + +post-extract: + @${RM} -f ${WRKSRC}/config.guess + @${TOUCH} ${WRKSRC}/config.guess + +post-patch: + ${REINPLACE_CMD} -e 's, -pthread, ${PTHREAD_LIBS},g' \ + ${WRKSRC}/configure +.include <bsd.port.post.mk> diff --git a/sysutils/gtoaster/files/patch-audio_oss.c b/sysutils/gtoaster/files/patch-audio_oss.c new file mode 100644 index 000000000000..dfe50aa927e6 --- /dev/null +++ b/sysutils/gtoaster/files/patch-audio_oss.c @@ -0,0 +1,11 @@ +--- audio_oss.c.orig Sun Sep 7 22:30:57 2003 ++++ audio_oss.c Sun Sep 7 22:31:10 2003 +@@ -15,7 +15,7 @@ + #ifndef __FreeBSD__ + #include <linux/soundcard.h> + #else +-#include <machine/soundcard.h> ++#include <sys/soundcard.h> + #define SNDCTL_DSP_CHANNELS SNDCTL_DSP_STEREO + #endif + diff --git a/sysutils/gtoaster/files/patch-configure b/sysutils/gtoaster/files/patch-configure new file mode 100644 index 000000000000..f5ac170d0b79 --- /dev/null +++ b/sysutils/gtoaster/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Sun Sep 7 22:33:01 2003 ++++ configure Sun Sep 7 22:35:58 2003 +@@ -4696,7 +4696,7 @@ + + + USEOSS=no +-if test -e /usr/include/linux/soundcard.h; ++if test -e /usr/include/sys/soundcard.h; + then + USEOSS=yes + echo "*** open sound system header file detected ***" |