diff options
| author | Vanilla I. Shu <vanilla@FreeBSD.org> | 2014-01-09 14:48:54 +0000 |
|---|---|---|
| committer | Vanilla I. Shu <vanilla@FreeBSD.org> | 2014-01-09 14:48:54 +0000 |
| commit | 835726cb71664ae2670520d3a50f248e16e9734e (patch) | |
| tree | c5a1df43cdad387744b4ceb00662fb30bee791f4 /x11/libdnd | |
| parent | 591efe9fe3d7b0ae82115372fa3ce2842d227352 (diff) | |
| download | ports-835726cb71664ae2670520d3a50f248e16e9734e.tar.gz ports-835726cb71664ae2670520d3a50f248e16e9734e.zip | |
Support stagedir.
Approved by: portmgr (blanket infrastructure)
Notes
Notes:
svn path=/head/; revision=339245
Diffstat (limited to 'x11/libdnd')
| -rw-r--r-- | x11/libdnd/Makefile | 5 | ||||
| -rw-r--r-- | x11/libdnd/files/patch-ab | 26 | ||||
| -rw-r--r-- | x11/libdnd/pkg-plist | 8 |
3 files changed, 20 insertions, 19 deletions
diff --git a/x11/libdnd/Makefile b/x11/libdnd/Makefile index acf256c8a578..96ee6941c8fb 100644 --- a/x11/libdnd/Makefile +++ b/x11/libdnd/Makefile @@ -20,13 +20,12 @@ CPPFLAGS+= -I${LOCALBASE}/include/ LDFLAGS+= -L${LOCALBASE}/lib/ MAKE_JOBS_UNSAFE= yes -NO_STAGE= yes .include <bsd.port.options.mk> post-install: .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${PREFIX}/share/doc/libdnd - ${INSTALL_MAN} ${WRKDIR}/DND/DNDdoc/* ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/libdnd + ${INSTALL_MAN} ${WRKDIR}/DND/DNDdoc/* ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/x11/libdnd/files/patch-ab b/x11/libdnd/files/patch-ab index 550691b8906c..0fbdb3549d4f 100644 --- a/x11/libdnd/files/patch-ab +++ b/x11/libdnd/files/patch-ab @@ -1,6 +1,6 @@ ---- Makefile.in.orig Thu May 22 21:18:22 1997 -+++ Makefile.in Sat Sep 26 21:59:37 1998 -@@ -13,6 +13,10 @@ +--- Makefile.in.orig 1997-05-23 10:18:22.000000000 +0800 ++++ Makefile.in 2014-01-09 20:47:32.000000000 +0800 +@@ -13,6 +13,10 @@ LDFLAGS = @LDFLAGS@ RANLIB = @RANLIB@ LIBS = @LIBS@ @X_LIBS@ @X_PRE_LIBS@ -lXmu -lXaw -lXt -lX11 @X_EXTRA_LIBS@ @@ -11,7 +11,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ -@@ -23,20 +33,30 @@ +@@ -23,20 +27,30 @@ COMPILE = $(CC) $(INCLUDES) $(CFLAGS) -c CXXCOMPILE = $(CXX) $(INCLUDES) $(CXXFLAGS) -c LINK = $(CC) $(LDFLAGS) -o $@ @@ -24,15 +24,17 @@ +all: libC libCpp dndtest libC-so libCpp-so install: libCpp libC - install -d $(INC_DIR) +- install -d $(INC_DIR) - install DragAndDrop.h DragAndDropTypes.h $(INC_DIR) -+ install -c -m 644 DragAndDrop.h DragAndDropTypes.h $(INC_DIR) - install -d $(LIB_DIR) +- install -d $(LIB_DIR) - install libDnd.a libDnd++.a $(LIB_DIR) -+ install -c -m 644 libDnd.a libDnd++.a $(LIB_DIR) -+ install -c $(DNDLIB) $(DNDPLUSLIB) $(LIB_DIR) -+ ln -sf $(DNDLIB) $(LIB_DIR)/libDnd.so -+ ln -sf $(DNDPLUSLIB) $(LIB_DIR)/libDnd++.so ++ install -d $(DESTDIR)$(INC_DIR) ++ install -c -m 644 DragAndDrop.h DragAndDropTypes.h $(DESTDIR)$(INC_DIR) ++ install -d $(DESTDIR)$(LIB_DIR) ++ install -c -m 644 libDnd.a libDnd++.a $(DESTDIR)$(LIB_DIR) ++ install -c $(DNDLIB) $(DNDPLUSLIB) $(DESTDIR)$(LIB_DIR) ++ cd $(DESTDIR)/$(LIB_DIR); ln -sf $(DNDLIB) libDnd.so ++ cd $(DESTDIR)/$(LIB_DIR); ln -sf $(DNDPLUSLIB) libDnd++.so libC: libDnd.a @@ -45,7 +47,7 @@ dndtest: dndtest.c libDnd.a rm -f dndtest $(COMPILE) dndtest.c -@@ -57,6 +77,16 @@ +@@ -57,6 +71,16 @@ libDnd++.a: DragAndDrop.c $(AR) cru libDnd++.a DragAndDrop.o $(RANLIB) libDnd++.a diff --git a/x11/libdnd/pkg-plist b/x11/libdnd/pkg-plist index 2907becd13bc..609c9e8ee050 100644 --- a/x11/libdnd/pkg-plist +++ b/x11/libdnd/pkg-plist @@ -1,14 +1,14 @@ include/OffiX/DragAndDrop.h include/OffiX/DragAndDropTypes.h -lib/libDnd.a lib/libDnd++.a -lib/libDnd.so -lib/libDnd.so.1 lib/libDnd++.so lib/libDnd++.so.1 +lib/libDnd.a +lib/libDnd.so +lib/libDnd.so.1 %%PORTDOCS%%%%DOCSDIR%%/DND.dvi %%PORTDOCS%%%%DOCSDIR%%/DNDa4.ps %%PORTDOCS%%%%DOCSDIR%%/DNDletter.ps %%PORTDOCS%%%%DOCSDIR%%/README -@dirrm include/OffiX %%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm include/OffiX |