diff options
| author | pav <pav@FreeBSD.org> | 2007-01-30 18:25:34 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2007-01-30 18:25:34 +0800 |
| commit | 68e4663f01d748743e0029f83931c02fba58eb4e (patch) | |
| tree | d24dbe32e4bdb87d0f3ba1c46717e6e34576e724 /japanese/tkstep80 | |
| parent | c6c1440c2b66077bedba90612a4827a8051ec9c1 (diff) | |
| download | freebsd-ports-gnome-68e4663f01d748743e0029f83931c02fba58eb4e.tar.gz freebsd-ports-gnome-68e4663f01d748743e0029f83931c02fba58eb4e.tar.zst freebsd-ports-gnome-68e4663f01d748743e0029f83931c02fba58eb4e.zip | |
- Remove support for a.out format and PORTOBJFORMAT variable from individual
ports
With hat: portmgr
Diffstat (limited to 'japanese/tkstep80')
| -rw-r--r-- | japanese/tkstep80/Makefile | 1 | ||||
| -rw-r--r-- | japanese/tkstep80/files/patch-aa | 13 | ||||
| -rw-r--r-- | japanese/tkstep80/files/patch-ab | 8 |
3 files changed, 7 insertions, 15 deletions
diff --git a/japanese/tkstep80/Makefile b/japanese/tkstep80/Makefile index 8c0f744ae7b4..33e3df853cb8 100644 --- a/japanese/tkstep80/Makefile +++ b/japanese/tkstep80/Makefile @@ -60,7 +60,6 @@ post-install: cd ${TOPDIR}/tkstepjp; \ ${INSTALL_DATA} changes.TkSTEPjp ${PORTDOCDIR} .endif - @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .if exists(${PKGINSTALL}) ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} .endif diff --git a/japanese/tkstep80/files/patch-aa b/japanese/tkstep80/files/patch-aa index 3f1b387133db..353575f832ef 100644 --- a/japanese/tkstep80/files/patch-aa +++ b/japanese/tkstep80/files/patch-aa @@ -1,5 +1,5 @@ ---- configure.in.orig Wed Sep 6 15:36:32 2000 -+++ configure.in Wed Sep 6 15:39:22 2000 +--- configure.in.orig Sat Jan 27 00:08:20 2007 ++++ configure.in Sat Jan 27 00:08:41 2007 @@ -10,6 +10,7 @@ TK_MINOR_VERSION=0 TK_PATCH_LEVEL=".5" @@ -28,19 +28,16 @@ LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}' # If Tcl and Tk are installed in different places, adjust the library -@@ -586,7 +589,11 @@ +@@ -586,7 +585,7 @@ TK_SHARED_BUILD=1 TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}" eval "TK_LIB_FILE=libtk${STEP}${TCL_SHARED_LIB_SUFFIX}" -+ if test "X$PORTOBJFORMAT" = "Xelf"; then +- MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}" + MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} -Wl,-soname,\${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}" -+ else - MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}" -+ fi RANLIB=":" else TK_SHARED_BUILD=0 -@@ -700,10 +707,12 @@ +@@ -700,10 +699,12 @@ AC_SUBST(SHLIB_VERSION) AC_SUBST(TCL_BIN_DIR) AC_SUBST(TCL_BUILD_LIB_SPEC) diff --git a/japanese/tkstep80/files/patch-ab b/japanese/tkstep80/files/patch-ab index 03d56ec46d0d..87ff5b721946 100644 --- a/japanese/tkstep80/files/patch-ab +++ b/japanese/tkstep80/files/patch-ab @@ -48,13 +48,11 @@ #TK_LIB_FILE = libtk.a TK_LIB_FLAG = @TK_LIB_FLAG@ -@@ -335,6 +342,14 @@ +@@ -335,6 +342,12 @@ rm -f ${TK_LIB_FILE} @MAKE_LIB@ $(RANLIB) ${TK_LIB_FILE} -+.if ${PORTOBJFORMAT}X == elfX + ln -sf ${TK_LIB_FILE} `echo ${TK_LIB_FILE} | sed 's/\.so.*$$/.so/'` -+.endif + +$(TK_STATIC_LIB_FILE): $(OBJS) + rm -f $(TK_STATIC_LIB_FILE) @@ -79,13 +77,11 @@ @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \ do \ if [ ! -d $$i ] ; then \ -@@ -404,13 +419,22 @@ +@@ -404,13 +419,20 @@ @$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE)) @chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) -+.if ${PORTOBJFORMAT}X == elfX + @(cd $(LIB_INSTALL_DIR); ln -sf ${TK_LIB_FILE} `echo ${TK_LIB_FILE} | sed 's/\.so.*$$/.so/'`) -+.endif + @echo "Installing $(TK_STATIC_LIB_FILE)" + @$(INSTALL_DATA) $(TK_STATIC_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_STATIC_LIB_FILE) + @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_STATIC_LIB_FILE)) |