summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordillo <dillo@pkgsrc.org>2002-02-12 23:26:28 +0000
committerdillo <dillo@pkgsrc.org>2002-02-12 23:26:28 +0000
commitcedc5247b63161ac7d59de3decd4d0e0bdedcbe6 (patch)
treeb6e406d25da78f810a1713fbafa557fed04aa559
parentf55362ead85ca4352d054fbcc96a0732436350f2 (diff)
downloadpkgsrc-cedc5247b63161ac7d59de3decd4d0e0bdedcbe6.tar.gz
buildlinkify
-rw-r--r--graphics/mpeg_encode/Makefile5
-rw-r--r--graphics/mpeg_encode/distinfo4
-rw-r--r--graphics/mpeg_encode/patches/patch-aa24
3 files changed, 26 insertions, 7 deletions
diff --git a/graphics/mpeg_encode/Makefile b/graphics/mpeg_encode/Makefile
index dcee656676a..3f24738f4b8 100644
--- a/graphics/mpeg_encode/Makefile
+++ b/graphics/mpeg_encode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/29 01:12:36 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2002/02/12 23:26:28 dillo Exp $
#
DISTNAME= mpeg_encode-1.5b-src
@@ -11,7 +11,7 @@ MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://bmrc.berkeley.edu/frame/research/mpeg/mpeg_encode.html
COMMENT= The Parallel Berkeley MPEG Encoder
-DEPENDS+= jpeg-6*:../../graphics/jpeg
+USE_BUILDLINK_ONLY= YES
WRKSRC= ${WRKDIR}/mpeg_encode
@@ -34,4 +34,5 @@ do-install:
done
${INSTALL_MAN} ${WRKSRC}/docs/mpeg_encode.1 ${LOCALBASE}/man/man1
+.include "../../graphics/jpeg/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/mpeg_encode/distinfo b/graphics/mpeg_encode/distinfo
index cd48d6ccf90..15138ef6dd4 100644
--- a/graphics/mpeg_encode/distinfo
+++ b/graphics/mpeg_encode/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/09/22 17:48:27 hubertf Exp $
+$NetBSD: distinfo,v 1.3 2002/02/12 23:26:28 dillo Exp $
SHA1 (mpeg_encode-1.5b-src.tar.gz) = 853cd175f73b8064ce28deb256e4b81159a684ed
Size (mpeg_encode-1.5b-src.tar.gz) = 2028724 bytes
-SHA1 (patch-aa) = 1d233d6c578217d05f31f8a0264f9101b307f5ae
+SHA1 (patch-aa) = 04221eb3d4cf85b206d27a2f425719ed7c4a5ec1
SHA1 (patch-ab) = f2cdf02d49b726b4fb7fb210074e7ba53b9b380b
SHA1 (patch-ac) = 8f89257bd93584cd028b659bb8c3379d713339da
SHA1 (patch-ad) = 670a244680d09cb9f558a8777ec8f189145342f8
diff --git a/graphics/mpeg_encode/patches/patch-aa b/graphics/mpeg_encode/patches/patch-aa
index 5227b1878a5..cf697ab7c67 100644
--- a/graphics/mpeg_encode/patches/patch-aa
+++ b/graphics/mpeg_encode/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/05/14 23:06:03 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2002/02/12 23:26:29 dillo Exp $
--- Makefile.orig Thu Aug 17 00:16:56 1995
+++ Makefile
@@ -10,8 +10,26 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/05/14 23:06:03 hubertf Exp $
-JPEG_DIR = -Ijpeg
-JPEG_LIB_DIR = -Ljpeg
+JPEG_LIB = -ljpeg
-+JPEG_DIR = -I${LOCALBASE}/include
-+JPEG_LIB_DIR = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib
++JPEG_DIR =
++JPEG_LIB_DIR =
MP_JPEG_OBJS = jpeg.o
MP_JPEG_SRCS = jpeg.c
+@@ -57,7 +57,7 @@
+ #################
+ # INCLUDE FILES #
+ #################
+-INCLUDEDIR = -Iheaders -I/usr/include $(JPEG_DIR)
++INCLUDEDIR = -Iheaders $(JPEG_DIR)
+
+ ############################################################################
+ # LIBRARIES # specify library directories; need jpg lib and maybe pbm #
+@@ -203,7 +203,7 @@
+ ############
+
+ mpeg_encode: $(MP_ALL_OBJS) $(JPEG_LIB)
+- $(PURIFY) $(CC) $(CFLAGS) -o $@ $(MP_ALL_OBJS) $(LIBDIRS) $(LIBS)
++ $(PURIFY) $(CC) $(LDFLAGS) -o $@ $(MP_ALL_OBJS) $(LIBDIRS) $(LIBS)
+ strip mpeg_encode
+
+ profile: $(MP_ALL_OBJS)