Index: Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/goggles/Makefile,v retrieving revision 1.9 diff -a -u -r1.9 Makefile --- Makefile 18 Dec 2003 23:28:30 -0000 1.9 +++ Makefile 1 Feb 2004 23:31:57 -0000 @@ -6,8 +6,7 @@ # PORTNAME= Goggles -PORTVERSION= 0.5.6 -PORTREVISION= 1 +PORTVERSION= 0.7.2 CATEGORIES= multimedia MASTER_SITES= http://www.fifthplanet.net/files/ @@ -27,11 +26,11 @@ --with-fox=${LOCALBASE} \ --x-includes=${X11BASE}/include \ --x-libraries=${X11BASE}/lib -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +WRKSRC= ${WRKDIR}/${PORTNAME:S/G/g/}-${PORTVERSION} pre-everything:: .ifndef(WITH_DVD_DEVICE) - @${ECHO_MSG} '===> The default DVD device is /dev/acd0c' + @${ECHO_MSG} '===> The default DVD device is ${DEFAULT_DVD_DEVICE}' @${ECHO_MSG} "===> You can choose any DVD device at Ogle's command line" @${ECHO_MSG} '===> Define WITH_DVD_DEVICE if you want to change the default' @${ECHO_MSG} "===> For example, 'make WITH_DVD_DEVICE=\"/dev/somedevice\"'" @@ -42,20 +41,17 @@ .ifdef(WITH_DVD_DEVICE) DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE} .else +.if ${OSVERSION} < 500000 DEFAULT_DVD_DEVICE=/dev/acd0c +.else +DEFAULT_DVD_DEVICE=/dev/acd0 +.endif .endif post-patch: # point to specific device @${REINPLACE_CMD} -E -e \ - 's|\"/dev/dvd\"|\"${DEFAULT_DVD_DEVICE}\"|' \ - ${WRKSRC}/src/dvdwindow.cpp -# hack to enable correct CPPFLAGS - @${REINPLACE_CMD} -E -e \ - 's|@CPPFLAGS@|${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}|' \ - ${WRKSRC}/src/Makefile.in - @${REINPLACE_CMD} -e 's|-lFOX|-lFOX-1.1|g' ${WRKSRC}/configure - @${FIND} ${WRKSRC} -name "*.cpp" -or -name "*.h" -or -name "configure" | ${XARGS} \ - ${REINPLACE_CMD} -e 's|include Index: distinfo =================================================================== RCS file: /home/pcvs/ports/multimedia/goggles/distinfo,v retrieving revision 1.5 diff -a -u -r1.5 distinfo --- distinfo 10 Nov 2003 01:21:20 -0000 1.5 +++ distinfo 1 Feb 2004 23:31:57 -0000 @@ -1 +1,2 @@ -MD5 (Goggles-0.5.6.tar.gz) = 3bb4b5cd2058ea381422c0a3af968f8f +MD5 (Goggles-0.7.2.tar.gz) = 38dc3a2080cb2b530a397560dcccdaaf +SIZE (Goggles-0.7.2.tar.gz) = 417094