From 2de205d3067a1535227d7709cb5ccacc90d9f1a7 Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 19 May 2005 01:25:01 +0000 Subject: Use PATCH_DIST_CAT to simplify applying the strange pilrc patch. Also, while we're here, convert to use the options framework. Note that the deprecated variable PILRC_USE_GTK should be removed after the pkgsrc-2005Q3 branch is cut. --- devel/pilrc/Makefile | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) (limited to 'devel/pilrc') diff --git a/devel/pilrc/Makefile b/devel/pilrc/Makefile index 1c351785bde..7d43d65b818 100644 --- a/devel/pilrc/Makefile +++ b/devel/pilrc/Makefile @@ -1,30 +1,28 @@ -# $NetBSD: Makefile,v 1.24 2005/04/11 21:45:36 tv Exp $ +# $NetBSD: Makefile,v 1.25 2005/05/19 01:25:01 jlam Exp $ # DISTNAME= pilrc-2.9p9 PKGNAME= pilrc-2.9.10 PKGREVISION= 3 #WRKSRC= ${WRKDIR}/pilrc-2.9p9 -DIFFS= pilrc-2.9p10.diff -EXTRACT_SUFFIX= .tgz -DISTFILES= ${DISTNAME}${EXTRACT_SUFFIX} ${DIFFS} +EXTRACT_SUFX= .tgz CATEGORIES= devel -MASTER_SITES= http://www.ardiri.com/download/files/palm/ -#MASTER_SITES= http://www.ardiri.com/download/palm/pilrc/archive/ -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFFIX} +MASTER_SITES= http://www.ardiri.com/download/files/palm/ \ + http://www.ardiri.com/download/palm/pilrc/archive/ -# we can't use this, since pilrc's maintainer won't create patches with -# unix line endings -#PATCH_SITES= ${MASTER_SITES} -#PATCHFILES= pilrc-2.9p10.diff -#PATCH_DIST_STRIP+=-p1 +PATCH_SITES= ${MASTER_SITES} +PATCHFILES= pilrc-2.9p10.diff +PATCH_DIST_STRIP+= -p1 +# +# The pilrc patches don't have Unix line endings, so strip off the extra +# \r character on each line. +# +PATCH_DIST_CAT= ${CAT} $$patchfile | ${TR} -d '\015' MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.ardiri.com/index.cfm?redir=palm&cat=pilrc COMMENT= Generate resources for PalmOS applications from textual description -#EXTRACT_CMD= unzip -aq ${DOWNLOADED_DISTFILE} - USE_GNU_TOOLS+= make GNU_CONFIGURE= YES @@ -32,23 +30,30 @@ DOCDIR= ${PREFIX}/share/doc/html/pilrc .include "../../mk/bsd.prefs.mk" -PILRC_USE_GTK?= YES +PKG_OPTIONS_VAR= PKG_OPTIONS.pilrc +PKG_SUPPORTED_OPTIONS= gtk +PKG_SUGGESTED_OPTIONS= gtk + +# PILRC_USE_GTK should be removed after the pkgsrc-2005Q3 branch. +PKG_OPTIONS_LEGACY_VARS+= PILRC_USE_GTK:gtk + +.include "../../mk/bsd.options.mk" -.if ${PILRC_USE_GTK} == YES -.include "../../x11/gtk/buildlink3.mk" -PLIST_SUBST+= PILRCUI='' +### +### gtk -- Build the GTK+ UI +### +.if !empty(PKG_OPTIONS:Mgtk) +. include "../../x11/gtk/buildlink3.mk" +PLIST_SUBST+= PILRCUI= .else CONFIGURE_ARGS+=--disable-pilrcui -PLIST_SUBST+= PILRCUI='@comment ' +PLIST_SUBST+= PILRCUI="@comment " .endif #post-extract: # ${CHMOD} +x ${WRKSRC}/configure # ${CHMOD} +x ${WRKSRC}/missing -pre-patch: - cd ${WRKSRC} && ${TR} -d '\015' < ${DISTDIR}/${DIFFS} \ - | ${PATCH} --quiet -p1 post-install: ${INSTALL_DATA_DIR} ${DOCDIR} ${INSTALL_DATA_DIR} ${DOCDIR}/images -- cgit v1.2.3