diff options
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/tcm/Makefile | 7 | ||||
| -rw-r--r-- | graphics/tcm/distinfo | 4 | ||||
| -rw-r--r-- | graphics/tcm/patches/patch-aa | 8 | ||||
| -rw-r--r-- | graphics/xmbdfed/Makefile | 9 | ||||
| -rw-r--r-- | graphics/xzgv/Makefile | 7 | ||||
| -rw-r--r-- | graphics/xzgv/distinfo | 4 | ||||
| -rw-r--r-- | graphics/xzgv/patches/patch-ab | 33 |
7 files changed, 23 insertions, 49 deletions
diff --git a/graphics/tcm/Makefile b/graphics/tcm/Makefile index 690266fab61..2c3344214da 100644 --- a/graphics/tcm/Makefile +++ b/graphics/tcm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/04/17 02:54:00 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2002/09/23 01:26:25 jlam Exp $ DISTNAME= tcm-2.01.src PKGNAME= tcm-2.01 @@ -11,7 +11,7 @@ COMMENT= TCM - Toolkit for Conceptual Modeling WRKSRC= ${WRKDIR}/tcm-2.01/src -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES USE_X11BASE= YES # These two variables denote where the installed location of the libraries @@ -85,8 +85,7 @@ do-install: ${INSTALL_DATA} ${TCM_SRC}/doc/wishlist/* \ ${PREFIX}/share/doc/html/tcm/wishlist/ -.include "../../mk/motif.buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../mk/motif.buildlink2.mk" .include "../../mk/bsd.pkg.mk" .if defined(MOTIF_TYPE) && (${MOTIF_TYPE} == "lesstif") diff --git a/graphics/tcm/distinfo b/graphics/tcm/distinfo index 243309b2467..54d0fca1839 100644 --- a/graphics/tcm/distinfo +++ b/graphics/tcm/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2002/07/08 02:48:17 wiz Exp $ +$NetBSD: distinfo,v 1.7 2002/09/23 01:26:26 jlam Exp $ SHA1 (tcm-2.01.src.tar.gz) = ce63d4310f43c89984cfcf2fc3da38eb55907c0f Size (tcm-2.01.src.tar.gz) = 3624778 bytes -SHA1 (patch-aa) = a277e911c87e91af46d7f666507ae307b2e0aaeb +SHA1 (patch-aa) = d5d18f58ebc7a4d11839c38d47b1ace338cce592 SHA1 (patch-ab) = 68d58e4fcba032a3385c181878fab6452527a13a SHA1 (patch-ac) = 1a85d3b44dbbf9291bec2f1a915ae23eec9818b3 SHA1 (patch-ad) = 07a424b0da5f22bba82170847650b08c07625af9 diff --git a/graphics/tcm/patches/patch-aa b/graphics/tcm/patches/patch-aa index 30ff07503e5..9d1f7f273f4 100644 --- a/graphics/tcm/patches/patch-aa +++ b/graphics/tcm/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2001/09/12 07:36:31 jlam Exp $ +$NetBSD: patch-aa,v 1.4 2002/09/23 01:26:26 jlam Exp $ --- /dev/null Thu May 10 23:00:48 2001 +++ Config.tmpl_netbsd @@ -11,13 +11,13 @@ $NetBSD: patch-aa,v 1.3 2001/09/12 07:36:31 jlam Exp $ +BIN_DIR = $(TCM_HOME)/bin +LIB_DIR = $(TCM_HOME)/lib + -+MOTIF_INCLUDE = $(BUILDLINK_DIR)/include ++MOTIF_INCLUDE = $(MOTIF_HOME)/include +MOTIF_LIB = $(MOTIF_HOME)/lib + -+XWIN_INCLUDE = $(BUILDLINK_X11_DIR)/include ++XWIN_INCLUDE = $(XWIN_HOME)/include +XWIN_LIB = $(XWIN_HOME)/lib + -+LDFLAGS += -L$(LIB_DIR) -R$(MOTIF_LIB) -L${BUILDLINK_DIR}/lib -R$(XWIN_LIB) -L${BUILDLINK_X11_DIR}/lib ++LDFLAGS += -L$(LIB_DIR) -R$(MOTIF_LIB) -L$(MOTIF_LIB) -R$(XWIN_LIB) -L$(XWIN_LIB) + +LDLIBS += ${MOTIFLIB} -lXt -lSM -lICE -lXext -lX11 -lm + diff --git a/graphics/xmbdfed/Makefile b/graphics/xmbdfed/Makefile index 63bd4d3c5b1..a7cdad63a8e 100644 --- a/graphics/xmbdfed/Makefile +++ b/graphics/xmbdfed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/04/23 02:08:53 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2002/09/23 01:22:37 jlam Exp $ DISTNAME= xmbdfed-4.4 CATEGORIES= graphics x11 @@ -8,13 +8,14 @@ MAINTAINER= kei@netbsd.org HOMEPAGE= http://crl.nmsu.edu/~mleisher/xmbdfed.html COMMENT= Motif-based BDF font editor with lots of features +USE_BUILDLINK2= YES USE_X11BASE= YES do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xmbdfed ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/xmbdfed.man ${PREFIX}/man/man1/xmbdfed.1 -.include "../../graphics/freetype-lib/buildlink.mk" -.include "../../mk/motif.buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/freetype-lib/buildlink2.mk" +.include "../../mk/motif.buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile index 14c5001e7f5..0234a6a4974 100644 --- a/graphics/xzgv/Makefile +++ b/graphics/xzgv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2002/03/13 17:37:19 fredb Exp $ +# $NetBSD: Makefile,v 1.14 2002/09/23 01:29:05 jlam Exp $ DISTNAME= xzgv-0.7 PKGREVISION= 1 @@ -12,7 +12,7 @@ COMMENT= Image viewer INFO_FILES= xzgv -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes USE_X11BASE= yes USE_GMAKE= yes @@ -23,7 +23,6 @@ do-install: @for f in xzgv xzgv-1 xzgv-2 xzgv-3 ; do \ ${INSTALL_DATA} ${WRKSRC}/doc/$$f ${PREFIX}/info ; done -.include "../../graphics/imlib/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/imlib/buildlink2.mk" .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/xzgv/distinfo b/graphics/xzgv/distinfo index d39017550e2..eae7014d05c 100644 --- a/graphics/xzgv/distinfo +++ b/graphics/xzgv/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2001/08/23 15:56:41 jlam Exp $ +$NetBSD: distinfo,v 1.5 2002/09/23 01:29:05 jlam Exp $ SHA1 (xzgv-0.7.tar.gz) = e6677cc9f4a2266b06e9962edc2a08a5fdd3feb4 Size (xzgv-0.7.tar.gz) = 297485 bytes SHA1 (patch-aa) = 7a0d6e6b24d788fb9cf45967e4c3b434c621def3 -SHA1 (patch-ab) = 9ffbc3a9a3ccba62b0838966b36369ab56c33046 +SHA1 (patch-ab) = cf4c746e3c4b9ac3a5968211a8f2c0b69d43bc99 diff --git a/graphics/xzgv/patches/patch-ab b/graphics/xzgv/patches/patch-ab index 41cc7fa22a4..e95f75964b0 100644 --- a/graphics/xzgv/patches/patch-ab +++ b/graphics/xzgv/patches/patch-ab @@ -1,33 +1,8 @@ -$NetBSD: patch-ab,v 1.3 2001/08/23 15:56:41 jlam Exp $ +$NetBSD: patch-ab,v 1.4 2002/09/23 01:29:06 jlam Exp $ ---- src/Makefile.orig Tue Apr 10 08:37:01 2001 +--- src/Makefile.orig Tue Apr 10 05:37:01 2001 +++ src/Makefile -@@ -9,7 +9,7 @@ - # This gets definitions for CC, CFLAGS, BINDIR etc. - include ../config.mk - --CFLAGS+=-DBACKEND_$(BACKEND) `gtk-config --cflags` -+CFLAGS+=-DBACKEND_$(BACKEND) `${GTK_CONFIG} --cflags` - - # I could do this less horribly if I made it GNU-make-specific, - # but I decided not to. And here we are. :-( -@@ -18,19 +18,19 @@ - # `--libs' case. - # - BACKEND_CFLAGS=`case "$(BACKEND)" in \ -- IMLIB1) imlib-config --cflags-gdk ;; \ -- GDK_PIXBUF) gdk-pixbuf-config --cflags ;; \ -+ IMLIB1) ${IMLIB_CONFIG} --cflags-gdk ;; \ -+ GDK_PIXBUF) ${GDK_PIXBUF_CONFIG} --cflags ;; \ - esac` - BACKEND_LIBS=`case "$(BACKEND)" in \ -- IMLIB1) imlib-config --libs-gdk ;; \ -- GDK_PIXBUF) gdk-pixbuf-config --libs ;; \ -+ IMLIB1) ${IMLIB_CONFIG} --libs-gdk ;; \ -+ GDK_PIXBUF) ${GDK_PIXBUF_CONFIG} --libs ;; \ - esac` - - # `all' makes install-info too, as it's a bit weird to have something +@@ -30,7 +30,7 @@ BACKEND_LIBS=`case "$(BACKEND)" in \ # compile when you do `make install'. :-) # (It would also be weird to have it made by the `doc' Makefile, IMHO.) @@ -36,7 +11,7 @@ $NetBSD: patch-ab,v 1.3 2001/08/23 15:56:41 jlam Exp $ OBJS= main.o \ filedetails.o gotodir.o updatetn.o confirm.o help.o \ -@@ -43,7 +43,7 @@ +@@ -43,7 +43,7 @@ OBJS= main.o \ backend.o xzgv: $(OBJS) |