diff options
| author | jlam <jlam> | 2002-08-25 18:38:05 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-08-25 18:38:05 +0000 |
| commit | f22b8c42a61ccfbb462bf2b94c3486b7baec18bd (patch) | |
| tree | d2b31bb9a6a069ebfb63079b9dddde1e6688bc4b /editors/sam | |
| parent | 71eaa77968f19e23d72fdc88e5f38259b8f7cdf3 (diff) | |
| download | pkgsrc-f22b8c42a61ccfbb462bf2b94c3486b7baec18bd.tar.gz | |
Merge changes in packages from the buildlink2 branch that have
buildlink2.mk files back into the main trunk. This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.
Diffstat (limited to 'editors/sam')
| -rw-r--r-- | editors/sam/Makefile | 5 | ||||
| -rw-r--r-- | editors/sam/buildlink2.mk | 23 |
2 files changed, 26 insertions, 2 deletions
diff --git a/editors/sam/Makefile b/editors/sam/Makefile index 86714f168ce..2e485d5c542 100644 --- a/editors/sam/Makefile +++ b/editors/sam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2001/11/29 01:12:32 hubertf Exp $ +# $NetBSD: Makefile,v 1.21 2002/08/25 18:38:52 jlam Exp $ # FreeBSD Id: Makefile,v 1.3 1996/11/12 02:19:40 obrien Exp # @@ -18,6 +18,7 @@ WRKSRC= ${WRKDIR} EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH} MANCOMPRESSED= yes +USE_BUILDLINK2= yes USE_X11BASE= yes MAKE_ENV+= X11PREFIX=${X11PREFIX} @@ -31,7 +32,7 @@ OTHER_X_LIBS= -lSM -lICE do-build: for d in libXg libframe sam samterm; do \ - (cd ${WRKSRC}/$$d; make -f Make.solaris \ + (cd ${WRKSRC}/$$d; ${MAKE_PROGRAM} -f Make.solaris \ OTHER_X_LIBS="${OTHER_X_LIBS}"); \ done .endif # SunOS diff --git a/editors/sam/buildlink2.mk b/editors/sam/buildlink2.mk new file mode 100644 index 00000000000..bc4f7ffb9d4 --- /dev/null +++ b/editors/sam/buildlink2.mk @@ -0,0 +1,23 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:53 jlam Exp $ + +.if !defined(SAM_BUILDLINK2_MK) +SAM_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= sam +BUILDLINK_DEPENDS.sam?= sam>=4.3nb1 +BUILDLINK_PKGSRCDIR.sam?= ../../editors/sam + +# This adds a build-dependency as sam only has static libraries. +BUILDLINK_DEPMETHOD.sam?= build + +EVAL_PREFIX+= BUILDLINK_PREFIX.sam=sam +BUILDLINK_PREFIX.sam_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.sam= include/sam/* +BUILDLINK_FILES.sam+= lib/libXg.a +BUILDLINK_FILES.sam+= lib/libframe.a + +BUILDLINK_TARGETS+= sam-buildlink + +sam-buildlink: _BUILDLINK_USE + +.endif # SAM_BUILDLINK2_MK |