diff options
| author | salo <salo@pkgsrc.org> | 2003-01-19 10:59:00 +0000 |
|---|---|---|
| committer | salo <salo@pkgsrc.org> | 2003-01-19 10:59:00 +0000 |
| commit | 8ae430e40c6c282fe2f79b65da2b2c07c6cf1223 (patch) | |
| tree | 8ee83c153f9e5f2f05883084b6a1cc72cb9958bc /x11 | |
| parent | a73b6c86a43c7cd213977445d501d4fd65b71272 (diff) | |
| download | pkgsrc-8ae430e40c6c282fe2f79b65da2b2c07c6cf1223.tar.gz | |
s/INSTALL_*/BSD_INSTALL_*/ in patch-aa, remove unnecessary MAKE_ENV.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/lablgtk/Makefile | 7 | ||||
| -rw-r--r-- | x11/lablgtk/distinfo | 4 | ||||
| -rw-r--r-- | x11/lablgtk/patches/patch-aa | 20 |
3 files changed, 13 insertions, 18 deletions
diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile index bce5ef593dc..eb2640ab493 100644 --- a/x11/lablgtk/Makefile +++ b/x11/lablgtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/10/16 17:24:45 dillo Exp $ +# $NetBSD: Makefile,v 1.3 2003/01/19 10:59:00 salo Exp $ # DISTNAME= lablgtk-1.2.5 @@ -12,11 +12,6 @@ COMMENT= GTK+ bindings for ocaml USE_BUILDLINK2= YES USE_GMAKE= YES -MAKE_ENV+= INSTALL_DATA_DIR="${INSTALL_DATA_DIR}" -MAKE_ENV+= INSTALL_DATA="${INSTALL_DATA}" -MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" -MAKE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" - do-configure: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \ configure USE_DOTOPT=1 USE_CC=1 CC=${CC} diff --git a/x11/lablgtk/distinfo b/x11/lablgtk/distinfo index e4c2c66fcde..75e411b50f7 100644 --- a/x11/lablgtk/distinfo +++ b/x11/lablgtk/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/10/16 16:40:25 dillo Exp $ +$NetBSD: distinfo,v 1.2 2003/01/19 10:59:01 salo Exp $ SHA1 (lablgtk-1.2.5.tar.gz) = 3ae950864d2772c60cc1d4962e52cb22c2abac97 Size (lablgtk-1.2.5.tar.gz) = 463565 bytes -SHA1 (patch-aa) = e44b58cd1993583ac2857353b0f26e8764023120 +SHA1 (patch-aa) = 50a1780cd9f40ff552715c13e49a876d1adb4b5f diff --git a/x11/lablgtk/patches/patch-aa b/x11/lablgtk/patches/patch-aa index 8a17fce1aa0..64ba20ff9b8 100644 --- a/x11/lablgtk/patches/patch-aa +++ b/x11/lablgtk/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/10/16 16:40:26 dillo Exp $ +$NetBSD: patch-aa,v 1.2 2003/01/19 10:59:02 salo Exp $ --- src/Makefile.orig Fri Aug 9 02:27:19 2002 +++ src/Makefile @@ -16,27 +16,27 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/10/16 16:40:26 dillo Exp $ - cp lablgtktop varcc $(INSTALLDIR) - if test -f lablgtktop_t; then cp lablgtktop_t $(INSTALLDIR); fi - cp -p *.h $(INSTALLDIR) -+ if test -d $(INSTALLDIR); then : ; else ${INSTALL_DATA_DIR} ${INSTALLDIR}; fi ++ if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} ${INSTALLDIR}; fi + for F in $(ALLOBJS:.cmo=.cmi) $(THOBJS:.cmo=.cmi) *.mli \ + $(ALLOBJS:.cmo=.ml) $(ALLTHOBJS:.cmo=.ml) \ + $(MLLIBS) $(THOBJS) $(INITOBJS) $(THINITOBJS) $(CLIBS) *.h; \ + do \ -+ ${INSTALL_DATA} $$F ${INSTALLDIR}; \ ++ ${BSD_INSTALL_DATA} $$F ${INSTALLDIR}; \ + done -+ ${INSTALL_PROGRAM} lablgtktop $(INSTALLDIR) -+ ${INSTALL_SCRIPT} varcc $(INSTALLDIR) -+ if test -f lablgtktop_t; then ${INSTALL_PROGRAM} lablgtktop_t $(INSTALLDIR); fi ++ ${BSD_INSTALL_PROGRAM} lablgtktop $(INSTALLDIR) ++ ${BSD_INSTALL_SCRIPT} varcc $(INSTALLDIR) ++ if test -f lablgtktop_t; then ${BSD_INSTALL_PROGRAM} lablgtktop_t $(INSTALLDIR); fi if test -f lablgtk.cmxa; then $(MAKE) installopt; fi if test -f dlllablgtk.so; then \ - cp $(CLIBS:lib%.a=dll%.so) $(DLLDIR) || \ - echo "Couldn't install dlls in default location"; \ + for F in $(CLIBS:lib%.a=dll%.so); \ + do \ -+ ${INSTALL_DATA} $$F $(DLLDIR); \ ++ ${BSD_INSTALL_DATA} $$F $(DLLDIR); \ + done; \ fi - cp lablgtk $(BINDIR) -+ ${INSTALL_SCRIPT} lablgtk $(BINDIR) ++ ${BSD_INSTALL_SCRIPT} lablgtk $(BINDIR) if test -f lablgladecc; then cp lablgladecc $(BINDIR); fi installopt: @@ -47,13 +47,13 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/10/16 16:40:26 dillo Exp $ + for F in $(MLLIBS:.cma=.cmxa) $(MLLIBS:.cma=.a) \ + $(ALLOBJS:.cmo=.cmx) $(INITOBJS:.cmo=.o); \ + do \ -+ ${INSTALL_DATA} $$F $(INSTALLDIR); \ ++ ${BSD_INSTALL_DATA} $$F $(INSTALLDIR); \ + done if test -f gtkThread.cmx; then \ - cp $(THOBJS:.cmo=.cmx) $(THOBJS:.cmo=.o) $(INSTALLDIR); fi + for F in $(THOBJS:.cmo=.cmx) $(THOBJS:.cmo=.o); \ + do \ -+ ${INSTALL_DATA} $$F $(INSTALLDIR); \ ++ ${BSD_INSTALL_DATA} $$F $(INSTALLDIR); \ + done; \ + fi |