ports/52909: [PATCH] ftp/twoftpd: chase devel/bglibs headers location change

[Sergei Kolobov]

>Number:         52909
>Category:       ports
>Synopsis:       [PATCH] ftp/twoftpd: chase devel/bglibs headers location change
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 03 09:30:13 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Sergei Kolobov
>Release:        FreeBSD 4.7-STABLE i386
>Organization:
>Environment:
System: FreeBSD outpost.globcon.net 4.7-STABLE FreeBSD 4.7-STABLE #0: Thu Jan  2 03:13:48 MSK
>Description:
- Update to reflect recent change in location of header files installed
  by devel/bglibs port (see ports/52908)
- While I'm here:
  - remove unneccesary RUN_DEPENDS and USE_REINPLACE
  - use native installer
  - install some additional documentation
- Bump PORTREVISION

Port maintainer - gslin at ccca.nctu.edu.tw - has been copied.
>How-To-Repeat:
>Fix:

--- twoftpd-1.17_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/ftp/twoftpd/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile	2003/04/13 10:31:09	1.6
+++ Makefile	2003/06/03 16:14:02
@@ -7,33 +7,30 @@
 
 PORTNAME=	twoftpd
 PORTVERSION=	1.17
+PORTREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	http://untroubled.org/twoftpd/
 
 MAINTAINER=	gslin at ccca.nctu.edu.tw
 COMMENT=	A simple, secure, efficient FTP server
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libbg-str.a:${PORTSDIR}/devel/bglibs
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${LOCALBASE}/lib/libbg-unix.a:${PORTSDIR}/devel/bglibs
 
-USE_REINPLACE=	yes
-
 MAN1=		twoftpd-auth.1 twoftpd-xfer.1
-
-BIN=		twoftpd-anon twoftpd-anon-conf twoftpd-auth	\
-		twoftpd-bind-port twoftpd-conf twoftpd-xfer
+DOCS=		NEWS README TODO
 
-post-patch:
-	${REINPLACE_CMD} -e 's,/usr/local/bglibs/,${LOCALBASE}/,'	\
-	${WRKSRC}/conf-bgincs ${WRKSRC}/conf-bglibs
-	${REINPLACE_CMD} -e 's,/usr/local/,${PREFIX}/,' ${WRKSRC}/conf-bin
+pre-build:
+	${ECHO_CMD} "${LOCALBASE}/include/bglibs" > ${WRKSRC}/conf-bgincs
+	${ECHO_CMD} "${LOCALBASE}/lib"		> ${WRKSRC}/conf-bglibs
+	${ECHO_CMD} "${PREFIX}/bin"		> ${WRKSRC}/conf-bin
+	${ECHO_CMD} "${MANPREFIX}/man"		> ${WRKSRC}/conf-man
+	${ECHO_CMD} "${CC} ${CFLAGS}"		> ${WRKSRC}/conf-cc
 
 do-install:
-.for FILE in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/${FILE} ${PREFIX}/man/man1
-.endfor
-.for FILE in ${BIN}
-	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${PREFIX}/sbin
-.endfor
+	cd ${WRKSRC} && ./installer
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/ftp/twoftpd/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- pkg-plist	2003/04/13 10:31:09	1.2
+++ pkg-plist	2003/06/03 16:14:02
@@ -1,6 +1,10 @@
-sbin/twoftpd-anon 
-sbin/twoftpd-anon-conf
-sbin/twoftpd-auth
-sbin/twoftpd-bind-port
-sbin/twoftpd-conf
-sbin/twoftpd-xfer
+bin/twoftpd-anon
+bin/twoftpd-anon-conf
+bin/twoftpd-auth
+bin/twoftpd-bind-port
+bin/twoftpd-conf
+bin/twoftpd-xfer
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- twoftpd-1.17_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: