kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Support CC/CFLAGS properly

Browse source 
PR:		51867
Submitted by:	Ports Fury
This commit is contained in:
Ying-Chieh Liao 2003-05-12 07:51:47 +00:00
parent cc9ffa4ea8
commit 751eb9884c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=80787
2 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
multimedia/dv2jpg/Makefile
View file

@ -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 @@ COMMENT= Convert Type-2 DV codec-encoded AVI streams to mjpeg-encoded AVI
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 @@ do-install:
${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

26
multimedia/dv2jpg/files/patch-makefile
View file

@ -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)