6 files changed, 18 insertions, 36 deletions

diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile
index 18749786619f..e0370436b3ce 100644
--- a/ftp/proftpd-devel/Makefile
+++ b/ftp/proftpd-devel/Makefile
@@ -133,7 +133,6 @@ LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--enable-nls
 USE_GETTEXT=yes
 PROFTPD_LIBS+=	-lintl -L${LOCALBASE}/lib
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-nls-Makefile.in
 .endif
 
 .if defined (WITH_CYRFIX)
@@ -226,6 +225,11 @@ CONFIGURE_ARGS+=	--with-libraries=${LIBDIRS}
 
 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:
 	@${ECHO_MSG} "==> Configuring with ${MODULES}"
 
diff --git a/ftp/proftpd-devel/files/extra-patch-nls-Makefile.in b/ftp/proftpd-devel/files/extra-patch-nls-Makefile.in
deleted file mode 100644
index 2dfa2c9e5fdb..000000000000
--- a/ftp/proftpd-devel/files/extra-patch-nls-Makefile.in
+++ /dev/null
@@ -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 ...
diff --git a/ftp/proftpd-devel/pkg-message b/ftp/proftpd-devel/pkg-message
index c9cfcdbe940b..06527e650493 100644
--- a/ftp/proftpd-devel/pkg-message
+++ b/ftp/proftpd-devel/pkg-message
@@ -1,8 +1,10 @@
-###
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
 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 --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index 18749786619f..e0370436b3ce 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -133,7 +133,6 @@ LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--enable-nls
 USE_GETTEXT=yes
 PROFTPD_LIBS+=	-lintl -L${LOCALBASE}/lib
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-nls-Makefile.in
 .endif
 
 .if defined (WITH_CYRFIX)
@@ -226,6 +225,11 @@ CONFIGURE_ARGS+=	--with-libraries=${LIBDIRS}
 
 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:
 	@${ECHO_MSG} "==> Configuring with ${MODULES}"
 
diff --git a/ftp/proftpd/files/extra-patch-nls-Makefile.in b/ftp/proftpd/files/extra-patch-nls-Makefile.in
deleted file mode 100644
index 2dfa2c9e5fdb..000000000000
--- a/ftp/proftpd/files/extra-patch-nls-Makefile.in
+++ /dev/null
@@ -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 ...
diff --git a/ftp/proftpd/pkg-message b/ftp/proftpd/pkg-message
index c9cfcdbe940b..06527e650493 100644
--- a/ftp/proftpd/pkg-message
+++ b/ftp/proftpd/pkg-message
@@ -1,8 +1,10 @@
-###
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
 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
-###
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *