diff options
| -rw-r--r-- | sysutils/di/Makefile | 50 | ||||
| -rw-r--r-- | sysutils/di/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/di/files/patch-Makefile | 47 | ||||
| -rw-r--r-- | sysutils/di/pkg-plist | 10 |
4 files changed, 57 insertions, 56 deletions
diff --git a/sysutils/di/Makefile b/sysutils/di/Makefile index 7116a5c3ab8a..3373f986e821 100644 --- a/sysutils/di/Makefile +++ b/sysutils/di/Makefile @@ -6,7 +6,7 @@ # PORTNAME= di -PORTVERSION= 4.19 +PORTVERSION= 4.22 CATEGORIES= sysutils MASTER_SITES= http://www.gentoo.com/di/ \ http://fresh.t-systems-sfr.com/unix/src/privat2/ @@ -19,60 +19,16 @@ MAN1= di.1 .if !defined(WITHOUT_NLS) USE_GETTEXT= yes PLIST_SUB= NLS="" -DI_BUILD_NO_NLS= 0 .else -DI_BUILD_NO_NLS= 1 PLIST_SUB= NLS="@comment " +MAKE_ENV+= DI_NO_NLS=T .endif -USE_PERL5_BUILD= yes +MAKE_ENV+= LDFLAGS="${LDFLAGS}" prefix="${PREFIX}" .include <bsd.port.pre.mk> post-patch: @${REINPLACE_CMD} -e "s|zoneid_t|zoneId_t|g" ${WRKSRC}/di.c -pre-configure: - @${CHMOD} +x ${WRKSRC}/Build - @${CHMOD} +x ${WRKSRC}/features/turnoffnls.sh - -do-configure: - (cd ${WRKSRC}; \ - ${SETENV} ${MAKE_ENV} DI_BUILD_MKCONFIG_PL=1 \ - CC="${CC}" LDFLAGS="${LDFLAGS}" \ - prefix="${PREFIX}" LOCALEDIR="${PREFIX}/share/locale" \ - DI_BUILD_NO_NLS=${DI_BUILD_NO_NLS} \ - ./Build config.h) - -do-build: - (cd ${WRKSRC}; \ - ${SETENV} ${MAKE_ENV} \ - CC="${CC}" LDFLAGS="${LDFLAGS}" \ - prefix="${PREFIX}" LOCALEDIR="${PREFIX}/share/locale" \ - DI_BUILD_NO_NLS=${DI_BUILD_NO_NLS} \ - ./Build) - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/di ${PREFIX}/bin - ${LN} -sf ${PREFIX}/bin/di ${PREFIX}/bin/mi - ${INSTALL_MAN} ${WRKSRC}/di.1 ${PREFIX}/man/man1 -.if !defined(WITHOUT_NLS) - (cd ${WRKSRC}; \ - ${SETENV} ${MAKE_ENV} \ - CC="${CC}" LDFLAGS="${LDFLAGS}" \ - prefix="${PREFIX}" \ - LOCALEDIR="${PREFIX}/share/locale" \ - ./Build build-po) - -(cd ${WRKSRC}/po;for i in *.po; do \ - j=`echo $$i | ${SED} 's,\\.po$$,,'`; \ - test -d ${PREFIX}/share/locale/$$j || \ - ${MKDIR} ${PREFIX}/share/locale/$$j; \ - test -d ${PREFIX}/share/locale/$$j/LC_MESSAGES || \ - ${MKDIR} ${PREFIX}/share/locale/$$j/LC_MESSAGES; \ - ${INSTALL_DATA} $$j.mo \ - ${PREFIX}/share/locale/$$j/LC_MESSAGES/di.mo; \ - ${RM} -f $$j.mo; \ - done) -.endif - .include <bsd.port.post.mk> diff --git a/sysutils/di/distinfo b/sysutils/di/distinfo index a23f7046cae3..5b098a076411 100644 --- a/sysutils/di/distinfo +++ b/sysutils/di/distinfo @@ -1,3 +1,3 @@ -MD5 (di-4.19.tar.gz) = 79ccc2e364d82e58c313da6456429a80 -SHA256 (di-4.19.tar.gz) = cd2e58ddddb7db9bcb0fc0178818b511f466270abe9fb7c51a2a3aca44ce5bd9 -SIZE (di-4.19.tar.gz) = 65784 +MD5 (di-4.22.tar.gz) = 18deed2ec26c27c04b231cfc683ea0d9 +SHA256 (di-4.22.tar.gz) = 0ef867d3dfadd2b4380c323dbdc44fcef7442c58b3fea3b49afcc7d91bd833f5 +SIZE (di-4.22.tar.gz) = 80367 diff --git a/sysutils/di/files/patch-Makefile b/sysutils/di/files/patch-Makefile new file mode 100644 index 000000000000..62a14f1c001f --- /dev/null +++ b/sysutils/di/files/patch-Makefile @@ -0,0 +1,47 @@ +--- Makefile.orig 2010-03-31 11:30:14.000000000 -0400 ++++ Makefile 2010-04-10 01:28:44.000000000 -0400 +@@ -9,7 +9,7 @@ + SHELL = /bin/sh + OBJ_EXT = .o + EXE_EXT = +-CC = cc ++CC ?= cc + MAKE = make + + # +@@ -31,7 +31,7 @@ + # + # installation options + # +-prefix = /usr/local ++prefix ?= /usr/local + LOCALEDIR = $(prefix)/share/locale + # + INSTALL_DIR = $(prefix) +@@ -59,7 +59,7 @@ + # + # simple man page installation + # +-DI_MANINSTDIR = $(INSTALL_DIR)/share/man ++DI_MANINSTDIR = $(INSTALL_DIR)/man + DI_MANDIR = $(DI_MANINSTDIR)/man1 + MAN_TARGET = $(PROG).1 + MANPERM = 644 +@@ -167,7 +167,7 @@ + CC=cc LD=cc EXE_EXT="" OBJ_EXT=".o" \ + CFLAGS="$(CFLAGS) -O \ + -DDEFAULT_FORMAT=\\\"sMbuvpT\\\"" \ +- LDFLAGS="-O" di-programs ++ LDFLAGS="-O $(LDFLAGS)" di-programs + + bsd43-gcc: + @echo ':' > di.env;chmod a+rx di.env +@@ -177,7 +177,7 @@ + CC=cc LD=cc EXE_EXT="" OBJ_EXT=".o" \ + CFLAGS="$(CFLAGS) -O2 \ + -DDEFAULT_FORMAT=\\\"sMbuvpT\\\"" \ +- LDFLAGS="-O2" di-programs ++ LDFLAGS="-O2 $(LDFLAGS)" di-programs + + ### + # cleaning diff --git a/sysutils/di/pkg-plist b/sysutils/di/pkg-plist index f396b153029d..876474341cfa 100644 --- a/sysutils/di/pkg-plist +++ b/sysutils/di/pkg-plist @@ -1,8 +1,6 @@ bin/di bin/mi -%%NLS%%share/locale/de_DE/LC_MESSAGES/di.mo -%%NLS%%share/locale/en_US/LC_MESSAGES/di.mo -%%NLS%%@dirrmtry share/locale/en_US/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/en_US -%%NLS%%@dirrmtry share/locale/de_DE/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/de_DE +%%NLS%%share/locale/de/LC_MESSAGES/di.mo +%%NLS%%share/locale/en/LC_MESSAGES/di.mo +%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/de |