Attachment 75940 Details for Bug 109583 – file.diff

[patch] file.diff

file.diff (text/plain), 2.77 KB, created by Jose Alonso Cardenas Marquez on 2007-02-27 01:00:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jose Alonso Cardenas Marquez

Created: 2007-02-27 01:00:08 UTC

Size: 2.77 KB

patch

obsolete

>--- /usr/ports/ftp/proftpd/Makefile	Mon Jan 22 23:27:17 2007 ++
>+ /usr/ports/ftp/proftpd-new/Makefile	Mon Feb 26 19:41:01 2007
>@@ -7,7 +7,7 @@ 
> PORTNAME=	proftpd
> DISTVERSION=	1.3.1rc2
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	ftp
> MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
> 		ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/
>\ @@ -36,7 +36,9 @@
> GNU_CONFIGURE=yes
> 
> USE_RC_SUBR=	proftpd.sh
>+SUB_FILES=	pkg-message
> 
>+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd
>${OSREL} CONFIGURE_ARGS=	--localstatedir=/var/run \
> 		--sysconfdir=${EXAMPLESDIR}/etc \
> 		--disable-sendfile
>@@ -136,7 +138,6 @@
> CONFIGURE_ARGS+=	--enable-nls
> USE_GETTEXT=yes
> PROFTPD_LIBS+=	-lintl -L${LOCALBASE}/lib
>-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-nls-Makefile.in
> .endif
> 
> #allow user to override
>@@ -229,6 +230,9 @@
> 		-e 's:/usr/bin:${PREFIX}/bin:' \
> 		${WRKSRC}/src/proftpd.8 ${WRKSRC}/utils/ftpshut.8 \
> 		${WRKSRC}/utils/ftpcount.1
>+.if defined(WITH_NLS)
>+	${REINPLACE_CMD} -e 's|-lsupp|-lsupp -lintl|g'
>${WRKSRC}/Makefile.in +.endif
> 
> post-install:
> 	@if [ ! -f ${PREFIX}/etc/proftpd.conf ]; then \
>diff -ruN
>--exclude=CVS /usr/ports/ftp/proftpd/files/extra-patch-nls-Makefile.in /usr/ports/ftp/proftpd-new/files/extra-patch-nls-Makefile.in
>--- /usr/ports/ftp/proftpd/files/extra-patch-nls-Makefile.in	Sat
>Dec 30 17:45:40 2006 ++
>+ /usr/ports/ftp/proftpd-new/files/extra-patch-nls-Makefile.in
>Wed Dec 31 19:00:00 1969 @@ -1,15 +0,0 @@ ---- Makefile.in	Fri
>Dec 29 09:19:12 2006 -+++ Makefile.in.new	Fri Dec 29 09:19:22
>2006 -@@ -63,10 +63,10 @@
>- 	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPSHUT_OBJS)
>- 
>- ftptop$(EXEEXT): lib utils
>--	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPTOP_OBJS) $(CURSES_LIBS)
>-lsupp -+	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPTOP_OBJS)
>$(CURSES_LIBS) -lsupp -lintl
>- 
>- ftpwho$(EXEEXT): lib utils
>--	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPWHO_OBJS) -lsupp
>-+	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPWHO_OBJS) -lsupp -lintl
>- 
>- 
>- # BSD install -d doesn't work, so ...
>diff -ruN
>--exclude=CVS /usr/ports/ftp/proftpd/pkg-message /usr/ports/ftp/proftpd-new/pkg-message
>--- /usr/ports/ftp/proftpd/pkg-message	Tue Feb 26 02:23:24 2002 +
>++ /usr/ports/ftp/proftpd-new/pkg-message	Wed Dec 31 19:00:00
>1969 @@ -1,8 +0,0 @@ -###
>-Make sure you have the following lines in your PAM configuration file
>-so that ProFTPd's PAM module can authenticate users correctly.
>-
>-ftpd auth    required    pam_unix.so         try_first_pass
>-ftpd account required    pam_unix.so         try_first_pass
>-ftpd session required    pam_permit.so
>-###
>diff -ruN
>--exclude=CVS /usr/ports/ftp/proftpd/proftpd.diff /usr/ports/ftp/proftpd-new/proftpd.diff
>--- /usr/ports/ftp/proftpd/proftpd.diff	Wed Dec 31 19:00:00 1969
>+++ /usr/ports/ftp/proftpd-new/proftpd.diff	Mon Feb 26 19:48:21
>2007 @@ -0,0 +1 @@ +===> Generating patch
>===> Done

Actions: View | Diff

Attachments on bug 109583: 75940