Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 17 Oct 2013 01:23:56 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r330591 - in head/graphics/scrot: . files
Message-ID:  <201310170123.r9H1Nuw3015825@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Thu Oct 17 01:23:56 2013
New Revision: 330591
URL: http://svnweb.freebsd.org/changeset/ports/330591

Log:
  - Support staging
  - Rename patches in a meaningful way
  - Use new LIB_DEPENDS syntax

Added:
  head/graphics/scrot/files/patch-Makefile.in   (contents, props changed)
     - copied, changed from r330510, head/graphics/scrot/files/patch-aa
  head/graphics/scrot/files/patch-src-Makefile.in
     - copied, changed from r330510, head/graphics/scrot/files/patch-ab
Deleted:
  head/graphics/scrot/files/patch-aa
  head/graphics/scrot/files/patch-ab
  head/graphics/scrot/pkg-plist
Modified:
  head/graphics/scrot/Makefile

Modified: head/graphics/scrot/Makefile
==============================================================================
--- head/graphics/scrot/Makefile	Thu Oct 17 01:19:58 2013	(r330590)
+++ head/graphics/scrot/Makefile	Thu Oct 17 01:23:56 2013	(r330591)
@@ -11,17 +11,14 @@ MASTER_SITES=	http://linuxbrit.co.uk/dow
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	A screen capture utility that utilizes Imlib2
 
-LIB_DEPENDS=	giblib:${PORTSDIR}/graphics/giblib
+LIB_DEPENDS=	libgiblib.so:${PORTSDIR}/graphics/giblib
 
 GNU_CONFIGURE=	yes
 
-MAN1=		scrot.1
+PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
+PORTDOCS=	*
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MDOCS}
-MAKE_ENV=	NO_DOC=yes
-.endif
+OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFAULT=DOCS
 
 .include <bsd.port.mk>

Copied and modified: head/graphics/scrot/files/patch-Makefile.in (from r330510, head/graphics/scrot/files/patch-aa)
==============================================================================
--- head/graphics/scrot/files/patch-aa	Wed Oct 16 13:06:17 2013	(r330510, copy source)
+++ head/graphics/scrot/files/patch-Makefile.in	Thu Oct 17 01:23:56 2013	(r330591)
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- Makefile.in.orig	Wed Aug 29 13:57:11 2001
 +++ Makefile.in	Sun Jan 27 10:19:21 2002
 @@ -82,7 +82,7 @@
@@ -12,19 +9,3 @@ $FreeBSD$
  
  EXTRA_DIST =  scrot.spec scrot.1 $(docs_DATA)
  
-@@ -195,6 +195,7 @@
- 	$(MAKE) $(AM_MAKEFLAGS) uninstall-man1
- 
- install-docsDATA: $(docs_DATA)
-+.if !defined(NO_DOC)
- 	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(docsdir)
- 	@list='$(docs_DATA)'; for p in $$list; do \
-@@ -206,6 +207,7 @@
- 	    $(INSTALL_DATA) $$p $(DESTDIR)$(docsdir)/$$p; \
- 	  fi; fi; \
- 	done
-+.endif
- 
- uninstall-docsDATA:
- 	@$(NORMAL_UNINSTALL)

Copied and modified: head/graphics/scrot/files/patch-src-Makefile.in (from r330510, head/graphics/scrot/files/patch-ab)
==============================================================================
--- head/graphics/scrot/files/patch-ab	Wed Oct 16 13:06:17 2013	(r330510, copy source)
+++ head/graphics/scrot/files/patch-src-Makefile.in	Thu Oct 17 01:23:56 2013	(r330591)
@@ -5,7 +5,7 @@
  
  LDFLAGS = -L/usr/X11R6/lib
 -INCLUDES = -g -O3 -Wall -I/usr/X11R6/include $(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. -DPREFIX=\""$(prefix)"\" @GIBLIB_CFLAGS@
-+INCLUDES = -Wall -I/usr/X11R6/include $(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. -DPREFIX=\""$(prefix)"\" @GIBLIB_CFLAGS@
++INCLUDES = -Wall $(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. -DPREFIX=\""$(prefix)"\" @GIBLIB_CFLAGS@
  
  LIBOBJS = @LIBOBJS@
  



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