user-destdir support

This commit is contained in:
joerg 2009-07-07 17:22:27 +00:00
parent 331e7f0f75
commit 83fd0388da
7 changed files with 41 additions and 19 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.20 2009/06/30 00:07:25 joerg Exp $ # $NetBSD: Makefile,v 1.21 2009/07/07 17:22:27 joerg Exp $
DISTNAME= xless-1.7 DISTNAME= xless-1.7
PKGREVISION= 3 PKGREVISION= 3
@ -9,10 +9,14 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/} \
MAINTAINER= pkgsrc-users@NetBSD.org MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= X11 text viewer; useful as an add-on tool for other apps COMMENT= X11 text viewer; useful as an add-on tool for other apps
PKG_DESTDIR_SUPPORT= user-destdir
MAKE_JOBS_SAFE= no MAKE_JOBS_SAFE= no
USE_IMAKE= yes USE_IMAKE= yes
INSTALLATION_DIRS= lib/X11
.include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXaw/buildlink3.mk"
.include "../../x11/libXp/buildlink3.mk" .include "../../x11/libXp/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk"

View file

@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.4 2005/02/23 17:36:24 wiz Exp $ $NetBSD: distinfo,v 1.5 2009/07/07 17:22:27 joerg Exp $
SHA1 (xless-1.7.tar.gz) = 2fb2c468aa6c0237be1d2bc256fcaf754c98b20e SHA1 (xless-1.7.tar.gz) = 2fb2c468aa6c0237be1d2bc256fcaf754c98b20e
RMD160 (xless-1.7.tar.gz) = 87047418d9928df97635b1f2b2908559fe5d2461 RMD160 (xless-1.7.tar.gz) = 87047418d9928df97635b1f2b2908559fe5d2461
Size (xless-1.7.tar.gz) = 45559 bytes Size (xless-1.7.tar.gz) = 45559 bytes
SHA1 (patch-aa) = 40886d34888ab70deba4cec08a1f9f596c3a6a88 SHA1 (patch-aa) = d76edac759341d472a44eae25b08f8f89271fc5d

View file

@ -1,7 +1,7 @@
$NetBSD: patch-aa,v 1.2 1998/08/07 11:18:24 agc Exp $ $NetBSD: patch-aa,v 1.3 2009/07/07 17:22:27 joerg Exp $
--- Imakefile.orig Thu Jun 2 16:22:14 1994 --- Imakefile.orig 1994-06-03 01:22:14.000000000 +0200
+++ Imakefile Fri Dec 27 18:52:23 1996 +++ Imakefile
@@ -5,7 +5,8 @@ @@ -5,7 +5,8 @@
* -DPRINTCMD=\"/usr/ucb/lpr\" - path to send file to printer * -DPRINTCMD=\"/usr/ucb/lpr\" - path to send file to printer
* -DTILDE_EXPANSION - perform ~ expansion on filenames * -DTILDE_EXPANSION - perform ~ expansion on filenames
@ -12,3 +12,12 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 11:18:24 agc Exp $
SRCS = help.c init.c popup.c util.c callbacks.c window.c main.c \ SRCS = help.c init.c popup.c util.c callbacks.c window.c main.c \
@@ -27,7 +28,7 @@ LOCAL_LIBRARIES = -Lregexp -lregexp XawC
MakeSubdirs($(SUBDIRS))
ComplexProgramTarget(xless)
-InstallNonExec(xless.help, $(LIBDIR))
+InstallNonExec(xless.help,$(LIBDIR))
InstallAppDefaults(XLess)
#if ProjectX >= 5

View file

@ -1,9 +1,11 @@
# $NetBSD: Makefile,v 1.28 2008/03/10 12:37:12 drochner Exp $ # $NetBSD: Makefile,v 1.29 2009/07/07 17:28:04 joerg Exp $
# #
PKGNAME= ${DISTNAME:S/-/-demo-/} PKGNAME= ${DISTNAME:S/-/-demo-/}
COMMENT= Demo viewer and configuration tool for xscreensaver COMMENT= Demo viewer and configuration tool for xscreensaver
PKG_DESTDIR_SUPPORT= user-destdir
CONFLICTS+= xscreensaver<4.14 xscreensaver-gnome-[0-9]* CONFLICTS+= xscreensaver<4.14 xscreensaver-gnome-[0-9]*
USE_DIRS+= xdg-1.1 USE_DIRS+= xdg-1.1
@ -20,10 +22,13 @@ BUILD_DIRS= ${WRKSRC}/utils ${WRKSRC}/driver
INSTALL_DIRS= ${WRKSRC}/driver INSTALL_DIRS= ${WRKSRC}/driver
INSTALL_TARGET= install-gnome INSTALL_TARGET= install-gnome
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
post-install: post-install:
${INSTALL_PROGRAM} ${WRKSRC}/driver/xscreensaver-demo ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/driver/xscreensaver-demo \
${DESTDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/driver/xscreensaver-demo.man \ ${INSTALL_MAN} ${WRKSRC}/driver/xscreensaver-demo.man \
${PREFIX}/${PKGMANDIR}/man1/xscreensaver-demo.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xscreensaver-demo.1
.include "../../devel/libglade/buildlink3.mk" .include "../../devel/libglade/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk"

View file

@ -1,9 +1,11 @@
# $NetBSD: Makefile,v 1.84 2008/03/10 12:37:12 drochner Exp $ # $NetBSD: Makefile,v 1.85 2009/07/07 17:28:04 joerg Exp $
COMMENT= Screen saver and locker for the X window system COMMENT= Screen saver and locker for the X window system
CONFLICTS+= xscreensaver-gnome<4.14 CONFLICTS+= xscreensaver-gnome<4.14
PKG_DESTDIR_SUPPORT= user-destdir
.include "Makefile.common" .include "Makefile.common"
CONFIGURE_ARGS+= --without-gtk CONFIGURE_ARGS+= --without-gtk
@ -20,11 +22,11 @@ MESSAGE_SUBST+= EGDIR=${EGDIR:Q}
post-extract: post-extract:
cd ${WRKSRC}/po && ${RM} -f ca.po pt_BR.po cd ${WRKSRC}/po && ${RM} -f ca.po pt_BR.po
post-install: installpamex INSTALLATION_DIRS= ${EGDIR}/pam.d
installpamex:
${INSTALL_DATA_DIR} ${EGDIR}/pam.d post-install:
${INSTALL_DATA} ${FILESDIR}/pam-xscreensaver-NetBSD \ ${INSTALL_DATA} ${FILESDIR}/pam-xscreensaver-NetBSD \
${EGDIR}/pam.d/xscreensaver-NetBSD ${DESTDIR}${EGDIR}/pam.d/xscreensaver-NetBSD
.include "../../x11/libXScrnSaver/buildlink3.mk" .include "../../x11/libXScrnSaver/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.98 2009/01/14 13:29:15 drochner Exp $ # $NetBSD: Makefile.common,v 1.99 2009/07/07 17:28:04 joerg Exp $
# #
# When updating the package, # When updating the package,
@ -63,6 +63,8 @@ CFLAGS+= -fno-strict-aliasing
GCC_REQD+= 2.95.3 GCC_REQD+= 2.95.3
.endif .endif
INSTALL_MAKE_FLAGS= install_prefix=${DESTDIR}
.include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk"
.include "../../graphics/gle/buildlink3.mk" .include "../../graphics/gle/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.4 2007/01/08 21:45:10 drochner Exp $ # $NetBSD: options.mk,v 1.5 2009/07/07 17:28:04 joerg Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.xscreensaver PKG_OPTIONS_VAR= PKG_OPTIONS.xscreensaver
PKG_SUPPORTED_OPTIONS= pam xscreensaver-webcollage PKG_SUPPORTED_OPTIONS= pam xscreensaver-webcollage
@ -24,7 +24,7 @@ PLIST_SRC= PLIST.webcollage PLIST
.else .else
post-install: delwebcollage post-install: delwebcollage
delwebcollage: delwebcollage:
rm ${PREFIX}/libexec/xscreensaver/config/webcollage.xml rm ${DESTDIR}${PREFIX}/libexec/xscreensaver/config/webcollage.xml
rm ${PREFIX}/libexec/xscreensaver/webcollage rm ${DESTDIR}${PREFIX}/libexec/xscreensaver/webcollage
rm ${PREFIX}/${PKGMANDIR}/man6/webcollage.6 rm ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/webcollage.6
.endif .endif