ports/178870: graphics/icoutils: Support shebangfix

[KATO Tsuguru]

>Number:         178870
>Category:       ports
>Synopsis:       graphics/icoutils: Support shebangfix
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 23 18:10:02 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Support shebangfix

Remove file:
files/extra-patch-Makefile.in
files/extra-patch-configure.ac

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/graphics/icoutils/Makefile graphics/icoutils/Makefile
--- /usr/ports/graphics/icoutils/Makefile	2013-05-21 16:44:51.000000000 +0900
+++ graphics/icoutils/Makefile	2013-05-24 00:00:55.000000000 +0900
@@ -13,20 +13,22 @@
 
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
+OPTIONS_DEFINE=	RESSCRIPTS
+RESSCRIPTS_DESC=	PERL resource scripts
+
 USE_BZIP2=	yes
+USES=		shebangfix
+SHEBANG_FILES=	extresso/*.in
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nls
 MAKE_JOBS_SAFE=	yes
 
-MAN1=		icotool.1 wrestool.1
-PLIST_FILES=	bin/icotool \
-		bin/wrestool
-
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	RESSCRIPTS
-RESSCRIPTS_DESC=	PERL resource scripts
+MAN1=		icotool.1 wrestool.1
+PLIST_FILES=	bin/icotool \
+		bin/wrestool
 
 .include <bsd.port.options.mk>
 
@@ -36,10 +38,6 @@
 MAN1+=		extresso.1 genresscript.1
 PLIST_FILES+=	bin/extresso \
 		bin/genresscript
-.else
-post-patch:
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-Makefile.in \
-		${FILESDIR}/extra-patch-configure.ac
 .endif
 
 .include <bsd.port.pre.mk>
@@ -48,4 +46,14 @@
 BROKEN=		Does not link on sparc64
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e \
+		'/^SUBDIRS/s|extresso||' ${WRKSRC}/Makefile.in
+
+post-install:
+.if ${PORT_OPTIONS:MRESSCRIPTS}
+	@(cd ${WRKSRC}/extresso && ${SETENV} ${MAKE_ENV} ${MAKE} \
+		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+.endif
+
 .include <bsd.port.post.mk>
diff -urN /usr/ports/graphics/icoutils/files/extra-patch-Makefile.in graphics/icoutils/files/extra-patch-Makefile.in
--- /usr/ports/graphics/icoutils/files/extra-patch-Makefile.in	2012-11-08 09:33:05.000000000 +0900
+++ graphics/icoutils/files/extra-patch-Makefile.in	1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2012-10-08 14:19:17.000000000 +0400
-+++ Makefile.in	2012-10-08 14:19:35.000000000 +0400
-@@ -604,7 +604,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- ACLOCAL_AMFLAGS = -I m4
--SUBDIRS = po lib common icotool wrestool extresso
-+SUBDIRS = po lib common icotool wrestool
- EXTRA_DIST = \
-   data/icons/icon-linux_penguin-20x20-16c.png \
-   data/icons/icon-linux_penguin-16x16-16c.png \
diff -urN /usr/ports/graphics/icoutils/files/extra-patch-configure.ac graphics/icoutils/files/extra-patch-configure.ac
--- /usr/ports/graphics/icoutils/files/extra-patch-configure.ac	2012-11-08 09:33:05.000000000 +0900
+++ graphics/icoutils/files/extra-patch-configure.ac	1970-01-01 09:00:00.000000000 +0900
@@ -1,13 +0,0 @@
---- configure.ac.orig	2012-10-08 13:47:35.000000000 +0400
-+++ configure.ac	2012-10-08 13:47:59.000000000 +0400
-@@ -69,9 +69,5 @@ AC_CONFIG_FILES([Makefile
- 		 po/Makefile.in
- 		 lib/Makefile
- 		 common/Makefile
--		 icotool/Makefile
--		 wrestool/Makefile
--		 extresso/Makefile])
--AC_CONFIG_FILES([extresso/extresso], [chmod +x extresso/extresso])
--AC_CONFIG_FILES([extresso/genresscript], [chmod +x extresso/genresscript])
-+		 icotool/Makefile)
- AC_OUTPUT
>Release-Note:
>Audit-Trail:
>Unformatted: