Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Feb 2014 14:03:18 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r344751 - in head/deskutils/ical: . files
Message-ID:  <201402171403.s1HE3IC9075584@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gahr
Date: Mon Feb 17 14:03:17 2014
New Revision: 344751
URL: http://svnweb.freebsd.org/changeset/ports/344751
QAT: https://qat.redports.org/buildarchive/r344751/

Log:
  - STAGE-clean
  - Convert to USES=tk

Modified:
  head/deskutils/ical/Makefile
  head/deskutils/ical/files/patch-ac
  head/deskutils/ical/pkg-plist

Modified: head/deskutils/ical/Makefile
==============================================================================
--- head/deskutils/ical/Makefile	Mon Feb 17 13:56:48 2014	(r344750)
+++ head/deskutils/ical/Makefile	Mon Feb 17 14:03:17 2014	(r344751)
@@ -15,22 +15,20 @@ COMMENT=	Calendar application
 
 LICENSE=	GPLv2
 
-USE_TK=		yes
+USES=		tk
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tclconfig=${TCL_LIBDIR} \
 		--with-tclhdir=${TCL_INCLUDEDIR} \
 		--with-tclsh=${TCLSH} \
 		--with-tkconfig=${TK_LIBDIR} \
 		--with-tkhdir=${TK_INCLUDEDIR}
+MAKE_ENV+=	STAGEDIR=${STAGEDIR}
 
-MAN1=		ical.1
-
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's,tcl->result,Tcl_GetStringResult(tcl),' \
 		${WRKSRC}/ical.C
 
 post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/${DISTNAME}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${DISTNAME}
 
 .include <bsd.port.mk>

Modified: head/deskutils/ical/files/patch-ac
==============================================================================
--- head/deskutils/ical/files/patch-ac	Mon Feb 17 13:56:48 2014	(r344750)
+++ head/deskutils/ical/files/patch-ac	Mon Feb 17 14:03:17 2014	(r344751)
@@ -1,5 +1,19 @@
 --- Makefile.in.orig	1997-06-04 18:09:59.000000000 +0200
-+++ Makefile.in	2008-04-22 17:31:33.000000000 +0200
++++ Makefile.in	2014-02-17 15:05:23.000000000 +0100
+@@ -14,10 +14,10 @@
+  CONFIGURE_IN = @MFILES_IN@
+  CONFFILES    = $(srcdir)/configure.in
+ 
+-       BINDIR = $(exec_prefix)/bin
+-       LIBDIR = $(prefix)/lib
++       BINDIR = $(STAGEDIR)$(exec_prefix)/bin
++       LIBDIR = $(STAGEDIR)$(prefix)/lib
+       ILIBDIR = $(LIBDIR)/ical/v@ICAL_VERSION@
+-       MANDIR = $(prefix)/man
++       MANDIR = $(STAGEDIR)$(prefix)/man
+ 
+            CC = @CC@
+           CXX = @CXX@
 @@ -59,14 +59,12 @@
  # Tiny bundled executable uses shared versions of tcl/tk libraries
   TINY_BLIBS = $(LIBS)

Modified: head/deskutils/ical/pkg-plist
==============================================================================
--- head/deskutils/ical/pkg-plist	Mon Feb 17 13:56:48 2014	(r344750)
+++ head/deskutils/ical/pkg-plist	Mon Feb 17 14:03:17 2014	(r344751)
@@ -1,5 +1,6 @@
 bin/ical
 bin/ical-2.2
+man/man1/ical.1.gz
 lib/ical/v2.2/actions.tcl
 lib/ical/v2.2/alarm.tcl
 lib/ical/v2.2/apptlist.tcl



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402171403.s1HE3IC9075584>