From owner-svn-ports-head@FreeBSD.ORG Mon Feb 10 23:36:00 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AE1BFC0A; Mon, 10 Feb 2014 23:36:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9917C16B1; Mon, 10 Feb 2014 23:36:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1ANa0q1076532; Mon, 10 Feb 2014 23:36:00 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1ANa0Nv076522; Mon, 10 Feb 2014 23:36:00 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201402102336.s1ANa0Nv076522@svn.freebsd.org> From: Rene Ladan Date: Mon, 10 Feb 2014 23:36:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343713 - in head/print/acroreadwrapper: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Feb 2014 23:36:00 -0000 Author: rene Date: Mon Feb 10 23:35:59 2014 New Revision: 343713 URL: http://svnweb.freebsd.org/changeset/ports/343713 QAT: https://qat.redports.org/buildarchive/r343713/ Log: - Convert to USES=kmod - Add stage support - Remove some steps from distribution Makefile already done by USES=kmod - Specify license as 'BSD2CLAUSE' instead of just 'BSD' - Allow packaging as user - Simplify inclusions Approved by: hrs (maintainer) Added: head/print/acroreadwrapper/files/patch-Makefile (contents, props changed) Modified: head/print/acroreadwrapper/Makefile Modified: head/print/acroreadwrapper/Makefile ============================================================================== --- head/print/acroreadwrapper/Makefile Mon Feb 10 23:32:26 2014 (r343712) +++ head/print/acroreadwrapper/Makefile Mon Feb 10 23:35:59 2014 (r343713) @@ -3,23 +3,23 @@ PORTNAME= acroreadwrapper PORTVERSION= 0.0.20130208 -CATEGORIES= print kld +CATEGORIES= print MASTER_SITES= http://people.allbsd.org/~hrs/FreeBSD/ DISTNAME= linux_adobe_kmod-${PORTVERSION:E} MAINTAINER= hrs@FreeBSD.org COMMENT= Wrapper for Adobe Reader -LICENSE= BSD +LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${LOCALBASE}/lib/linux-libgtkembedmoz/libgtkembedmoz.so:${PORTSDIR}/www/linux-libgtkembedmoz +USES= kmod uidfix -SSP_UNSAFE= kernel module does not support ssp +RUN_DEPENDS= ${LOCALBASE}/lib/linux-libgtkembedmoz/libgtkembedmoz.so:${PORTSDIR}/www/linux-libgtkembedmoz ONLY_FOR_ARCHS= amd64 i386 PLIST_FILES= bin/acroread8 bin/acroread9 bin/acroread \ - ${KMODDIR}/linux_adobe.ko -PLIST_DIRS= ${KMODDIR} + ${RELKMODDIR}/linux_adobe.ko +PLIST_DIRS= ${RELKMODDIR} SUB_FILES= acroread SUB_LIST= ACROBASE8=${ACROBASE8} \ ACROBASE9=${ACROBASE9} \ @@ -28,36 +28,21 @@ SUB_LIST= ACROBASE8=${ACROBASE8} \ LINUXBASE=${LINUXBASE} \ LINUXSH=${LINUXBASE}/bin/sh \ PLUGINDIR=${PLUGINDIR} \ - KMODDIR=${KMODDIR} + KMODDIR=${RELKMODDIR} USE_RC_SUBR= linux_adobe -NO_STAGE= yes -.include - -MAKE_ENV= KMODDIR=${KMODDIR} SYSDIR=${SRC_BASE}/sys DESTDIR=${PREFIX}/ +MAKE_ENV= DESTDIR=${PREFIX}/ ADOBEBASE= Adobe ACROBASE8= ${ADOBEBASE}/Reader8 ACROBASE9= ${ADOBEBASE}/Reader9 PLUGINDIR= lib/npapi/linux-acroread -KMODDIR= libexec/linux_adobe - -KERNCONF?= GENERIC - -# Use the first component of ${KERNCONF}. -.for K in ${KERNCONF} -_KERNCONF?=$K -.endfor - -.if !exists(${SRC_BASE}/sys/${ARCH}/conf/${_KERNCONF}) -IGNORE= requires kernel source to be installed -.endif +KMODDIR= ${PREFIX}/libexec/linux_adobe +RELKMODDIR= libexec/linux_adobe post-install: - ${INSTALL_KLD} ${WRKSRC}/linux_adobe.ko \ - ${PREFIX}/libexec/linux_adobe/linux_adobe.ko - ${INSTALL_SCRIPT} ${WRKDIR}/acroread ${PREFIX}/bin/acroread - cd ${PREFIX}/bin && ${LN} -s -f acroread acroread8 - cd ${PREFIX}/bin && ${LN} -s -f acroread acroread9 + ${INSTALL_SCRIPT} ${WRKDIR}/acroread ${STAGEDIR}${PREFIX}/bin/acroread + cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s -f acroread acroread8 + cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s -f acroread acroread9 -.include +.include Added: head/print/acroreadwrapper/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/acroreadwrapper/files/patch-Makefile Mon Feb 10 23:35:59 2014 (r343713) @@ -0,0 +1,18 @@ +--- Makefile.orig 2014-02-10 12:12:19.000000000 +0100 ++++ Makefile 2014-02-10 12:12:55.000000000 +0100 +@@ -2,15 +2,11 @@ + + KMOD= linux_adobe + SRCS= linux_adobe.c +-NO_XREF= yes + + .if ${MACHINE_ARCH} == "amd64" + CFLAGS+=-DCOMPAT_FREEBSD32 -DCOMPAT_LINUX32 + .endif + +-beforeinstall: +- mkdir -p ${DESTDIR}${KMODDIR} +- + CLEANFILES= linux_adobe_kmod-*.tar.gz + cleandist: + rm -rf linux_adobe_kmod-*