- Support staging

- Rename patches in a meaningful way
- Use new LIB_DEPENDS syntax

5 files changed, 17 insertions, 46 deletions

diff --git a/graphics/scrot/Makefile b/graphics/scrot/Makefile
index 90a76d774d69..7eb4e892b89d 100644
--- a/graphics/scrot/Makefile
+++ b/graphics/scrot/Makefile
@@ -11,17 +11,14 @@ MASTER_SITES=	http://linuxbrit.co.uk/downloads/ \
 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>
diff --git a/graphics/scrot/files/patch-Makefile.in b/graphics/scrot/files/patch-Makefile.in
new file mode 100644
index 000000000000..4a66dcb2880b
--- /dev/null
+++ b/graphics/scrot/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Wed Aug 29 13:57:11 2001
++++ Makefile.in	Sun Jan 27 10:19:21 2002
+@@ -82,7 +82,7 @@
+ man_MANS = scrot.1
+ 
+ docs_DATA = README AUTHORS ChangeLog TODO
+-docsdir = $(prefix)/doc/scrot
++docsdir = $(datadir)/doc/scrot
+ 
+ EXTRA_DIST =  scrot.spec scrot.1 $(docs_DATA)
+ 
diff --git a/graphics/scrot/files/patch-aa b/graphics/scrot/files/patch-aa
deleted file mode 100644
index c46271709049..000000000000
--- a/graphics/scrot/files/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in.orig	Wed Aug 29 13:57:11 2001
-+++ Makefile.in	Sun Jan 27 10:19:21 2002
-@@ -82,7 +82,7 @@
- man_MANS = scrot.1
- 
- docs_DATA = README AUTHORS ChangeLog TODO
--docsdir = $(prefix)/doc/scrot
-+docsdir = $(datadir)/doc/scrot
- 
- 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)
diff --git a/graphics/scrot/files/patch-ab b/graphics/scrot/files/patch-src-Makefile.in
index 643953c1d889..478c88a37a44 100644
--- a/graphics/scrot/files/patch-ab
+++ b/graphics/scrot/files/patch-src-Makefile.in
@@ -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@
  
diff --git a/graphics/scrot/pkg-plist b/graphics/scrot/pkg-plist
deleted file mode 100644
index a657435dbdf2..000000000000
--- a/graphics/scrot/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $FreeBSD$
-bin/scrot
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%