diff options
| author | martymac <martymac@FreeBSD.org> | 2010-11-18 17:12:41 +0800 |
|---|---|---|
| committer | martymac <martymac@FreeBSD.org> | 2010-11-18 17:12:41 +0800 |
| commit | c453396f7634a837ac0d706e8304844a900eb82b (patch) | |
| tree | e8d5727e8d51db268a2ab6b505b57d51f36e9279 | |
| parent | 8325fe62ca195f1e7ee5c21412bdf7d985823c44 (diff) | |
| download | freebsd-ports-gnome-c453396f7634a837ac0d706e8304844a900eb82b.tar.gz freebsd-ports-gnome-c453396f7634a837ac0d706e8304844a900eb82b.tar.zst freebsd-ports-gnome-c453396f7634a837ac0d706e8304844a900eb82b.zip | |
- Add missing LICENSE
- Remove license text from installed documents
- Improve PORTDOCS handling
Approved by: ehaupt (mentor)
| -rw-r--r-- | net/ldapscripts/Makefile | 14 | ||||
| -rw-r--r-- | security/vlock/Makefile | 15 | ||||
| -rw-r--r-- | security/vlock/pkg-plist | 8 |
3 files changed, 15 insertions, 22 deletions
diff --git a/net/ldapscripts/Makefile b/net/ldapscripts/Makefile index f4f6d4b3dee0..93b25d038ad2 100644 --- a/net/ldapscripts/Makefile +++ b/net/ldapscripts/Makefile @@ -7,7 +7,7 @@ PORTNAME= ldapscripts PORTVERSION= 1.9.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \ http://contribs.martymac.org/ldapscripts/ @@ -23,6 +23,8 @@ RUN_DEPENDS= ldapadd:${PORTSDIR}/net/openldap${OPENLDAP_VER}-client \ ldapmodrdn:${PORTSDIR}/net/openldap${OPENLDAP_VER}-client \ ldappasswd:${PORTSDIR}/net/openldap${OPENLDAP_VER}-client +LICENSE= GPLv2 + USE_OPENLDAP= yes USE_ICONV= yes LIBDIR=${PREFIX}/lib/${PORTNAME} @@ -39,7 +41,7 @@ MAN1= ldapaddgroup.1 ldapaddmachine.1 ldapadduser.1 ldapaddusertogroup.1 \ ldapmodifyuser.1 MAN5= ldapscripts.5 -PORTDOCS= README CHANGELOG COPYING VERSION TODO +PORTDOCS= README CHANGELOG VERSION TODO # Unset 'all' target set by default to 'help' # and set paths to OpenLDAP binaries @@ -60,11 +62,9 @@ post-patch: post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/VERSION ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR} +.for doc in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR} +.endfor .endif @${CAT} ${PKGMESSAGE} diff --git a/security/vlock/Makefile b/security/vlock/Makefile index e083f2ca8e04..49d42ffd63d6 100644 --- a/security/vlock/Makefile +++ b/security/vlock/Makefile @@ -7,12 +7,15 @@ PORTNAME= vlock PORTVERSION= 2.2.2 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://cthulhu.c3d2.de/~toidinamai/vlock/archive/ MAINTAINER= martymac@FreeBSD.org COMMENT= Locks a terminal +LICENSE= GPLv2 + USE_GMAKE= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --enable-plugins --enable-pam \ @@ -42,6 +45,8 @@ VLOCKMODULES= all.so new.so VLOCKGRP= vlock VLOCKGID= 129 +PORTDOCS= ChangeLog PLUGINS README README.X11 SECURITY TODO + .include <bsd.port.pre.mk> .if !defined(WITHOUT_ROOTPWD) @@ -74,13 +79,9 @@ pre-install: post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/PLUGINS ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.X11 ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/SECURITY ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR} +.for doc in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR} +.endfor .endif .include <bsd.port.post.mk> diff --git a/security/vlock/pkg-plist b/security/vlock/pkg-plist index ba6167ce9796..c6800d489cb3 100644 --- a/security/vlock/pkg-plist +++ b/security/vlock/pkg-plist @@ -9,12 +9,4 @@ lib/vlock/modules/new.so %%PL_VLOCKSCRIPTS%%lib/vlock/scripts/mplayer %%PL_VLOCKSCRIPTS%%@dirrm lib/vlock/scripts @dirrm lib/vlock -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/PLUGINS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.X11 -%%PORTDOCS%%%%DOCSDIR%%/SECURITY -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%@dirrm %%DOCSDIR%% @exec if ! pw groupshow vlock 2>/dev/null; then pw groupadd vlock -g 129; fi |