Date: Tue, 6 May 2003 23:32:07 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/51867: Update port: multimedia/dv2jpg Message-ID: <20030506233207.2646ceb3.tkato@prontomail.com> Resent-Message-ID: <200305061440.h46EeJk4012049@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 51867
>Category: ports
>Synopsis: Update port: multimedia/dv2jpg
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue May 06 07:40:19 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.8-RELEASE i386
>Organization:
>Environment:
>Description:
- Support CC/CFLAGS properly
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/multimedia/dv2jpg/Makefile multimedia/dv2jpg/Makefile
--- /usr/ports/multimedia/dv2jpg/Makefile Mon Apr 21 12:24:54 2003
+++ multimedia/dv2jpg/Makefile Tue May 6 22:17:34 2003
@@ -7,6 +7,7 @@
PORTNAME= dv2jpg
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,10 +17,8 @@
LIB_DEPENDS= dv.3:${PORTSDIR}/multimedia/libdv
+USE_GNOME= gdkpixbuf
MAKEFILE= makefile
-USE_GNOME= glib12 gtk12 gdkpixbuf
-
-DOCS= README.avilib README.dv2jpg.html
post-extract:
${RM} ${WRKSRC}/avijoin ${WRKSRC}/dv2jpg ${WRKSRC}/*.o
@@ -28,8 +27,8 @@
${INSTALL_PROGRAM} ${WRKSRC}/avijoin ${PREFIX}/bin/
${INSTALL_PROGRAM} ${WRKSRC}/dv2jpg ${PREFIX}/bin/
.if !defined(NOPORTDOCS)
- ${INSTALL} -d -m 0755 ${DOCSDIR}
-.for f in ${DOCS}
+ @${MKDIR} ${DOCSDIR}
+.for f in README.avilib README.dv2jpg.html
${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
.endfor
.endif
diff -urN /usr/ports/multimedia/dv2jpg/files/patch-makefile multimedia/dv2jpg/files/patch-makefile
--- /usr/ports/multimedia/dv2jpg/files/patch-makefile Mon Feb 24 09:21:01 2003
+++ multimedia/dv2jpg/files/patch-makefile Tue May 6 22:18:23 2003
@@ -1,24 +1,36 @@
---- makefile.orig Sun Jun 24 04:04:47 2001
-+++ makefile Sun Feb 16 02:39:38 2003
+--- makefile.orig Sun Jun 24 11:04:47 2001
++++ makefile Tue May 6 22:16:26 2003
@@ -1,6 +1,6 @@
-INC=-I/opt/gdk-pixbuf/lib -I/usr/include -I/usr/include/libdv
-LIBS=-ljpeg -lm -lgdk_pixbuf /usr/lib/libdv.a
+INC=`${GDK_PIXBUF_CONFIG} --cflags` -I${PREFIX}/include/libdv
-+LIBS=-ljpeg -lm `${GDK_PIXBUF_CONFIG} --libs` -ldv
++LIBS=-ljpeg -lm -ldv `${GDK_PIXBUF_CONFIG} --libs` -L${LOCALBASE}/lib
# what type of video do you want?
VIDEO=NTSC
-@@ -9,10 +9,10 @@
+@@ -9,19 +9,19 @@
all: dv2jpg avijoin
dv2jpg: dv2jpg.o avilib.o dvavilib.o
- gcc -o dv2jpg dv2jpg.o avilib.o dvavilib.o $(LIBS) `glib-config --libs` `gtk-config --libs`
-+ ${CC} -o dv2jpg dv2jpg.o avilib.o dvavilib.o $(LIBS) `${GLIB_CONFIG} --libs` `${GTK_CONFIG} --libs`
++ $(CC) $(CFLAGS) -o dv2jpg dv2jpg.o avilib.o dvavilib.o $(LIBS) $(LDFLAGS)
dv2jpg.o: dv2jpg.c
- gcc -g $(INC) `glib-config --cflags` `gtk-config --cflags` -D$(VIDEO) -g -c dv2jpg.c
-+ ${CC} -g $(INC) `${GLIB_CONFIG} --cflags` `${GTK_CONFIG} --cflags` -D$(VIDEO) -g -c dv2jpg.c
++ $(CC) $(CFLAGS) $(INC) -D$(VIDEO) -c dv2jpg.c
avilib.o: avilib.c
- gcc -g -c avilib.c
+- gcc -g -c avilib.c
++ $(CC) $(CFLAGS) -c avilib.c
+
+ dvavilib.o: dvavilib.c
+- gcc -g -c dvavilib.c
++ $(CC) $(CFLAGS) -c dvavilib.c
+
+ clean:
+ /bin/rm -f *.o dv2jpg core avijoin
+
+ avijoin: avijoin.c avilib.o
+- gcc -g -o avijoin avijoin.c avilib.o
++ $(CC) $(CFLAGS) -o avijoin avijoin.c avilib.o $(LDFLAGS)
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030506233207.2646ceb3.tkato>