sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Convert one patch to sed magic

Browse source 
Submitted by:	Beech Rintoul <beech@alaskaparadise.com> (maintainer)
This commit is contained in:
Andrew Pantyukhin 2007-03-02 20:12:49 +00:00
parent e5266e2a29
commit 9d08152322
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=186370
6 changed files with 18 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ftp/proftpd-devel/Makefile
View file

@ -133,7 +133,6 @@ LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
CONFIGURE_ARGS+= --enable-nls CONFIGURE_ARGS+= --enable-nls
USE_GETTEXT=yes USE_GETTEXT=yes
PROFTPD_LIBS+= -lintl -L${LOCALBASE}/lib PROFTPD_LIBS+= -lintl -L${LOCALBASE}/lib
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-nls-Makefile.in
.endif .endif
.if defined (WITH_CYRFIX) .if defined (WITH_CYRFIX)
@ -226,6 +225,11 @@ CONFIGURE_ARGS+= --with-libraries=${LIBDIRS}
MODULES!=${ECHO} ${MODULES} | ${SED} -e 's,^:,,' -e 's,:$$,,' MODULES!=${ECHO} ${MODULES} | ${SED} -e 's,^:,,' -e 's,:$$,,'
post-patch:
.if defined(WITH_NLS)
${REINPLACE_CMD} -e 's|-lsupp|-lsupp -lintl|g' ${WRKSRC}/Makefile.in
.endif
pre-configure: pre-configure:
@${ECHO_MSG} "==> Configuring with ${MODULES}" @${ECHO_MSG} "==> Configuring with ${MODULES}"

15
ftp/proftpd-devel/files/extra-patch-nls-Makefile.in
View file

@ -1,15 +0,0 @@
--- Makefile.in.orig Tue Jan 9 17:19:02 2007
+++ Makefile.in Thu Feb 1 09:11:20 2007
@@ -64,10 +64,10 @@
$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPSHUT_OBJS) $(UTILS_LIBS)
ftptop$(EXEEXT): lib utils
- $(CC) $(LDFLAGS) -o $@ $(BUILD_FTPTOP_OBJS) $(CURSES_LIBS) $(UTILS_LIBS) -lsupp
+ $(CC) $(LDFLAGS) -o $@ $(BUILD_FTPTOP_OBJS) $(CURSES_LIBS) $(UTILS_LIBS) -lsupp -lintl
ftpwho$(EXEEXT): lib utils
- $(CC) $(LDFLAGS) -o $@ $(BUILD_FTPWHO_OBJS) $(UTILS_LIBS) -lsupp
+ $(CC) $(LDFLAGS) -o $@ $(BUILD_FTPWHO_OBJS) $(UTILS_LIBS) -lsupp -lintl
# BSD install -d doesn't work, so ...

6
ftp/proftpd-devel/pkg-message
View file

@ -1,8 +1,10 @@
### * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
Make sure you have the following lines in your PAM configuration file Make sure you have the following lines in your PAM configuration file
so that ProFTPd's PAM module can authenticate users correctly. so that ProFTPd's PAM module can authenticate users correctly.
ftpd auth required pam_unix.so try_first_pass ftpd auth required pam_unix.so try_first_pass
ftpd account required pam_unix.so try_first_pass ftpd account required pam_unix.so try_first_pass
ftpd session required pam_permit.so ftpd session required pam_permit.so
###
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *

6
ftp/proftpd/Makefile
View file

@ -133,7 +133,6 @@ LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
CONFIGURE_ARGS+= --enable-nls CONFIGURE_ARGS+= --enable-nls
USE_GETTEXT=yes USE_GETTEXT=yes
PROFTPD_LIBS+= -lintl -L${LOCALBASE}/lib PROFTPD_LIBS+= -lintl -L${LOCALBASE}/lib
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-nls-Makefile.in
.endif .endif
.if defined (WITH_CYRFIX) .if defined (WITH_CYRFIX)
@ -226,6 +225,11 @@ CONFIGURE_ARGS+= --with-libraries=${LIBDIRS}
MODULES!=${ECHO} ${MODULES} | ${SED} -e 's,^:,,' -e 's,:$$,,' MODULES!=${ECHO} ${MODULES} | ${SED} -e 's,^:,,' -e 's,:$$,,'
post-patch:
.if defined(WITH_NLS)
${REINPLACE_CMD} -e 's|-lsupp|-lsupp -lintl|g' ${WRKSRC}/Makefile.in
.endif
pre-configure: pre-configure:
@${ECHO_MSG} "==> Configuring with ${MODULES}" @${ECHO_MSG} "==> Configuring with ${MODULES}"

15
ftp/proftpd/files/extra-patch-nls-Makefile.in
View file

@ -1,15 +0,0 @@
--- Makefile.in.orig Tue Jan 9 17:19:02 2007
+++ Makefile.in Thu Feb 1 09:11:20 2007
@@ -64,10 +64,10 @@
$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPSHUT_OBJS) $(UTILS_LIBS)
ftptop$(EXEEXT): lib utils
- $(CC) $(LDFLAGS) -o $@ $(BUILD_FTPTOP_OBJS) $(CURSES_LIBS) $(UTILS_LIBS) -lsupp
+ $(CC) $(LDFLAGS) -o $@ $(BUILD_FTPTOP_OBJS) $(CURSES_LIBS) $(UTILS_LIBS) -lsupp -lintl
ftpwho$(EXEEXT): lib utils
- $(CC) $(LDFLAGS) -o $@ $(BUILD_FTPWHO_OBJS) $(UTILS_LIBS) -lsupp
+ $(CC) $(LDFLAGS) -o $@ $(BUILD_FTPWHO_OBJS) $(UTILS_LIBS) -lsupp -lintl
# BSD install -d doesn't work, so ...

6
ftp/proftpd/pkg-message
View file

@ -1,8 +1,10 @@
### * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
Make sure you have the following lines in your PAM configuration file Make sure you have the following lines in your PAM configuration file
so that ProFTPd's PAM module can authenticate users correctly. so that ProFTPd's PAM module can authenticate users correctly.
ftpd auth required pam_unix.so try_first_pass ftpd auth required pam_unix.so try_first_pass
ftpd account required pam_unix.so try_first_pass ftpd account required pam_unix.so try_first_pass
ftpd session required pam_permit.so ftpd session required pam_permit.so
###
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *