Convert to use pilot-link-libs' buildlink.mk files and mark as

USE_BUILDLINK_ONLY.
This commit is contained in:
jlam 2001-06-27 18:07:53 +00:00
parent 8698af9367
commit 2d07461529
7 changed files with 21 additions and 21 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2001/06/27 14:43:06 jlam Exp $ # $NetBSD: Makefile,v 1.3 2001/06/27 18:07:54 jlam Exp $
DISTNAME= jpilot-0.99 DISTNAME= jpilot-0.99
PKGNAME= jpilot-expense-0.99 PKGNAME= jpilot-expense-0.99
@ -30,5 +30,5 @@ post-extract:
${LN} -sf ${LIBTOOL} ${WRKSRC}/../libtool ${LN} -sf ${LIBTOOL} ${WRKSRC}/../libtool
.include "../../comms/jpilot/buildlink.mk" .include "../../comms/jpilot/buildlink.mk"
.include "../../comms/pilot-link/buildlink.mk" .include "../../comms/pilot-link-lib/buildlink.mk"
.include "../../mk/bsd.pkg.mk" .include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2001/06/22 06:20:28 jlam Exp $ # $NetBSD: Makefile,v 1.6 2001/06/27 18:07:54 jlam Exp $
DISTNAME= jpilot-syncmal_0.60 DISTNAME= jpilot-syncmal_0.60
PKGNAME= jpilot-syncmal-0.60 PKGNAME= jpilot-syncmal-0.60
@ -36,5 +36,5 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/.libs/libsyncmal.so ${PLUGINSDIR} ${INSTALL_DATA} ${WRKSRC}/.libs/libsyncmal.so ${PLUGINSDIR}
.include "../../comms/jpilot/buildlink.mk" .include "../../comms/jpilot/buildlink.mk"
.include "../../comms/pilot-link/buildlink.mk" .include "../../comms/pilot-link-libs/buildlink.mk"
.include "../../mk/bsd.pkg.mk" .include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2001/06/22 06:12:01 jlam Exp $ # $NetBSD: Makefile,v 1.3 2001/06/27 18:07:54 jlam Exp $
DISTNAME= jpilot-0.99 DISTNAME= jpilot-0.99
PKGNAME= jpilot-synctime-0.99 PKGNAME= jpilot-synctime-0.99
@ -30,5 +30,5 @@ post-extract:
${LN} -sf ${LIBTOOL} ${WRKSRC}/../libtool ${LN} -sf ${LIBTOOL} ${WRKSRC}/../libtool
.include "../../comms/jpilot/buildlink.mk" .include "../../comms/jpilot/buildlink.mk"
.include "../../comms/pilot-link/buildlink.mk" .include "../../comms/pilot-link-libs/buildlink.mk"
.include "../../mk/bsd.pkg.mk" .include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.17 2001/06/22 05:59:58 jlam Exp $ # $NetBSD: Makefile,v 1.18 2001/06/27 18:07:53 jlam Exp $
# #
DISTNAME= jpilot-0.99 DISTNAME= jpilot-0.99
@ -45,7 +45,7 @@ post-install:
cd ${WRKSRC}/docs; ${INSTALL_MAN} *.1 ${MAN1DIR} cd ${WRKSRC}/docs; ${INSTALL_MAN} *.1 ${MAN1DIR}
${TOUCH} ${PLUGINSDIR}/.directory ${TOUCH} ${PLUGINSDIR}/.directory
.include "../../comms/pilot-link/buildlink.mk" .include "../../comms/pilot-link-libs/buildlink.mk"
.include "../../devel/gettext-lib/buildlink.mk" .include "../../devel/gettext-lib/buildlink.mk"
.include "../../x11/gtk/buildlink.mk" .include "../../x11/gtk/buildlink.mk"
.include "../../mk/bsd.pkg.mk" .include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2001/02/16 13:56:17 wiz Exp $ # $NetBSD: Makefile,v 1.4 2001/06/27 18:07:55 jlam Exp $
# #
DISTNAME= ${PKGNAME:S/-/_/}.src DISTNAME= ${PKGNAME:S/-/_/}.src
@ -11,10 +11,8 @@ MAINTAINER= rh@netbsd.org
HOMEPAGE= http://www.tomw.org/malsync/ HOMEPAGE= http://www.tomw.org/malsync/
COMMENT= utility to synchronize Palm Pilots to the AvantGo.com service COMMENT= utility to synchronize Palm Pilots to the AvantGo.com service
DEPENDS+= pilot-link>=0.9.3:../../comms/pilot-link USE_BUILDLINK_ONLY= YES
USE_GMAKE= YES
NO_CONFIGURE= YES
USE_GMAKE= YES
do-install: do-install:
${INSTALL_PROGRAM} ${WRKSRC}/malsync ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/malsync ${PREFIX}/bin
@ -23,4 +21,5 @@ do-install:
${INSTALL_DATA} ${FILESDIR}/${doc} ${PREFIX}/share/doc/malsync ${INSTALL_DATA} ${FILESDIR}/${doc} ${PREFIX}/share/doc/malsync
.endfor .endfor
.include "../../comms/pilot-link-libs/buildlink.mk"
.include "../../mk/bsd.pkg.mk" .include "../../mk/bsd.pkg.mk"

View file

@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.2 2001/04/20 09:04:22 agc Exp $ $NetBSD: distinfo,v 1.3 2001/06/27 18:07:55 jlam Exp $
SHA1 (malsync_2.0.5.src.tar.gz) = 47e0097f051b1ffb0be67cd092657ff9d80ade3c SHA1 (malsync_2.0.5.src.tar.gz) = 47e0097f051b1ffb0be67cd092657ff9d80ade3c
Size (malsync_2.0.5.src.tar.gz) = 178522 bytes Size (malsync_2.0.5.src.tar.gz) = 178522 bytes
SHA1 (patch-aa) = 3adfed58edf49c14db1ed3ba5415359ed7ca0ea4 SHA1 (patch-aa) = 55c856379af88b90e098b2cfb1457c98bc79f415
SHA1 (patch-ab) = dc5247e4b4a8df76b4d19c4b298bbb7c50e1fc3a SHA1 (patch-ab) = dc5247e4b4a8df76b4d19c4b298bbb7c50e1fc3a

View file

@ -1,7 +1,7 @@
$NetBSD: patch-aa,v 1.1.1.1 2000/06/15 14:04:47 rh Exp $ $NetBSD: patch-aa,v 1.2 2001/06/27 18:07:55 jlam Exp $
--- Makefile.orig Sun May 14 23:17:35 2000 --- Makefile.orig Sun May 14 17:17:35 2000
+++ Makefile Thu Jun 15 15:54:24 2000 +++ Makefile
@@ -1,4 +1,3 @@ @@ -1,4 +1,3 @@
-CC = gcc -CC = gcc
TARGET = malsync TARGET = malsync
@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/06/15 14:04:47 rh Exp $
TREETOP = ../../.. TREETOP = ../../..
-PILOT_LINK_DIR = $(TREETOP)/vendor/pilot/pilot-link.0.9.3 -PILOT_LINK_DIR = $(TREETOP)/vendor/pilot/pilot-link.0.9.3
+PILOT_LINK_DIR = ${PREFIX} +PILOT_LINK_DIR = ${BUILDLINK_DIR}
-CFLAGS = -Wall -g -DMALSYNC -I$(TREETOP)/mal/common \ -CFLAGS = -Wall -g -DMALSYNC -I$(TREETOP)/mal/common \
+CFLAGS+=-DMALSYNC -D__unix__ -I$(TREETOP)/mal/common \ +CFLAGS+=-DMALSYNC -D__unix__ -I$(TREETOP)/mal/common \
@ -27,9 +27,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/06/15 14:04:47 rh Exp $
+ +
$(TARGET): $(OBJS) $(TARGET): $(OBJS)
$(CC) -rdynamic $(CFLAGS) -o $@ $(OBJS) \ - $(CC) -rdynamic $(CFLAGS) -o $@ $(OBJS) \
- -L${PILOT_LINK_DIR}/libsock -lpisock $(LINKLIBS) - -L${PILOT_LINK_DIR}/libsock -lpisock $(LINKLIBS)
+ -L${PILOT_LINK_DIR}/lib -Wl,-R${PILOT_LINK_DIR}/lib -lpisock $(LINKLIBS) + $(CC) -rdynamic $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) \
+ -L${PILOT_LINK_DIR}/lib -lpisock $(LINKLIBS)
clean: clean:
rm -f $(OBJS) $(TARGET) rm -f $(OBJS) $(TARGET)