From 8ff4a66fab34a585da6ccb030b08f492377f644b Mon Sep 17 00:00:00 2001 From: joerg Date: Thu, 11 Feb 2010 20:20:38 +0000 Subject: DESTDIR support --- net/IglooFTP/Makefile | 6 +++++- net/IglooFTP/distinfo | 4 ++-- net/IglooFTP/patches/patch-aa | 18 ++++++++++-------- net/airportbasestationconfig/Makefile | 17 ++++++++--------- net/airportmodemutility/Makefile | 17 +++++++++-------- 5 files changed, 34 insertions(+), 28 deletions(-) (limited to 'net') diff --git a/net/IglooFTP/Makefile b/net/IglooFTP/Makefile index 72e5f133d24..71e88d2c4ea 100644 --- a/net/IglooFTP/Makefile +++ b/net/IglooFTP/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2007/12/02 11:25:23 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2010/02/11 20:22:22 joerg Exp $ DISTNAME= IglooFTP-0.6.1 PKGREVISION= 5 @@ -10,6 +10,8 @@ MAINTAINER= rxg@NetBSD.org HOMEPAGE= http://www.littleigloo.org/iglooftp.php3 COMMENT= Easy to use FTP client for X Window System +PKG_DESTDIR_SUPPORT= user-destdir + BUILD_DIRS= src post-extract: @@ -25,6 +27,8 @@ LDFLAGS.resolv= -lresolv MAKE_ENV+= LDFLAGS.resolv=${LDFLAGS.resolv:Q} +INSTALLATION_DIRS+= bin + .include "../../x11/gtk/buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/IglooFTP/distinfo b/net/IglooFTP/distinfo index 3b6ce138447..04187e4ac5c 100644 --- a/net/IglooFTP/distinfo +++ b/net/IglooFTP/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.10 2008/06/20 11:22:17 joerg Exp $ +$NetBSD: distinfo,v 1.11 2010/02/11 20:22:22 joerg Exp $ SHA1 (IglooFTP-0.6.1.src.tar.gz) = ab56bc6c15dc81525b8e987ae5fc15e562f92eed RMD160 (IglooFTP-0.6.1.src.tar.gz) = 7f0971ec857542d96a09dffc9db8a3544df38fae Size (IglooFTP-0.6.1.src.tar.gz) = 300553 bytes -SHA1 (patch-aa) = f65166073a34bd8bc65ea49f44b338ffa83ee072 +SHA1 (patch-aa) = 7e9bfe486aa70a58354efa0570ba67fa55bf8618 SHA1 (patch-ab) = 95acf4685cf1da0ce04afc86f92ce201b24324e5 SHA1 (patch-ac) = 4ab6aaf9e8bd4765a3d64a83ce6b84e661433749 SHA1 (patch-ad) = 9e2fbcc3ece0782d32b8bf661dd81e513822852e diff --git a/net/IglooFTP/patches/patch-aa b/net/IglooFTP/patches/patch-aa index 55f1a9636c6..464c822ed67 100644 --- a/net/IglooFTP/patches/patch-aa +++ b/net/IglooFTP/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.4 2007/02/20 12:45:06 joerg Exp $ +$NetBSD: patch-aa,v 1.5 2010/02/11 20:22:22 joerg Exp $ --- src/Makefile.orig 1999-04-15 16:05:15.000000000 +0000 +++ src/Makefile -@@ -1,14 +1,13 @@ +@@ -1,21 +1,21 @@ SHELL=/bin/sh -CC = gcc -C_FLAGS = -Wall -g -O2 -m486 -fno-strength-reduce @@ -16,11 +16,13 @@ $NetBSD: patch-aa,v 1.4 2007/02/20 12:45:06 joerg Exp $ VERSION = 0.6.1 VERSION_DATE = 1999 -DESTDIR = /usr/local -+DESTDIR = $(PREFIX) - BIN_PATH = $(DESTDIR)/bin - MAN_PATH = $(DESTDIR)/man - SHARE_PATH = $(DESTDIR)/share/$(PROGNAME) -@@ -16,6 +15,8 @@ RPM_RELEASE = 1 +-BIN_PATH = $(DESTDIR)/bin +-MAN_PATH = $(DESTDIR)/man +-SHARE_PATH = $(DESTDIR)/share/$(PROGNAME) ++BIN_PATH = $(DESTDIR)${PREFIX}/bin ++MAN_PATH = $(DESTDIR)${PREFIX}/${PKGMANDIR} ++SHARE_PATH = $(DESTDIR)${PREFIX}/share/$(PROGNAME) + RPM_RELEASE = 1 RPM_BUILDPATH = /usr/src/redhat CODE_LINES = `cat *.c *.h | grep -ch -e "[[:alpha:]|[:punct:]]"` @@ -29,7 +31,7 @@ $NetBSD: patch-aa,v 1.4 2007/02/20 12:45:06 joerg Exp $ $(PROGNAME): main.o GTKmisc.o menu.o toolbar.o connectbar.o statusbar.o\ dirlist.o ftplist.o queue.o log.o console.o dialog.o chmod.o\ version.o custom.o string.o pixmaps.o color.o cursor.o\ -@@ -30,34 +31,34 @@ $(PROGNAME): main.o GTKmisc.o menu.o too +@@ -30,34 +30,34 @@ $(PROGNAME): main.o GTKmisc.o menu.o too install : @if ! test -e $(SHARE_PATH); then \ diff --git a/net/airportbasestationconfig/Makefile b/net/airportbasestationconfig/Makefile index 1ae7dbab111..b0e38700a12 100644 --- a/net/airportbasestationconfig/Makefile +++ b/net/airportbasestationconfig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2008/05/25 14:45:17 tron Exp $ +# $NetBSD: Makefile,v 1.35 2010/02/11 20:21:50 joerg Exp $ DISTNAME= configurator_152-128 PKGNAME= ${BINNAME}-1.5.2 @@ -23,7 +23,7 @@ LIBDIR= ${PREFIX}/lib/${BINNAME} USE_JAVA= run PKG_JVMS_ACCEPTED= sun-jdk13 sun-jdk14 sun-jdk15 blackdown-jdk13 jdk14 -INSTALLATION_DIRS= bin +INSTALLATION_DIRS= bin ${DOCDIR} ${LIBDIR} post-extract: ${CHMOD} -R g-w,o-w ${WRKSRC}/* @@ -38,15 +38,14 @@ do-build: ${ECHO} "exec java -jar ${LIBDIR}/${JARNAME}" >>${WRKSRC}/${BINNAME} do-install: - ${INSTALL_DATA_DIR} ${DOCDIR} ${LIBDIR} cd ${WRKSRC} && \ - ${INSTALL_SCRIPT} ${BINNAME} ${PREFIX}/bin && \ - ${INSTALL_DATA} ${JARNAME} ${LIBDIR} && \ - ${INSTALL_DATA} AUTHORS ${DOCDIR} && \ - ${INSTALL_DATA} COPYING ${DOCDIR} && \ + ${INSTALL_SCRIPT} ${BINNAME} ${DESTDIR}${PREFIX}/bin && \ + ${INSTALL_DATA} ${JARNAME} ${DESTDIR}${LIBDIR} && \ + ${INSTALL_DATA} AUTHORS ${DESTDIR}${DOCDIR} && \ + ${INSTALL_DATA} COPYING ${DESTDIR}${DOCDIR} && \ cd helpdocs && \ - ${INSTALL_DATA} ReadMe.txt ${DOCDIR}/README && \ - ${INSTALL_DATA} mainscreen.jpg manual.html ${DOCDIR} + ${INSTALL_DATA} ReadMe.txt ${DESTDIR}${DOCDIR}/README && \ + ${INSTALL_DATA} mainscreen.jpg manual.html ${DESTDIR}${DOCDIR} .include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/airportmodemutility/Makefile b/net/airportmodemutility/Makefile index 159aa7d192d..a570059ba0d 100644 --- a/net/airportmodemutility/Makefile +++ b/net/airportmodemutility/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/03/04 21:30:16 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2010/02/11 20:22:28 joerg Exp $ DISTNAME= ${BINNAME}_20 PKGNAME= ${BINNAME}-2.0 @@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://edge.mcs.drexel.edu/GICL/people/sevy/airport/ COMMENT= Modem (dis)connection utility for Apple's Airport Base Station +PKG_DESTDIR_SUPPORT= user-destdir + PLIST_SUBST+= BINNAME=${BINNAME:Q} JARNAME=${JARNAME:Q} ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-powerpc Darwin-*-* @@ -25,7 +27,7 @@ LIBDIR= ${PREFIX}/lib/${BINNAME} USE_JAVA= run PKG_JVMS_ACCEPTED= sun-jdk13 sun-jdk14 blackdown-jdk13 jdk14 -INSTALLATION_DIRS= bin +INSTALLATION_DIRS= bin ${DOCDIR} ${LIBDIR} post-extract: ${CHMOD} -R g-w,o-w ${WRKSRC}/* @@ -39,13 +41,12 @@ do-build: ${ECHO} "exec java ${JVM_OPTS} ${LIBDIR}/${JARNAME}" >>${WRKSRC}/${BINNAME} do-install: - ${INSTALL_DATA_DIR} ${DOCDIR} ${LIBDIR} cd ${WRKSRC} && \ - ${INSTALL_SCRIPT} ${BINNAME} ${PREFIX}/bin && \ - ${INSTALL_DATA} ${JARNAME} ${LIBDIR} && \ - ${INSTALL_DATA} AUTHORS ${DOCDIR} && \ - ${INSTALL_DATA} COPYING ${DOCDIR} && \ - ${INSTALL_DATA} README ${DOCDIR} + ${INSTALL_SCRIPT} ${BINNAME} ${DESTDIR}${PREFIX}/bin && \ + ${INSTALL_DATA} ${JARNAME} ${DESTDIR}${LIBDIR} && \ + ${INSTALL_DATA} AUTHORS ${DESTDIR}${DOCDIR} && \ + ${INSTALL_DATA} COPYING ${DESTDIR}${DOCDIR} && \ + ${INSTALL_DATA} README ${DESTDIR}${DOCDIR} .include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3