Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY.

3 files changed, 25 insertions, 18 deletions

diff --git a/graphics/tcm/Makefile b/graphics/tcm/Makefile
index e15c6502cd6..4752b8aaa45 100644
--- a/graphics/tcm/Makefile
+++ b/graphics/tcm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/05/10 23:35:27 jtb Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/12 07:36:31 jlam Exp $
 
 DISTNAME=		tcm-2.01.src
 PKGNAME=		tcm-2.01
@@ -11,10 +11,11 @@ COMMENT=		TCM - Toolkit for Conceptual Modeling
 
 WRKSRC=			${WRKDIR}/tcm-2.01/src
 
-USE_X11=		yes
-USE_X11BASE=		yes
-USE_MOTIF=		yes
+USE_BUILDLINK_ONLY=	YES
 
+# These two variables denote where the installed location of the libraries
+# are located.
+#
 MAKE_ENV+=		XWIN_HOME=${X11BASE}
 MAKE_ENV+=		MOTIF_HOME=${MOTIFBASE}
 
@@ -32,9 +33,9 @@ do-configure:
 	${RM} -f ${WRKSRC}/Makefile
 	${LN} -fs ${WRKSRC}/Makefile.gcc ${WRKSRC}/Makefile
 	${MV} -f ${WRKSRC}/gl/system.c ${WRKSRC}/gl/system.c.dist
-	${SED} -e 's:@PREFIX@:${PREFIX}:g'				\
-		-e 's:@X11BASE@:${X11BASE}:g'				\
-		-e 's:@LOCALBASE@:${LOCALBASE}':g			\
+	${SED}	-e "s|@PREFIX@|${PREFIX}|g"				\
+		-e "s|@X11BASE@|${X11BASE}|g"				\
+		-e "s|@LOCALBASE@|${LOCALBASE}|g"			\
 	${WRKSRC}/gl/system.c.dist > ${WRKSRC}/gl/system.c
 	for f in `${FIND} ${WRKSRC} -name \*.c`; do			\
 		${MV} -f $$f $$f`${ECHO} c`;				\
@@ -83,4 +84,10 @@ 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/bsd.pkg.mk"
+
+.if defined(MOTIF_TYPE) && (${MOTIF_TYPE} == "lesstif")
+CPPFLAGS+=	-DLESSTIF
+.endif
diff --git a/graphics/tcm/distinfo b/graphics/tcm/distinfo
index a2f23dfbc5f..16bd18f4f61 100644
--- a/graphics/tcm/distinfo
+++ b/graphics/tcm/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/05/10 23:35:27 jtb Exp $
+$NetBSD: distinfo,v 1.4 2001/09/12 07:36:31 jlam Exp $
 
 SHA1 (tcm-2.01.src.tar.gz) = ce63d4310f43c89984cfcf2fc3da38eb55907c0f
 Size (tcm-2.01.src.tar.gz) = 3624778 bytes
-SHA1 (patch-aa) = 37673406cf7b87628a29c55f8d66eca58df536e7
+SHA1 (patch-aa) = a277e911c87e91af46d7f666507ae307b2e0aaeb
 SHA1 (patch-ab) = 68d58e4fcba032a3385c181878fab6452527a13a
 SHA1 (patch-ac) = 1a85d3b44dbbf9291bec2f1a915ae23eec9818b3
 SHA1 (patch-ad) = e2b6b15d6265bf0077cebce9d25623ae06ef16e2
@@ -13,9 +13,9 @@ SHA1 (patch-ah) = 095886753437f5b0c2d65333d846635abdddd81c
 SHA1 (patch-ai) = 5ac6114b5a2b1f72e7c03bc6ec722a1626e4a3ec
 SHA1 (patch-aj) = d8c2af60833f0316f37130b2e83be26efe3b6e86
 SHA1 (patch-ak) = a5258112b0635f410265911017909dc089670cc1
-SHA1 (patch-al) = 960f194ad17b38de64dd2737e43e4af7c6d6d979
+SHA1 (patch-al) = db5a5f564c42396bdaab423b8e94905550b36dfb
 SHA1 (patch-am) = 7aa052825735b055f622c3917e14529ef5d808a5
-SHA1 (patch-an) = 49c046db0c5119685844bd4d54fb90ea52a2fae8
+SHA1 (patch-an) = bf4ca485a46805b90a1c7c060764d83d79a71c92
 SHA1 (patch-ao) = 3581a8395b2ad1a861781f12f1a2fe05b3970cf4
 SHA1 (patch-ap) = 8470d73a87c586989dedd9391ba511f3d4941dce
 SHA1 (patch-aq) = ed86083b7e02a235c84ffab3acbaffa8146f0945
diff --git a/graphics/tcm/patches/patch-aa b/graphics/tcm/patches/patch-aa
index 6305a1ceb7b..30ff07503e5 100644
--- a/graphics/tcm/patches/patch-aa
+++ b/graphics/tcm/patches/patch-aa
@@ -1,25 +1,25 @@
-$NetBSD: patch-aa,v 1.2 2001/05/10 23:35:27 jtb Exp $
+$NetBSD: patch-aa,v 1.3 2001/09/12 07:36:31 jlam Exp $
 
 --- /dev/null	Thu May 10 23:00:48 2001
 +++ Config.tmpl_netbsd
 @@ -0,0 +1,41 @@
-+# Configuration file for NetBSD and LessTif.
++# Configuration file for NetBSD and OpenMotif/LessTif.
 +
-+SYSFLAGS        = -DBSD -DLESSTIF
++SYSFLAGS        = -DBSD
 +
 +SRC_DIR         = $(TCM_HOME)/src
 +BIN_DIR         = $(TCM_HOME)/bin
 +LIB_DIR         = $(TCM_HOME)/lib
 +
-+MOTIF_INCLUDE	= $(MOTIF_HOME)/include
++MOTIF_INCLUDE	= $(BUILDLINK_DIR)/include
 +MOTIF_LIB	= $(MOTIF_HOME)/lib
 +
-+XWIN_INCLUDE	= $(XWIN_HOME)/include
++XWIN_INCLUDE	= $(BUILDLINK_X11_DIR)/include
 +XWIN_LIB	= $(XWIN_HOME)/lib
 +
-+LDFLAGS         += -Wl,-R$(LIB_DIR) -L$(LIB_DIR) -R$(MOTIF_LIB) -L$(MOTIF_LIB) -R$(XWIN_LIB) -L$(XWIN_LIB)
++LDFLAGS         += -L$(LIB_DIR) -R$(MOTIF_LIB) -L${BUILDLINK_DIR}/lib -R$(XWIN_LIB) -L${BUILDLINK_X11_DIR}/lib
 +
-+LDLIBS += -lXm -lXt -lSM -lICE -lXext -lX11 -lm
++LDLIBS += ${MOTIFLIB} -lXt -lSM -lICE -lXext -lX11 -lm
 +
 +STRIP		?= /usr/bin/true
 +MV		?= /bin/mv